From 8ca4f7a7943f0011fc01ba2e25329d4d937e34b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= Date: Fri, 4 Dec 2015 12:41:37 +0100 Subject: [PATCH] noux-pkg: update lynx to 2.8.8rel.2 Fixes #1818. --- repos/ports/ports/lynx.hash | 2 +- repos/ports/ports/lynx.port | 6 +- repos/ports/run/noux_net_lynx_interactive.run | 197 ------------------ repos/ports/src/noux-pkg/lynx/build.patch | 10 - repos/ports/src/noux-pkg/lynx/target.mk | 8 +- 5 files changed, 10 insertions(+), 213 deletions(-) delete mode 100644 repos/ports/run/noux_net_lynx_interactive.run delete mode 100644 repos/ports/src/noux-pkg/lynx/build.patch diff --git a/repos/ports/ports/lynx.hash b/repos/ports/ports/lynx.hash index be854f2d5..893a70fcd 100644 --- a/repos/ports/ports/lynx.hash +++ b/repos/ports/ports/lynx.hash @@ -1 +1 @@ -9e6fc7d6fa8d1f620a724c97bbc57c14c8f34af4 +9babc789cd90ed4d3d2ea1025daec34bb0f29da6 diff --git a/repos/ports/ports/lynx.port b/repos/ports/ports/lynx.port index e50323375..aba48e892 100644 --- a/repos/ports/ports/lynx.port +++ b/repos/ports/ports/lynx.port @@ -1,10 +1,8 @@ LICENSE := GPLv2 -VERSION := 2.8.8dev.12 +VERSION := 2.8.8rel.2 DOWNLOADS := lynx.archive URL(lynx) := ftp://invisible-island.net/lynx/tarballs/lynx$(VERSION).tar.gz -SHA(lynx) := d9cb802a7acf480c75059da8d7bfb1f101183125 +SHA(lynx) := 670587ec5265869604baf10e1d640f748a3d94f2 SIG(lynx) := ${URL(lynx)}.asc DIR(lynx) := src/noux-pkg/lynx - -PATCHES := src/noux-pkg/lynx/build.patch diff --git a/repos/ports/run/noux_net_lynx_interactive.run b/repos/ports/run/noux_net_lynx_interactive.run deleted file mode 100644 index 73368b85c..000000000 --- a/repos/ports/run/noux_net_lynx_interactive.run +++ /dev/null @@ -1,197 +0,0 @@ -if {![have_spec x86]} { - puts "\nThis runscript is supported on the x86 architecture only\n" - exit 0 -} - -# -# Uncomment the following line when working on the VIM source code. Otherwise, -# the package may get recompiled, yet it does not get reinstalled into 'bin/'. -# -#exec rm -rf noux-pkg/bash bin/bash - -set build_components { - core init drivers/timer - noux/net lib/libc_noux - drivers/framebuffer drivers/input - drivers/nic - drivers/timer - server/terminal server/ram_fs - test/libports/ncurses - test/libports/readline - test/libports/zlib -} - -# -# Build Noux packages only once -# -set noux_pkgs "bash coreutils lynx noux-etc" - -foreach pkg $noux_pkgs { - lappend_if [expr ![file exists bin/$pkg]] build_components noux-pkg/$pkg } - -source ${genode_dir}/repos/base/run/platform_drv.inc -append_platform_drv_build_components - -build $build_components - -# strip all binaries prior archiving -set find_args "" -foreach pkg $noux_pkgs { append find_args " bin/$pkg/" } -exec sh -c "find $find_args -type f | (xargs [cross_dev_prefix]strip || true) 2>/dev/null" - -# add bash as sh -exec cp bin/bash/bin/bash bin/bash/bin/sh - -foreach pkg $noux_pkgs { - exec tar cfv bin/$pkg.tar -h -C bin/$pkg . } - -create_boot_directory - -append config { - - - - - - - - - - - - - - - - - - - - - } - -append_if [have_spec sdl] config { - - - - - - - } - -append_platform_drv_config - -append_if [have_spec framebuffer] config { - - - - } - -append_if [have_spec ps2] config { - - - - } - -append config { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -} - -foreach pkg $noux_pkgs { - append config " " } - -append config { - - - - - - - - - - - - - - - - - - -} - -install_config $config - - -# -# Boot modules -# - -# generic modules -set boot_modules { - core init timer ld.lib.so noux_net nic_drv terminal ram_fs - libc.lib.so libm.lib.so libc_noux.lib.so libc_resolv.lib.so - lwip.lib.so ncurses.lib.so - readline.lib.so zlib.lib.so libcrypto.lib.so libssl.lib.so -} - -foreach pkg $noux_pkgs { - lappend boot_modules "$pkg.tar" } - -# platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec framebuffer] boot_modules fb_drv -lappend_if [have_spec ps2] boot_modules ps2_drv - -append_platform_drv_boot_modules - -build_boot_image $boot_modules - -if {[have_spec x86_64]} { - # bash.tar is really huge when built for x86_64 - append qemu_args " -m 320 " -} - -append_if [have_spec x86] qemu_args " -net nic,model=e1000" -append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 " - -append qemu_args " -net user " - -run_genode_until forever - -#exec rm bin/bash.tar diff --git a/repos/ports/src/noux-pkg/lynx/build.patch b/repos/ports/src/noux-pkg/lynx/build.patch deleted file mode 100644 index 882675d59..000000000 --- a/repos/ports/src/noux-pkg/lynx/build.patch +++ /dev/null @@ -1,10 +0,0 @@ -+++ src/noux-pkg/lynx/src/makefile.in -@@ -102,7 +102,7 @@ - - lynx$x: message do_chartrans_stuff $(top_builddir)/LYHelp.h $(OBJS) $(WWWLIB) - @echo "Linking and creating Lynx executable" -- $(CC) $(CC_OPTS) $(LDFLAGS) -o $@ $(OBJS) $(WWWLIB) $(LDFLAGS) $(LIBS) $(INTLLIB) -+ $(CC) $(CC_OPTS) $(LDFLAGS) -o $@ $(OBJS) $(WWWLIB) $(LIBS) $(INTLLIB) - @echo "Copying Lynx executable into top-level directory" - rm -f $(top_builddir)/$@ - cp $@ $(top_builddir)/ diff --git a/repos/ports/src/noux-pkg/lynx/target.mk b/repos/ports/src/noux-pkg/lynx/target.mk index 02f180963..f9ef65e9b 100644 --- a/repos/ports/src/noux-pkg/lynx/target.mk +++ b/repos/ports/src/noux-pkg/lynx/target.mk @@ -6,6 +6,12 @@ NOUX_CONFIGURE_ARGS = --with-ssl \ --with-cfg-file=/etc/lynx.cfg \ --with-lss-file=/etc/lynx.lss +# +# Rather than dealing with autoconf force usage of +# by defining it explicitly +# +NOUX_CFLAGS += -DUSE_OPENSSL_INCL + # # Needed for # @@ -16,7 +22,7 @@ LIBS += ncurses zlib libssl libcrypto libc_resolv # # Make the zlib linking test succeed # -Makefile: dummy_libs +Makefile: dummy_libs NOUX_LDFLAGS += -L$(PWD)