CVS commit: pkgsrc/lang/clisp

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Tue Nov  8 12:47:01 UTC 2022

Modified Files:
        pkgsrc/lang/clisp: distinfo
        pkgsrc/lang/clisp/patches: patch-aa

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


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/lang/clisp/distinfo
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/clisp/patches/patch-aa

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

Modified files:

Index: pkgsrc/lang/clisp/distinfo
diff -u pkgsrc/lang/clisp/distinfo:1.40 pkgsrc/lang/clisp/distinfo:1.41
--- pkgsrc/lang/clisp/distinfo:1.40     Tue Oct 26 10:51:32 2021
+++ pkgsrc/lang/clisp/distinfo  Tue Nov  8 12:47:01 2022
@@ -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

Index: pkgsrc/lang/clisp/patches/patch-aa
diff -u pkgsrc/lang/clisp/patches/patch-aa:1.20 pkgsrc/lang/clisp/patches/patch-aa:1.21
--- pkgsrc/lang/clisp/patches/patch-aa:1.20     Sat Nov  2 17:02:56 2019
+++ pkgsrc/lang/clisp/patches/patch-aa  Tue Nov  8 12:47:01 2022
@@ -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
         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
 -      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*)