diff options
author | gutteridge <gutteridge@pkgsrc.org> | 2019-09-03 13:20:06 +0000 |
---|---|---|
committer | gutteridge <gutteridge@pkgsrc.org> | 2019-09-03 13:20:06 +0000 |
commit | 0fa969ccddf18a8a2e32f4514f3bb3def1f2d7a3 (patch) | |
tree | 4b9a75852314d0ba418674d337997238a32924fc /lang | |
parent | 57bbf425858c0c140f494b952e675273122fc259 (diff) | |
download | pkgsrc-0fa969ccddf18a8a2e32f4514f3bb3def1f2d7a3.tar.gz |
guile22: build fix for most Linux distributions and Darwin
The file charset.alias is not defined as part of the installation
target if this is being built on Linux+glibc or Darwin, handle
accordingly.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/guile22/Makefile | 11 | ||||
-rw-r--r-- | lang/guile22/PLIST | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/lang/guile22/Makefile b/lang/guile22/Makefile index a37b3bf6045..1ffd515ded1 100644 --- a/lang/guile22/Makefile +++ b/lang/guile22/Makefile @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2019/07/20 21:01:19 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2019/09/03 13:20:06 gutteridge Exp $ +PKGREVISION= 1 DISTNAME= guile-2.2.6 PKGNAME= ${DISTNAME:S/guile/guile22/} CATEGORIES= lang @@ -61,6 +62,14 @@ GUILE_LIBNAME.*= so.22.8.1 PLIST_SUBST+= GUILE_LIBNAME=${GUILE_LIBNAME} PRINT_PLIST_AWK+= {gsub(/${GUILE_LIBNAME}/, "$${GUILE_LIBNAME}");} +.include "../../mk/bsd.prefs.mk" + +# If not Linux+glibc or Darwin, an extra charset.alias file is installed +PLIST_VARS+= charset +.if (${OPSYS} != "Linux" || !defined(GLIBC_VERSION)) && ${OPSYS} != "Darwin" +PLIST.charset= yes +.endif + # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24002 post-configure: ${ECHO} '#define FLEXIBLE_ARRAY_MEMBER /**/' >> ${WRKSRC}/config.h diff --git a/lang/guile22/PLIST b/lang/guile22/PLIST index b5eda2536c2..0de938cbabd 100644 --- a/lang/guile22/PLIST +++ b/lang/guile22/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2019/07/20 21:01:19 wiz Exp $ +@comment $NetBSD: PLIST,v 1.7 2019/09/03 13:20:06 gutteridge Exp $ guile/2.2/bin/guild guile/2.2/bin/guile guile/2.2/bin/guile-config @@ -131,7 +131,7 @@ guile/2.2/include/guile/2.2/libguile/weak-vector.h guile/2.2/include/guile/2.2/readline.h guile/2.2/info/guile.info guile/2.2/info/r5rs.info -guile/2.2/lib/charset.alias +${PLIST.charset}guile/2.2/lib/charset.alias guile/2.2/lib/guile/2.2/ccache/ice-9/and-let-star.go guile/2.2/lib/guile/2.2/ccache/ice-9/arrays.go guile/2.2/lib/guile/2.2/ccache/ice-9/atomic.go |