guile22: fix rpath syntax issue in the pkg-config file. Bump.

4 files changed, 37 insertions, 3 deletions

diff --git a/lang/guile22/Makefile b/lang/guile22/Makefile
index 7d4e1206c11..5a19ad9b948 100644
--- a/lang/guile22/Makefile
+++ b/lang/guile22/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2020/05/14 14:28:04 nikita Exp $
+# $NetBSD: Makefile,v 1.22 2020/08/17 07:59:55 tnn Exp $
 
 DISTNAME=	guile-2.2.7
 PKGNAME=	${DISTNAME:S/guile/guile22/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.gnu.org/gnu/guile/
 
diff --git a/lang/guile22/distinfo b/lang/guile22/distinfo
index cebacc896b8..d74de1ff1ce 100644
--- a/lang/guile22/distinfo
+++ b/lang/guile22/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.11 2020/05/14 15:36:40 nikita Exp $
+$NetBSD: distinfo,v 1.12 2020/08/17 07:59:55 tnn Exp $
 
 SHA1 (guile-2.2.7.tar.gz) = 4e4a5b1d1ccfaee887dc4ff63c088e9452715ab2
 RMD160 (guile-2.2.7.tar.gz) = 8c3dba807c4d236da81373e593d61007812ae236
 SHA512 (guile-2.2.7.tar.gz) = ad11885ffeb7655ef6c8543e67233992dc37bdcf91ed82188e6a144169c6b7d4e31cf7a6d01509c573d00904cb002719b851f71cdf1359a86de401daf613d773
 Size (guile-2.2.7.tar.gz) = 18129833 bytes
+SHA1 (patch-build-aux_config.rpath) = d6287edcf49f357d57ccc91c7e3b81862a2515c3
+SHA1 (patch-config.rpath) = 0ca52a58694fd2fad678ebebfb5fb3a7f2ec54dc
 SHA1 (patch-lib_Makefile.in) = ae3428997a653d89cef9bd51f52b57b64431b753
 SHA1 (patch-libguile_loader.c) = 32b012d095c343995f93d0c8160411c4b0cfbee1
 SHA1 (patch-modules_system_base_target.scm) = 5c7f66f71e27186bdbc4cba7233829c4298962fe
diff --git a/lang/guile22/patches/patch-build-aux_config.rpath b/lang/guile22/patches/patch-build-aux_config.rpath
new file mode 100644
index 00000000000..4118be1af63
--- /dev/null
+++ b/lang/guile22/patches/patch-build-aux_config.rpath
@@ -0,0 +1,16 @@
+$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
diff --git a/lang/guile22/patches/patch-config.rpath b/lang/guile22/patches/patch-config.rpath
new file mode 100644
index 00000000000..0bedb90ab3f
--- /dev/null
+++ b/lang/guile22/patches/patch-config.rpath
@@ -0,0 +1,16 @@
+$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