Mon Aug 17 07:59:55 2020 UTC ()
guile22: fix rpath syntax issue in the pkg-config file. Bump.


(tnn)
diff -r1.21 -r1.22 pkgsrc/lang/guile22/Makefile
diff -r1.11 -r1.12 pkgsrc/lang/guile22/distinfo
diff -r0 -r1.1 pkgsrc/lang/guile22/patches/patch-build-aux_config.rpath
diff -r0 -r1.1 pkgsrc/lang/guile22/patches/patch-config.rpath
cvs diff -r1.21 -r1.22 pkgsrc/lang/guile22/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/guile22/Makefile 2020/05/14 14:28:04 1.21
+++ pkgsrc/lang/guile22/Makefile 2020/08/17 07:59:55 1.22
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.21 2020/05/14 14:28:04 nikita Exp $ 1# $NetBSD: Makefile,v 1.22 2020/08/17 07:59:55 tnn Exp $
2 2
3DISTNAME= guile-2.2.7 3DISTNAME= guile-2.2.7
4PKGNAME= ${DISTNAME:S/guile/guile22/} 4PKGNAME= ${DISTNAME:S/guile/guile22/}
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= ftp://ftp.gnu.org/gnu/guile/ 7MASTER_SITES= ftp://ftp.gnu.org/gnu/guile/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.gnu.org/software/guile/ 10HOMEPAGE= https://www.gnu.org/software/guile/
11COMMENT= Official extension language for the GNU operating system 11COMMENT= Official extension language for the GNU operating system
12LICENSE= gnu-lgpl-v3 12LICENSE= gnu-lgpl-v3
13 13
14# Currently, 2.0 is primary. 14# Currently, 2.0 is primary.
15GUILE_SUBDIR= guile/2.2 15GUILE_SUBDIR= guile/2.2
16#GUILE_SUBDIR= # empty 16#GUILE_SUBDIR= # empty
17 17
18# guile does not like the --build and --host triplets on NetBSD 18# guile does not like the --build and --host triplets on NetBSD
cvs diff -r1.11 -r1.12 pkgsrc/lang/guile22/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/guile22/distinfo 2020/05/14 15:36:40 1.11
+++ pkgsrc/lang/guile22/distinfo 2020/08/17 07:59:55 1.12
@@ -1,9 +1,11 @@ @@ -1,9 +1,11 @@
1$NetBSD: distinfo,v 1.11 2020/05/14 15:36:40 nikita Exp $ 1$NetBSD: distinfo,v 1.12 2020/08/17 07:59:55 tnn Exp $
2 2
3SHA1 (guile-2.2.7.tar.gz) = 4e4a5b1d1ccfaee887dc4ff63c088e9452715ab2 3SHA1 (guile-2.2.7.tar.gz) = 4e4a5b1d1ccfaee887dc4ff63c088e9452715ab2
4RMD160 (guile-2.2.7.tar.gz) = 8c3dba807c4d236da81373e593d61007812ae236 4RMD160 (guile-2.2.7.tar.gz) = 8c3dba807c4d236da81373e593d61007812ae236
5SHA512 (guile-2.2.7.tar.gz) = ad11885ffeb7655ef6c8543e67233992dc37bdcf91ed82188e6a144169c6b7d4e31cf7a6d01509c573d00904cb002719b851f71cdf1359a86de401daf613d773 5SHA512 (guile-2.2.7.tar.gz) = ad11885ffeb7655ef6c8543e67233992dc37bdcf91ed82188e6a144169c6b7d4e31cf7a6d01509c573d00904cb002719b851f71cdf1359a86de401daf613d773
6Size (guile-2.2.7.tar.gz) = 18129833 bytes 6Size (guile-2.2.7.tar.gz) = 18129833 bytes
 7SHA1 (patch-build-aux_config.rpath) = d6287edcf49f357d57ccc91c7e3b81862a2515c3
 8SHA1 (patch-config.rpath) = 0ca52a58694fd2fad678ebebfb5fb3a7f2ec54dc
7SHA1 (patch-lib_Makefile.in) = ae3428997a653d89cef9bd51f52b57b64431b753 9SHA1 (patch-lib_Makefile.in) = ae3428997a653d89cef9bd51f52b57b64431b753
8SHA1 (patch-libguile_loader.c) = 32b012d095c343995f93d0c8160411c4b0cfbee1 10SHA1 (patch-libguile_loader.c) = 32b012d095c343995f93d0c8160411c4b0cfbee1
9SHA1 (patch-modules_system_base_target.scm) = 5c7f66f71e27186bdbc4cba7233829c4298962fe 11SHA1 (patch-modules_system_base_target.scm) = 5c7f66f71e27186bdbc4cba7233829c4298962fe
File Added: pkgsrc/lang/guile22/patches/patch-build-aux_config.rpath
$NetBSD: patch-build-aux_config.rpath,v 1.1 2020/08/17 07:59:55 tnn Exp $

This leaks into the pkgconfig file and the space separator
confuses pkgsrc wrappers when building dependent packages.

--- build-aux/config.rpath.orig	2017-03-07 13:51:20.000000000 +0000
+++ build-aux/config.rpath
@@ -173,7 +173,7 @@ if test "$with_gnu_ld" = yes; then
   # here allows them to be overridden if necessary.
   # Unlike libtool, we use -rpath here, not --rpath, since the documented
   # option of GNU ld is called -rpath, not --rpath.
-  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
   case "$host_os" in
     aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
File Added: pkgsrc/lang/guile22/patches/patch-config.rpath
$NetBSD: patch-config.rpath,v 1.1 2020/08/17 07:59:55 tnn Exp $

This leaks into the pkgconfig file and the space separator
confuses pkgsrc wrappers when building dependent packages.

--- config.rpath.orig	2011-11-22 10:54:38.000000000 +0000
+++ config.rpath
@@ -156,7 +156,7 @@ if test "$with_gnu_ld" = yes; then
   # here allows them to be overridden if necessary.
   # Unlike libtool, we use -rpath here, not --rpath, since the documented
   # option of GNU ld is called -rpath, not --rpath.
-  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
   case "$host_os" in
     aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken