diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2018-11-04 16:51:30 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2018-11-04 16:51:30 +0000 |
| commit | eb8a411334e0791377d9693217e86df2e8bad9ac (patch) | |
| tree | a24d6fcfc775d6215ec1e9fc9e0fcd8bfa450ac7 | |
| parent | 4064668bf9a38fa56962bbba6698c20650abce93 (diff) | |
| download | pkgsrc-eb8a411334e0791377d9693217e86df2e8bad9ac.tar.gz | |
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!
| -rw-r--r-- | devel/libuuid/Makefile.common | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/devel/libuuid/Makefile.common b/devel/libuuid/Makefile.common index fed4cf283ba..386614dc322 100644 --- a/devel/libuuid/Makefile.common +++ b/devel/libuuid/Makefile.common @@ -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/patches 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 |