CVS commit: pkgsrc/devel/libuuid

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Nov  4 16:51:31 UTC 2018

Modified Files:
        pkgsrc/devel/libuuid: Makefile.common

Log Message:
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!


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/libuuid/Makefile.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libuuid/Makefile.common
diff -u pkgsrc/devel/libuuid/Makefile.common:1.4 pkgsrc/devel/libuuid/Makefile.common:1.5
--- pkgsrc/devel/libuuid/Makefile.common:1.4    Wed Aug 29 12:25:52 2018
+++ pkgsrc/devel/libuuid/Makefile.common        Sun Nov  4 16:51:30 2018
@@ -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 @@ PATCHDIR=     ${.CURDIR}/../../devel/libuuid
 
 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+=     --without-ncursesw
 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