pkgsrc-WIP-changes archive

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

swi-prolog-lite: Build Prolog kernel as static library (like lang/swi-prolog*)



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Tue Jan 29 18:38:01 2019 +0100
Changeset:	548bc695dccf7777e96ba4747fa552e308cd1db9

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

Log Message:
swi-prolog-lite: Build Prolog kernel as static library (like lang/swi-prolog*)

The dynamic libraries do not seem used outside swi-prolog packages
and we can avoid some kludges by avoiding to build them (and it is
consistent with previous swi-prolog versions).

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

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 +---
 swi-prolog-lite/TODO            | 1 -
 3 files changed, 2 insertions(+), 11 deletions(-)

diffs:
diff --git a/swi-prolog-lite/Makefile.common b/swi-prolog-lite/Makefile.common
index b0e7696a90..9ccd4bb8d6 100644
--- a/swi-prolog-lite/Makefile.common
+++ b/swi-prolog-lite/Makefile.common
@@ -17,15 +17,9 @@ DIST_SUBDIR=		swi-prolog
 DISTINFO_FILE=		${.CURDIR}/../../wip/swi-prolog-lite/distinfo
 PATCHDIR=		${.CURDIR}/../../wip/swi-prolog-lite/patches
 
-# 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}
-
 USE_CMAKE=		yes
 CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+=		-DSWIPL_SHARED_LIB=OFF
 
 CONFIGURE_DIRS=		build
 CMAKE_ARG_PATH=		..
diff --git a/swi-prolog-lite/PLIST b/swi-prolog-lite/PLIST
index 4ebea92417..a5629198bb 100644
--- a/swi-prolog-lite/PLIST
+++ b/swi-prolog-lite/PLIST
@@ -38,9 +38,7 @@ lib/swipl/include/SWI-Prolog.h
 lib/swipl/include/SWI-Stream.h
 lib/swipl/include/Yap/YapInterface.h
 lib/swipl/include/sicstus/sicstus.h
-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}/libswipl.a
 lib/swipl/library/INDEX.pl
 lib/swipl/library/aggregate.pl
 lib/swipl/library/ansi_term.pl
diff --git a/swi-prolog-lite/TODO b/swi-prolog-lite/TODO
index 40f7950013..122cec0453 100644
--- a/swi-prolog-lite/TODO
+++ b/swi-prolog-lite/TODO
@@ -8,4 +8,3 @@
    don't know how to make ../man/pldoc. Stop
   Investigate if there is a way to solve that and provide the documentation via
   swi-prolog-lite package.
-- Double-check all XXX comments


Home | Main Index | Thread Index | Old Index