From bf633fa5efda688905639a937df7066e8ef6ee0f Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Fri, 1 Jul 2022 20:44:29 +0200 Subject: Gentoo specific patches for 4.16.1 (or later) Signed-off-by: Florian Schmaus --- commit-and-tag | 20 ++++++++ ipxe/xen-tools-4.15.0-ipxe-gcc11.patch | 32 ++++++++++++ xen-tools-4-anti-ovmf-download.patch | 13 +++++ xen-tools-4.14-ar-cc.patch | 88 ++++++++++++++++++++++++++++++++ xen-tools-4.15.0-unbundle-ipxe.patch | 17 +++++++ xen-tools-4.16.0-qemu-bridge.patch | 69 +++++++++++++++++++++++++ xen-tools-4.16.0-xenstat.patch | 51 +++++++++++++++++++ xen-tools-4.4.1-tinfo.patch | 92 ++++++++++++++++++++++++++++++++++ 8 files changed, 382 insertions(+) create mode 100755 commit-and-tag create mode 100644 ipxe/xen-tools-4.15.0-ipxe-gcc11.patch create mode 100644 xen-tools-4-anti-ovmf-download.patch create mode 100644 xen-tools-4.14-ar-cc.patch create mode 100644 xen-tools-4.15.0-unbundle-ipxe.patch create mode 100644 xen-tools-4.16.0-qemu-bridge.patch create mode 100644 xen-tools-4.16.0-xenstat.patch create mode 100644 xen-tools-4.4.1-tinfo.patch diff --git a/commit-and-tag b/commit-and-tag new file mode 100755 index 0000000..9db9661 --- /dev/null +++ b/commit-and-tag @@ -0,0 +1,20 @@ +#!/usr/bin/env bash +set -euo pipefail + +SCRIPT_DIR=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd) +cd "${SCRIPT_DIR}" + +XEN_VERSION="${1}" +OUR_PATCHES_VERSION="${2}" + +TAG="${XEN_VERSION}-gentoo-patchset-${OUR_PATCHES_VERSION}" +DESCRIPTION="Gentoo specific patches for ${XEN_VERSION} (or later)" + +git commit \ + --signoff \ + -m "${DESCRIPTION}" + +git tag \ + -s \ + -m "${DESCRIPTION}" \ + "${TAG}" diff --git a/ipxe/xen-tools-4.15.0-ipxe-gcc11.patch b/ipxe/xen-tools-4.15.0-ipxe-gcc11.patch new file mode 100644 index 0000000..b99186a --- /dev/null +++ b/ipxe/xen-tools-4.15.0-ipxe-gcc11.patch @@ -0,0 +1,32 @@ +diff --git a/src/Makefile b/src/Makefile +index 758db7e..98426c6 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -4,7 +4,7 @@ + # + + CLEANUP := +-CFLAGS := ++CFLAGS := -Wno-error=maybe-uninitialized + ASFLAGS := + LDFLAGS := + HOST_CFLAGS := +@@ -94,7 +94,7 @@ SRCDIRS += interface/pxe interface/efi interface/smbios + SRCDIRS += interface/bofm + SRCDIRS += interface/xen + SRCDIRS += interface/hyperv +-SRCDIRS += tests ++#SRCDIRS += tests + SRCDIRS += crypto crypto/mishmash + SRCDIRS += hci hci/commands hci/tui + SRCDIRS += hci/mucurses hci/mucurses/widgets +@@ -174,8 +174,7 @@ everything : + bin-i386-efi/ipxe.efirom \ + bin-x86_64-efi/ipxe.efi bin-x86_64-efi/ipxe.efidrv \ + bin-x86_64-efi/ipxe.efirom \ +- bin-i386-linux/tap.linux bin-x86_64-linux/tap.linux \ +- bin-i386-linux/tests.linux bin-x86_64-linux/tests.linux ++ bin-i386-linux/tap.linux bin-x86_64-linux/tap.linux + + ############################################################################### + # diff --git a/xen-tools-4-anti-ovmf-download.patch b/xen-tools-4-anti-ovmf-download.patch new file mode 100644 index 0000000..fb13c15 --- /dev/null +++ b/xen-tools-4-anti-ovmf-download.patch @@ -0,0 +1,13 @@ +diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile +index 4b1fda5..b3bfa02 100644 +--- a/tools/firmware/Makefile ++++ b/tools/firmware/Makefile +@@ -18,7 +18,7 @@ SUBDIRS-$(CONFIG_ROMBIOS) += vgabios + SUBDIRS-y += hvmloader + + ovmf-dir: +- GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) $(OVMF_UPSTREAM_REVISION) ovmf-dir ++ [ -d ovmf-dir ] || ln -s ovmf-dir-remote ovmf-dir + cp ovmf-makefile ovmf-dir/Makefile; + + seabios-dir: diff --git a/xen-tools-4.14-ar-cc.patch b/xen-tools-4.14-ar-cc.patch new file mode 100644 index 0000000..616f8f4 --- /dev/null +++ b/xen-tools-4.14-ar-cc.patch @@ -0,0 +1,88 @@ +diff --git a/tools/debugger/gdbsx/gx/Makefile b/tools/debugger/gdbsx/gx/Makefile +index 3b8467f..dec7bfa 100644 +--- a/tools/debugger/gdbsx/gx/Makefile ++++ b/tools/debugger/gdbsx/gx/Makefile +@@ -3,6 +3,7 @@ include ../Rules.mk + + GX_OBJS := gx_comm.o gx_main.o gx_utils.o gx_local.o + GX_HDRS := $(wildcard *.h) ++AR="ar" + + .PHONY: all + all: gx_all.a +@@ -18,5 +19,5 @@ distclean: clean + # $(CC) -c $(CFLAGS) -o $@ $< + + gx_all.a: $(GX_OBJS) Makefile $(GX_HDRS) +- ar cr $@ $(GX_OBJS) # problem with ld using -m32 ++ $(AR) cr $@ $(GX_OBJS) # problem with ld using -m32 + +diff --git a/tools/firmware/rombios/Makefile b/tools/firmware/rombios/Makefile +index 02abdb3..5a9e7fa 100644 +--- a/tools/firmware/rombios/Makefile ++++ b/tools/firmware/rombios/Makefile +@@ -2,6 +2,7 @@ XEN_ROOT = $(CURDIR)/../../.. + include $(XEN_ROOT)/tools/Rules.mk + + SUBDIRS := 32bit ++CC=gcc + + .PHONY: all + all: subdirs-all +@@ -19,7 +20,7 @@ clean: subdirs-clean + distclean: clean + + BIOS-bochs-latest: rombios.c biossums 32bitgateway.c tcgbios.c +- $(CPP) -DBX_SMP_PROCESSORS=1 -P $< > _rombios_.c ++ $(CC) -E -DBX_SMP_PROCESSORS=1 -P $< > _rombios_.c + bcc -o rombios.s -C-c -D__i86__ -0 -S _rombios_.c + sed -e 's/^\.text//' -e 's/^\.data//' rombios.s > _rombios_.s + as86 _rombios_.s -b tmp.bin -u- -w- -g -0 -j -O -l rombios.txt +@@ -29,6 +30,6 @@ BIOS-bochs-latest: rombios.c biossums 32bitgateway.c tcgbios.c + rm -f _rombios_.s + + biossums: biossums.c +- $(HOSTCC) $(HOSTCFLAGS) -o biossums biossums.c ++ $(CC) $(HOSTCFLAGS) -o biossums biossums.c + + -include $(DEPS_INCLUDE) +diff --git a/tools/firmware/vgabios/Makefile b/tools/firmware/vgabios/Makefile +index 3284812..ca4f42d 100644 +--- a/tools/firmware/vgabios/Makefile ++++ b/tools/firmware/vgabios/Makefile +@@ -40,7 +40,7 @@ release: + tar czvf ../$(RELEASE).tgz --exclude CVS -C .. $(RELEASE)/ + + vgabios.bin: biossums vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe.c vbetables.h +- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE $(VGABIOS_DATE) > _vgabios_.c ++ $(CC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE $(VGABIOS_DATE) > _vgabios_.c + $(BCC) -o vgabios.s -C-c -D__i86__ -S -0 _vgabios_.c + sed -e 's/^\.text//' -e 's/^\.data//' vgabios.s > _vgabios_.s + $(AS86) _vgabios_.s -b vgabios.bin -u -w- -g -0 -j -O -l vgabios.txt +@@ -50,7 +50,7 @@ vgabios.bin: biossums vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe.c vbe + ls -l VGABIOS-lgpl-latest.bin + + vgabios.debug.bin: biossums vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe.c vbetables.h +- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE -DDEBUG $(VGABIOS_DATE) > _vgabios-debug_.c ++ $(CC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE -DDEBUG $(VGABIOS_DATE) > _vgabios-debug_.c + $(BCC) -o vgabios-debug.s -C-c -D__i86__ -S -0 _vgabios-debug_.c + sed -e 's/^\.text//' -e 's/^\.data//' vgabios-debug.s > _vgabios-debug_.s + $(AS86) _vgabios-debug_.s -b vgabios.debug.bin -u -w- -g -0 -j -O -l vgabios.debug.txt +@@ -60,7 +60,7 @@ vgabios.debug.bin: biossums vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe + ls -l VGABIOS-lgpl-latest.debug.bin + + vgabios-cirrus.bin: biossums vgabios.c vgabios.h vgafonts.h vgatables.h clext.c +- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus_.c ++ $(CC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus_.c + $(BCC) -o vgabios-cirrus.s -C-c -D__i86__ -S -0 _vgabios-cirrus_.c + sed -e 's/^\.text//' -e 's/^\.data//' vgabios-cirrus.s > _vgabios-cirrus_.s + $(AS86) _vgabios-cirrus_.s -b vgabios-cirrus.bin -u -w- -g -0 -j -O -l vgabios-cirrus.txt +@@ -70,7 +70,7 @@ vgabios-cirrus.bin: biossums vgabios.c vgabios.h vgafonts.h vgatables.h clext.c + ls -l VGABIOS-lgpl-latest.cirrus.bin + + vgabios-cirrus.debug.bin: biossums vgabios.c vgabios.h vgafonts.h vgatables.h clext.c +- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DCIRRUS_DEBUG -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus-debug_.c ++ $(CC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DCIRRUS_DEBUG -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus-debug_.c + $(BCC) -o vgabios-cirrus-debug.s -C-c -D__i86__ -S -0 _vgabios-cirrus-debug_.c + sed -e 's/^\.text//' -e 's/^\.data//' vgabios-cirrus-debug.s > _vgabios-cirrus-debug_.s + $(AS86) _vgabios-cirrus-debug_.s -b vgabios-cirrus.debug.bin -u -w- -g -0 -j -O -l vgabios-cirrus.debug.txt diff --git a/xen-tools-4.15.0-unbundle-ipxe.patch b/xen-tools-4.15.0-unbundle-ipxe.patch new file mode 100644 index 0000000..4ac3672 --- /dev/null +++ b/xen-tools-4.15.0-unbundle-ipxe.patch @@ -0,0 +1,17 @@ +diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile +index ed9e113..72f4a8f 100644 +--- a/tools/firmware/etherboot/Makefile ++++ b/tools/firmware/etherboot/Makefile +@@ -33,12 +33,6 @@ $(ROM): $(ROMS) + $(MAKE) -C $D/src bin/$(*F).rom + + $T: +- set -e; if ! $(FETCHER) _$T $(IPXE_TARBALL_URL); then \ +- $(GIT) clone $(IPXE_GIT_URL) $D.git; \ +- (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \ +- $(IPXE_GIT_TAG) | gzip -n >../_$T); \ +- rm -rf $D.git; \ +- fi + mv _$T $T + + $D/src/arch/i386/Makefile: $T Config diff --git a/xen-tools-4.16.0-qemu-bridge.patch b/xen-tools-4.16.0-qemu-bridge.patch new file mode 100644 index 0000000..886be18 --- /dev/null +++ b/xen-tools-4.16.0-qemu-bridge.patch @@ -0,0 +1,69 @@ +diff --git a/tools/qemu-xen/include/net/net.h b/tools/qemu-xen/include/net/net.h +index 5d150808..1de01433 100644 +--- a/tools/qemu-xen/include/net/net.h ++++ b/tools/qemu-xen/include/net/net.h +@@ -221,7 +221,7 @@ NetClientState *net_hub_port_find(int hub_id); + + #define DEFAULT_NETWORK_SCRIPT CONFIG_SYSCONFDIR "/qemu-ifup" + #define DEFAULT_NETWORK_DOWN_SCRIPT CONFIG_SYSCONFDIR "/qemu-ifdown" +-#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper" ++#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/xen-bridge-helper" + #define DEFAULT_BRIDGE_INTERFACE "br0" + + void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd); +diff --git a/tools/qemu-xen/meson.build b/tools/qemu-xen/meson.build +index b3e7ec0e..9cd36a43 100644 +--- a/tools/qemu-xen/meson.build ++++ b/tools/qemu-xen/meson.build +@@ -2759,7 +2759,7 @@ if have_tools + endif + + if targetos == 'linux' +- executable('qemu-bridge-helper', files('qemu-bridge-helper.c'), ++ executable('xen-bridge-helper', files('xen-bridge-helper.c'), + dependencies: [qemuutil, libcap_ng], + install: true, + install_dir: get_option('libexecdir')) +diff --git a/tools/qemu-xen/qemu-bridge-helper.c b/tools/qemu-xen/qemu-bridge-helper.c +index a26e1663..8abc0e74 100644 +--- a/tools/qemu-xen/qemu-bridge-helper.c ++++ b/tools/qemu-xen/qemu-bridge-helper.c +@@ -68,7 +68,7 @@ typedef QSIMPLEQ_HEAD(ACLList, ACLRule) ACLList; + static void usage(void) + { + fprintf(stderr, +- "Usage: qemu-bridge-helper [--use-vnet] --br=bridge --fd=unixfd\n"); ++ "Usage: xen-bridge-helper [--use-vnet] --br=bridge --fd=unixfd\n"); + } + + static int parse_acl_file(const char *filename, ACLList *acl_list) +diff --git a/tools/qemu-xen/qemu-options.hx b/tools/qemu-xen/qemu-options.hx +index 83aa59a9..87a898bd 100644 +--- a/tools/qemu-xen/qemu-options.hx ++++ b/tools/qemu-xen/qemu-options.hx +@@ -2910,7 +2910,7 @@ SRST + If running QEMU as an unprivileged user, use the network helper + to configure the TAP interface and attach it to the bridge. + The default network helper executable is +- ``/path/to/qemu-bridge-helper`` and the default bridge device is ++ ``/path/to/xen-bridge-helper`` and the default bridge device is + ``br0``. + + ``fd``\ =h can be used to specify the handle of an already opened +@@ -2936,14 +2936,14 @@ SRST + #launch a QEMU instance with the default network helper to + #connect a TAP device to bridge br0 + |qemu_system| linux.img -device virtio-net-pci,netdev=n1 \\ +- -netdev tap,id=n1,"helper=/path/to/qemu-bridge-helper" ++ -netdev tap,id=n1,"helper=/path/to/xen-bridge-helper" + + ``-netdev bridge,id=id[,br=bridge][,helper=helper]`` + Connect a host TAP network interface to a host bridge device. + + Use the network helper helper to configure the TAP interface and + attach it to the bridge. The default network helper executable is +- ``/path/to/qemu-bridge-helper`` and the default bridge device is ++ ``/path/to/xen-bridge-helper`` and the default bridge device is + ``br0``. + + Examples: diff --git a/xen-tools-4.16.0-xenstat.patch b/xen-tools-4.16.0-xenstat.patch new file mode 100644 index 0000000..c47b3dc --- /dev/null +++ b/xen-tools-4.16.0-xenstat.patch @@ -0,0 +1,51 @@ +diff --git a/tools/libs/stat/Makefile b/tools/libs/stat/Makefile +index c99508ae..b54b700c 100644 +--- a/tools/libs/stat/Makefile ++++ b/tools/libs/stat/Makefile +@@ -51,23 +51,23 @@ install-bindings: install-perl-bindings install-python-bindings + .PHONY: uninstall-bindings + uninstall-bindings: uninstall-perl-bindings uninstall-python-bindings + +-$(BINDINGS): $(SHLIB) $(SHLIB_LINKS) include/xenstat.h ++$(BINDINGS): $(SHLIB) $(SHLIB_LINKS) ../../include/xenstat.h + +-SWIG_FLAGS=-module xenstat -Iinclude -I. ++SWIG_FLAGS=-module xenstat -Iinclude -I. -I../../include/ + + # Python bindings +-PYTHON_VERSION=$(PYTHON:python%=%) +-PYTHON_FLAGS=-I/usr/include/python$(PYTHON_VERSION) -lpython$(PYTHON_VERSION) ++PYTHON_FLAGS=`$(PYTHON) -c 'import distutils.sysconfig; print("-I" + distutils.sysconfig.get_python_inc(True) + " " + distutils.sysconfig.get_config_var("BLDLIBRARY"))'` ++PYTHON_FLAGS+=-Wno-error=missing-prototypes -fPIC -lxenstat + $(PYMOD): $(PYSRC) + $(PYSRC): bindings/swig/xenstat.i + swig -python $(SWIG_FLAGS) -outdir $(@D) -o $(PYSRC) $< + + $(PYLIB): $(PYSRC) +- $(CC) $(CFLAGS) $(LDFLAGS) $(PYTHON_FLAGS) $(SHLIB_LDFLAGS) -lxenstat -o $@ $< $(APPEND_LDFLAGS) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(PYTHON_FLAGS) $(SHLIB_LDFLAGS) -o $@ $< $(SHLIB) $(LDLIBS-y) $(APPEND_LDFLAGS) + + python-bindings: $(PYLIB) $(PYMOD) + +-pythonlibdir=$(prefix)/lib/python$(PYTHON_VERSION)/site-packages ++pythonlibdir=`$(PYTHON) -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())'` + install-python-bindings: $(PYLIB) $(PYMOD) + $(INSTALL_PROG) $(PYLIB) $(DESTDIR)$(pythonlibdir)/_xenstat.so + $(INSTALL_PROG) $(PYMOD) $(DESTDIR)$(pythonlibdir)/xenstat.py +@@ -91,13 +91,14 @@ $(PERLSRC): bindings/swig/xenstat.i + swig -perl $(SWIG_FLAGS) -outdir $(@D) -o $(PERLSRC) $< + + $(PERLLIB): $(PERLSRC) +- $(CC) $(CFLAGS) $(LDFLAGS) $(PERL_FLAGS) $(SHLIB_LDFLAGS) -lxenstat -o $@ $< $(APPEND_LDFLAGS) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(PERL_FLAGS) $(SHLIB_LDFLAGS) -o $@ $< $(SHLIB) $(LDLIBS-y) $(APPEND_LDFLAGS) ++ + + .PHONY: perl-bindings + perl-bindings: $(PERLLIB) $(PERLMOD) + + .PHONY: install-perl-bindings +-perllibdir=$(prefix)/lib/perl5 ++perllibdir=$(prefix)/$(libdir)/perl5 + perlmoddir=$(prefix)/share/perl5 + install-perl-bindings: $(PERLLIB) $(PERLMOD) + $(INSTALL_PROG) $(PERLLIB) $(DESTDIR)$(perllibdir)/xenstat.so diff --git a/xen-tools-4.4.1-tinfo.patch b/xen-tools-4.4.1-tinfo.patch new file mode 100644 index 0000000..1d1a1fd --- /dev/null +++ b/xen-tools-4.4.1-tinfo.patch @@ -0,0 +1,92 @@ +--- a/m4/curses.m4 ++++ b/m4/curses.m4 +@@ -4,13 +4,14 @@ + ], [curses="n"]) + AC_CHECK_HEADER([ncurses.h], [ + AC_CHECK_LIB([ncurses], [clear], [ncurses="y"], [ncurses="n"]) ++ AC_SEARCH_LIBS([curs_set], tinfo ncurses, [CURSES_LIBS="$CURSES_LIBS $ac_res"]) + ], [ncurses="n"]) + AS_IF([test "$curses" = "n" && test "$ncurses" = "n"], [ + AC_MSG_ERROR([Unable to find a suitable curses library]) + ]) + # Prefer ncurses over curses if both are present + AS_IF([test "$ncurses" = "y"], [ +- CURSES_LIBS="-lncurses" ++ CURSES_LIBS="$CURSES_LIBS -lncurses" + AC_DEFINE([INCLUDE_CURSES_H], [], [Define curses header to use]) + ], [ + CURSES_LIBS="-lcurses" +--- a/tools/configure ++++ a/tools/configure +@@ -7136,6 +7136,62 @@ + ncurses="n" + fi + ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing curs_set" >&5 ++$as_echo_n "checking for library containing curs_set... " >&6; } ++if ${ac_cv_search_curs_set+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_func_search_save_LIBS=$LIBS ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char curs_set (); ++int ++main () ++{ ++return curs_set (); ++ ; ++ return 0; ++} ++_ACEOF ++for ac_lib in '' tinfo ncurses; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_search_curs_set=$ac_res ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext ++ if ${ac_cv_search_curs_set+:} false; then : ++ break ++fi ++done ++if ${ac_cv_search_curs_set+:} false; then : ++ ++else ++ ac_cv_search_curs_set=no ++fi ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_curs_set" >&5 ++$as_echo "$ac_cv_search_curs_set" >&6; } ++ac_res=$ac_cv_search_curs_set ++if test "$ac_res" != no; then : ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" ++ CURSES_LIBS="$CURSES_LIBS $ac_res" ++fi ++ + + else + ncurses="n" +@@ -7150,7 +7206,7 @@ + # Prefer ncurses over curses if both are present + if test "$ncurses" = "y"; then : + +- CURSES_LIBS="-lncurses" ++ CURSES_LIBS="$CURSES_LIBS -lncurses" + + $as_echo "#define INCLUDE_CURSES_H " >>confdefs.h + -- cgit v1.2.3-65-gdbad