diff options
| author | nros <nros@pkgsrc.org> | 2022-11-08 12:47:01 +0000 |
|---|---|---|
| committer | nros <nros@pkgsrc.org> | 2022-11-08 12:47:01 +0000 |
| commit | 8b269d9047b30ec073426f95b57d9e13dd45b82c (patch) | |
| tree | 926b8a27fa07a2e0ff9a2bfa4d5c7f1efeaad65c /lang | |
| parent | 215bb3768e883946f90aba42b47cb416f7aeb87e (diff) | |
| download | pkgsrc-8b269d9047b30ec073426f95b57d9e13dd45b82c.tar.gz | |
clisp: fix module linking with X11_TYPE = native on NetBSD
X11 pkg-config files on NetBSD includes -Wl,-rpath,/usr/X11R7/lib
that can't be understood by the ld command, so use the compiler
that can understand this for linking instead.
Fixes build of x11/clisp-gtk2 with X11_TYPE = native and cwrappers.
Concerns PR pkg/57077 .
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/clisp/distinfo | 4 | ||||
| -rw-r--r-- | lang/clisp/patches/patch-aa | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/lang/clisp/distinfo b/lang/clisp/distinfo index 067c361aa68..d0df0e20dca 100644 --- a/lang/clisp/distinfo +++ b/lang/clisp/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.40 2021/10/26 10:51:32 nia Exp $ +$NetBSD: distinfo,v 1.41 2022/11/08 12:47:01 nros Exp $ BLAKE2s (clisp-2.49.tar.gz) = b9f656df562cbe46fc550bb9bd44399efb2c7a87b024b22d07637c4d75c51866 SHA512 (clisp-2.49.tar.gz) = 7885956b373a4c1d04a0b43c229fe8c8694d89982cadce09da6ef03cb56a5705b92f94b564981075c36bb9773a9f16b0b95fef23e942f6245604aefa6600ef98 Size (clisp-2.49.tar.gz) = 9823111 bytes -SHA1 (patch-aa) = 65938825a9d219ddf93f09b306feb857bd83e0b6 +SHA1 (patch-aa) = fd03e7e3d7904a2efc8227c4d58c4782a6f070a8 SHA1 (patch-ab) = 93aef2c423ce9e5eabebc20cdc144c83845b19cb SHA1 (patch-ac) = c31fcd65d7d37aeaf69c0eee9499bff596b6619b SHA1 (patch-modules_readline_readline.lisp) = 1463cb15f6a21374dffc0e585670ac89bb758ff3 diff --git a/lang/clisp/patches/patch-aa b/lang/clisp/patches/patch-aa index 5d7b4686f74..f671943e832 100644 --- a/lang/clisp/patches/patch-aa +++ b/lang/clisp/patches/patch-aa @@ -1,16 +1,17 @@ -$NetBSD: patch-aa,v 1.20 2019/11/02 17:02:56 rillig Exp $ +$NetBSD: patch-aa,v 1.21 2022/11/08 12:47:01 nros Exp $ Override library subdirectory name for consistency. Don't use cache file to avoid trailing space problem. Support staged installation of modules. Fix SunOS linking. +Fix NetBSD module linking. https://mail-index.netbsd.org/pkgsrc-users/2019/11/02/msg029846.html https://sourceforge.net/p/clisp/bugs/740/ (macOS build failure) --- src/makemake.in.orig 2010-07-07 15:15:35.000000000 +0000 +++ src/makemake.in -@@ -577,8 +577,8 @@ +@@ -577,8 +577,8 @@ case $# in CROSS=false if [ -z "$HSYS" ]; then # not win32gcc # some shells (A/UX and OSF/1) need the parentheses around "arch" below. @@ -21,7 +22,7 @@ https://sourceforge.net/p/clisp/bugs/740/ (macOS build failure) if [ "$HSYS" = 386bsd -o "$HSYS" = sun386 -o "$HSYS" = "386/at" -o "$HSYS" = i86pc ] ; then HSYS='i386' fi -@@ -1416,42 +1416,42 @@ if [ "${with_dynamic_modules}" != no ]; +@@ -1416,42 +1416,42 @@ if [ "${with_dynamic_modules}" != no ]; XCC_PICFLAG='' ;; esac @@ -32,12 +33,14 @@ https://sourceforge.net/p/clisp/bugs/740/ (macOS build failure) - XCC_CREATESHARED='ld -Bshareable -o $lib $libs /usr/lib/c++rt0.o' + XCC_CREATESHARED='ld -Bshareable -o "${DESTDIR}$lib" $libs /usr/lib/c++rt0.o' ;; - freebsd2* | netbsd* | openbsd*) +- freebsd2* | netbsd* | openbsd*) - XCC_CREATESHARED='ld -Bshareable -o $lib $libs' ++ freebsd2* | openbsd*) + XCC_CREATESHARED='ld -Bshareable -o "${DESTDIR}$lib" $libs' ;; - freebsd3* | gnu* | linux* | cygwin* | mingw* | k*bsd* | dragonfly*) +- freebsd3* | gnu* | linux* | cygwin* | mingw* | k*bsd* | dragonfly*) - XCC_CREATESHARED='${CC} ${CFLAGS} ${CLFLAGS} -shared -o $lib $libs' ++ freebsd3* | gnu* | linux* | cygwin* | mingw* | k*bsd* | dragonfly* | netbsd*) + XCC_CREATESHARED='${CC} ${CFLAGS} ${CLFLAGS} -shared -o "${DESTDIR}$lib" $libs' ;; hpux9* | hpux10*) |