Received: by mail.netbsd.org (Postfix, from userid 605) id 2773F84DA7; Mon, 17 Aug 2020 07:59:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A314384CED for ; Mon, 17 Aug 2020 07:59:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id EOgdXmAe25uB for ; Mon, 17 Aug 2020 07:59:56 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 139EB84CDF for ; Mon, 17 Aug 2020 07:59:56 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 10E39FB28; Mon, 17 Aug 2020 07:59:56 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1597651196178140" MIME-Version: 1.0 Date: Mon, 17 Aug 2020 07:59:56 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/lang/guile22 To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20200817075956.10E39FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1597651196178140 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Mon Aug 17 07:59:55 UTC 2020 Modified Files: pkgsrc/lang/guile22: Makefile distinfo Added Files: pkgsrc/lang/guile22/patches: patch-build-aux_config.rpath patch-config.rpath Log Message: guile22: fix rpath syntax issue in the pkg-config file. Bump. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/guile22/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/guile22/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/lang/guile22/patches/patch-build-aux_config.rpath \ pkgsrc/lang/guile22/patches/patch-config.rpath Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1597651196178140 Content-Disposition: inline Content-Length: 3645 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/guile22/Makefile diff -u pkgsrc/lang/guile22/Makefile:1.21 pkgsrc/lang/guile22/Makefile:1.22 --- pkgsrc/lang/guile22/Makefile:1.21 Thu May 14 14:28:04 2020 +++ pkgsrc/lang/guile22/Makefile Mon Aug 17 07:59:55 2020 @@ -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/ Index: pkgsrc/lang/guile22/distinfo diff -u pkgsrc/lang/guile22/distinfo:1.11 pkgsrc/lang/guile22/distinfo:1.12 --- pkgsrc/lang/guile22/distinfo:1.11 Thu May 14 15:36:40 2020 +++ pkgsrc/lang/guile22/distinfo Mon Aug 17 07:59:55 2020 @@ -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 Added files: Index: pkgsrc/lang/guile22/patches/patch-build-aux_config.rpath diff -u /dev/null pkgsrc/lang/guile22/patches/patch-build-aux_config.rpath:1.1 --- /dev/null Mon Aug 17 07:59:55 2020 +++ pkgsrc/lang/guile22/patches/patch-build-aux_config.rpath Mon Aug 17 07:59:55 2020 @@ -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 Index: pkgsrc/lang/guile22/patches/patch-config.rpath diff -u /dev/null pkgsrc/lang/guile22/patches/patch-config.rpath:1.1 --- /dev/null Mon Aug 17 07:59:55 2020 +++ pkgsrc/lang/guile22/patches/patch-config.rpath Mon Aug 17 07:59:55 2020 @@ -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 --_----------=_1597651196178140--