pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

swi-prolog-lite: Switch back to shared libraries



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sun Feb 17 13:10:08 2019 +0100
Changeset:	0c5a64b4815d45ebf6cb9e3eec7a7bd50fbb5f64

Modified Files:
	swi-prolog-lite/Makefile.common
	swi-prolog-lite/PLIST

Log Message:
swi-prolog-lite: Switch back to shared libraries

According the documentation these will be needed for swi-prolog-jpl.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0c5a64b4815d45ebf6cb9e3eec7a7bd50fbb5f64

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

diffstat:
 swi-prolog-lite/Makefile.common | 8 +++++++-
 swi-prolog-lite/PLIST           | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diffs:
diff --git a/swi-prolog-lite/Makefile.common b/swi-prolog-lite/Makefile.common
index f42ee50a72..6ba74aa662 100644
--- a/swi-prolog-lite/Makefile.common
+++ b/swi-prolog-lite/Makefile.common
@@ -19,7 +19,13 @@ PATCHDIR=		${.CURDIR}/../../wip/swi-prolog-lite/patches
 
 USE_CMAKE=		yes
 CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+=		-DSWIPL_SHARED_LIB=OFF
+
+# XXX: That's kludgy, can it be avoided?
+MAKE_ENV+=		LD_LIBRARY_PATH=${WRKSRC}/build/src
+
+# XXX: Can this be addressed differently without appending to the LDFLAGS?
+# XXX: (i.e. it should just work(TM))
+LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/swipl/lib/${MACHINE_GNU_PLATFORM}
 
 CONFIGURE_DIRS=		build
 CMAKE_ARG_PATH=		..
diff --git a/swi-prolog-lite/PLIST b/swi-prolog-lite/PLIST
index 03589c9eca..4bd5065383 100644
--- a/swi-prolog-lite/PLIST
+++ b/swi-prolog-lite/PLIST
@@ -390,7 +390,9 @@ lib/swipl/lib/${MACHINE_GNU_PLATFORM}/http_stream.so
 lib/swipl/lib/${MACHINE_GNU_PLATFORM}/inclpr.so
 lib/swipl/lib/${MACHINE_GNU_PLATFORM}/isub.so
 lib/swipl/lib/${MACHINE_GNU_PLATFORM}/json.so
-lib/swipl/lib/${MACHINE_GNU_PLATFORM}/libswipl.a
+lib/swipl/lib/${MACHINE_GNU_PLATFORM}/libswipl.so
+lib/swipl/lib/${MACHINE_GNU_PLATFORM}/libswipl.so.8
+lib/swipl/lib/${MACHINE_GNU_PLATFORM}/libswipl.so.${PKGVERSION}
 lib/swipl/lib/${MACHINE_GNU_PLATFORM}/md54pl.so
 lib/swipl/lib/${MACHINE_GNU_PLATFORM}/memfile.so
 lib/swipl/lib/${MACHINE_GNU_PLATFORM}/ntriples.so


Home | Main Index | Thread Index | Old Index