pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/libuuid Only configure libuuid using ksh on NetB...
details: https://anonhg.NetBSD.org/pkgsrc/rev/7137b6ebcb9c
branches: trunk
changeset: 314677:7137b6ebcb9c
user: bsiegert <bsiegert%pkgsrc.org@localhost>
date: Sun Nov 04 16:51:30 2018 +0000
description:
Only configure libuuid using ksh on NetBSD 6.
The build of ksh is all but broken on modern systems. PR pkg/52877
introduced ksh as CONFIGURE_SHELL to fix NetBSD 6, but this causes issues
on NetBSD-8 and later (PR pkg/53686). Arguably, the workaround could be
dropped, since we stopped supporting NetBSD 6.
Fix proposed by David H. Gutteridge, thanks!
diffstat:
devel/libuuid/Makefile.common | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diffs (32 lines):
diff -r 8a2d2eafa957 -r 7137b6ebcb9c devel/libuuid/Makefile.common
--- a/devel/libuuid/Makefile.common Sun Nov 04 16:34:57 2018 +0000
+++ b/devel/libuuid/Makefile.common Sun Nov 04 16:51:30 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2018/08/29 12:25:52 adam Exp $
+# $NetBSD: Makefile.common,v 1.5 2018/11/04 16:51:30 bsiegert Exp $
# used by devel/libblkid/Makefile
# used by devel/libuuid/Makefile
# used by x11/mcookie/Makefile
@@ -16,9 +16,7 @@
USE_GCC_RUNTIME= yes
USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config ksh
-# XXX PR pkg/52877 configure is broken on netbsd6
-CONFIG_SHELL= ksh
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-all-programs
CONFIGURE_ARGS+= --disable-bash-completion
@@ -30,3 +28,11 @@
CONFIGURE_ARGS+= --disable-nls
TEST_TARGET= check
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+# XXX PR pkg/52877: configure is broken on netbsd6
+.if (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[0123456].*))
+USE_TOOLS+= ksh
+CONFIG_SHELL= ksh
+.endif
Home |
Main Index |
Thread Index |
Old Index