Received: by mail.netbsd.org (Postfix, from userid 605) id 2FE7C850D2; Tue, 19 Jun 2018 11:07:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2B96E850CF for ; Tue, 19 Jun 2018 11:07:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id VByQlRvne-PK for ; Tue, 19 Jun 2018 11:07:26 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 28B2684C81 for ; Tue, 19 Jun 2018 11:07:26 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2280DFBEC; Tue, 19 Jun 2018 11:07:26 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1529406446155210" MIME-Version: 1.0 Date: Tue, 19 Jun 2018 11:07:26 +0000 From: "Filip Hajny" Subject: CVS commit: pkgsrc/lang/guile To: pkgsrc-changes@NetBSD.org Reply-To: fhajny@netbsd.org X-Mailer: log_accum Message-Id: <20180619110726.2280DFBEC@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. --_----------=_1529406446155210 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: fhajny Date: Tue Jun 19 11:07:26 UTC 2018 Modified Files: pkgsrc/lang/guile: Makefile distinfo Added Files: pkgsrc/lang/guile/patches: patch-libguile_Makefile.in patch-libguile_dynl.c Log Message: lang/guile: Add search path to default extensions for lt_dlopenext. Fixes usage with packages like print/lilypond on at least Darwin and SunOS, where dynamically loaded guile extensions cannot be found without resorting to LTDL_LIBRARY_PATH quirks. To generate a diff of this commit: cvs rdiff -u -r1.109 -r1.110 pkgsrc/lang/guile/Makefile cvs rdiff -u -r1.50 -r1.51 pkgsrc/lang/guile/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/lang/guile/patches/patch-libguile_Makefile.in \ pkgsrc/lang/guile/patches/patch-libguile_dynl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1529406446155210 Content-Disposition: inline Content-Length: 3517 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/guile/Makefile diff -u pkgsrc/lang/guile/Makefile:1.109 pkgsrc/lang/guile/Makefile:1.110 --- pkgsrc/lang/guile/Makefile:1.109 Thu Mar 16 10:07:38 2017 +++ pkgsrc/lang/guile/Makefile Tue Jun 19 11:07:25 2018 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.109 2017/03/16 10:07:38 wiz Exp $ +# $NetBSD: Makefile,v 1.110 2018/06/19 11:07:25 fhajny Exp $ DISTNAME= guile-1.8.8 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=guile/} Index: pkgsrc/lang/guile/distinfo diff -u pkgsrc/lang/guile/distinfo:1.50 pkgsrc/lang/guile/distinfo:1.51 --- pkgsrc/lang/guile/distinfo:1.50 Thu Nov 10 09:26:21 2016 +++ pkgsrc/lang/guile/distinfo Tue Jun 19 11:07:25 2018 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.50 2016/11/10 09:26:21 maya Exp $ +$NetBSD: distinfo,v 1.51 2018/06/19 11:07:25 fhajny Exp $ SHA1 (guile-1.8.8.tar.gz) = 548d6927aeda332b117f8fc5e4e82c39a05704f9 RMD160 (guile-1.8.8.tar.gz) = 8ac185a72ad8394b14d5377549e5bbf02889faaa @@ -16,5 +16,7 @@ SHA1 (patch-ao) = b648826c5e951cd98ca6e2 SHA1 (patch-doc_ref_fdl.texi) = c7e70f9b30f792dd38c18550739673d255f9fc5c SHA1 (patch-doc_ref_gh.texi) = b6b841102111d5c5813ba729c9c0ebfb3d6ca1e0 SHA1 (patch-doc_tutorial_guile-tut.texi) = 5ad2c5942dc7715344115847793bd4f2eaacd7ca +SHA1 (patch-libguile_Makefile.in) = ea219cc894d92ec92b409846876e2eff21382107 +SHA1 (patch-libguile_dynl.c) = 01ec790842d003eaba3500ab79ba9d4e77d925d6 SHA1 (patch-libguile_guile-snarf-docs.in) = 392b0774a8d21bc06f2cf741683773b918bc8ffb SHA1 (patch-libguile_guile-snarf.in) = d534adce77040d441b0771efc536bc7e8560365d Added files: Index: pkgsrc/lang/guile/patches/patch-libguile_Makefile.in diff -u /dev/null pkgsrc/lang/guile/patches/patch-libguile_Makefile.in:1.1 --- /dev/null Tue Jun 19 11:07:26 2018 +++ pkgsrc/lang/guile/patches/patch-libguile_Makefile.in Tue Jun 19 11:07:25 2018 @@ -0,0 +1,14 @@ +$NetBSD: patch-libguile_Makefile.in,v 1.1 2018/06/19 11:07:25 fhajny Exp $ + +Define libdir for use in dynl. + +--- libguile/Makefile.in.orig 2010-12-13 19:29:39.000000000 +0000 ++++ libguile/Makefile.in +@@ -2124,6 +2124,7 @@ libpath.h: $(srcdir)/Makefile.in $(top_ + @echo '/* generated by Makefile */' > libpath.tmp + @echo '#define SCM_PKGDATA_DIR "$(pkgdatadir)"' >> libpath.tmp + @echo '#define SCM_LIBRARY_DIR "$(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)"'>>libpath.tmp ++ @echo '#define SCM_LIB_DIR "$(libdir)"'>>libpath.tmp + @echo '#define SCM_SITE_DIR "$(pkgdatadir)/site"' >> libpath.tmp + @echo '#define SCM_BUILD_INFO { \' >> libpath.tmp + @echo ' { "srcdir", "'"`cd @srcdir@; pwd`"'" }, \' >> libpath.tmp Index: pkgsrc/lang/guile/patches/patch-libguile_dynl.c diff -u /dev/null pkgsrc/lang/guile/patches/patch-libguile_dynl.c:1.1 --- /dev/null Tue Jun 19 11:07:26 2018 +++ pkgsrc/lang/guile/patches/patch-libguile_dynl.c Tue Jun 19 11:07:25 2018 @@ -0,0 +1,22 @@ +$NetBSD: patch-libguile_dynl.c,v 1.1 2018/06/19 11:07:25 fhajny Exp $ + +Add search path for bundled modules. + +--- libguile/dynl.c.orig 2010-12-13 17:24:39.000000000 +0000 ++++ libguile/dynl.c +@@ -56,6 +56,7 @@ maybe_drag_in_eprintf () + #include "libguile/lang.h" + #include "libguile/validate.h" + #include "libguile/dynwind.h" ++#include "libguile/libpath.h" + + #include + +@@ -73,6 +74,7 @@ maybe_drag_in_eprintf () + static void * + sysdep_dynl_link (const char *fname, const char *subr) + { ++ lt_dladdsearchdir(SCM_LIB_DIR); + lt_dlhandle handle; + handle = lt_dlopenext (fname); + if (NULL == handle) --_----------=_1529406446155210--