pkgsrc-WIP-changes archive

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

swi-prolog*: Put all disabled packages in Makefile.common



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Mon Feb 18 17:59:01 2019 +0100
Changeset:	ce8a475c562ebbc0d9a7cf25b27c1657b28d3fc8

Modified Files:
	swi-prolog-jpl/Makefile
	swi-prolog-lite/Makefile
	swi-prolog-lite/Makefile.common
	swi-prolog-packages/Makefile

Log Message:
swi-prolog*: Put all disabled packages in Makefile.common

This avoid copypasted logic around swi-prolog-* packages.

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

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

diffstat:
 swi-prolog-jpl/Makefile         | 10 +---------
 swi-prolog-lite/Makefile        | 12 +++---------
 swi-prolog-lite/Makefile.common | 10 ++++++++++
 swi-prolog-packages/Makefile    | 10 +---------
 4 files changed, 15 insertions(+), 27 deletions(-)

diffs:
diff --git a/swi-prolog-jpl/Makefile b/swi-prolog-jpl/Makefile
index 22916d3f94..9ea2609c22 100644
--- a/swi-prolog-jpl/Makefile
+++ b/swi-prolog-jpl/Makefile
@@ -22,15 +22,7 @@ CMAKE_ARGS+=		-DSWIPL_PACKAGES_BASIC=OFF
 CMAKE_ARGS+=		-DSWIPL_PACKAGES_SSL=OFF
 CMAKE_ARGS+=		-DSWIPL_PACKAGES_TERM=OFF
 
-# XXX: Explicitly disable all not wanted packages to avoid possible build
-# XXX: failures. For a complete list please see:
-# XXX:  ${WRKSRC}/cmake/PackageSelection.cmake
-CMAKE_ARGS+=		-DSWIPL_PACKAGES_ODBC=OFF
-CMAKE_ARGS+=		-DSWIPL_PACKAGES_BDB=OFF
-CMAKE_ARGS+=		-DSWIPL_PACKAGES_PCRE=OFF
-CMAKE_ARGS+=		-DSWIPL_PACKAGES_YAML=OFF
-CMAKE_ARGS+=		-DSWIPL_PACKAGES_TIPC=OFF
-CMAKE_ARGS+=		-DSWIPL_PACKAGES_QT=OFF
+# Part of swi-prolog-packages
 CMAKE_ARGS+=		-DSWIPL_PACKAGES_X=OFF
 
 SWIPL_PACKAGES_COMPONENTS+=	Java_interface
diff --git a/swi-prolog-lite/Makefile b/swi-prolog-lite/Makefile
index 77f11100af..2f7152f53b 100644
--- a/swi-prolog-lite/Makefile
+++ b/swi-prolog-lite/Makefile
@@ -15,16 +15,10 @@ CMAKE_ARGS+=		-DSWIPL_PACKAGES_SSL=ON
 CMAKE_ARGS+=		-DSWIPL_PACKAGES_TERM=ON
 CMAKE_ARGS+=		-DINSTALL_DOCUMENTATION=ON
 
-# XXX: Explicitly disable all not wanted packages to avoid possible build
-# XXX: failures. For a complete list please see:
-# XXX:  ${WRKSRC}/cmake/PackageSelection.cmake
-CMAKE_ARGS+=		-DSWIPL_PACKAGES_ODBC=OFF
-CMAKE_ARGS+=		-DSWIPL_PACKAGES_BDB=OFF
-CMAKE_ARGS+=		-DSWIPL_PACKAGES_PCRE=OFF
-CMAKE_ARGS+=		-DSWIPL_PACKAGES_YAML=OFF
+# Part of swi-prolog-jpl
 CMAKE_ARGS+=		-DSWIPL_PACKAGES_JAVA=OFF
-CMAKE_ARGS+=		-DSWIPL_PACKAGES_TIPC=OFF
-CMAKE_ARGS+=		-DSWIPL_PACKAGES_QT=OFF
+
+# Part of swi-prolog-packages
 CMAKE_ARGS+=		-DSWIPL_PACKAGES_X=OFF
 
 USE_TOOLS+=		bash:run
diff --git a/swi-prolog-lite/Makefile.common b/swi-prolog-lite/Makefile.common
index 6ba74aa662..68fdf9bbb3 100644
--- a/swi-prolog-lite/Makefile.common
+++ b/swi-prolog-lite/Makefile.common
@@ -20,6 +20,16 @@ PATCHDIR=		${.CURDIR}/../../wip/swi-prolog-lite/patches
 USE_CMAKE=		yes
 CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release
 
+# XXX: Explicitly disable all not wanted packages to avoid possible build
+# XXX: failures. For a complete list please see:
+# XXX:  ${WRKSRC}/cmake/PackageSelection.cmake
+CMAKE_ARGS+=		-DSWIPL_PACKAGES_ODBC=OFF
+CMAKE_ARGS+=		-DSWIPL_PACKAGES_BDB=OFF
+CMAKE_ARGS+=		-DSWIPL_PACKAGES_PCRE=OFF
+CMAKE_ARGS+=		-DSWIPL_PACKAGES_YAML=OFF
+CMAKE_ARGS+=		-DSWIPL_PACKAGES_TIPC=OFF
+CMAKE_ARGS+=		-DSWIPL_PACKAGES_QT=OFF
+
 # XXX: That's kludgy, can it be avoided?
 MAKE_ENV+=		LD_LIBRARY_PATH=${WRKSRC}/build/src
 
diff --git a/swi-prolog-packages/Makefile b/swi-prolog-packages/Makefile
index 5b07f9826a..75d13e6fd3 100644
--- a/swi-prolog-packages/Makefile
+++ b/swi-prolog-packages/Makefile
@@ -23,15 +23,7 @@ CMAKE_ARGS+=		-DSWIPL_PACKAGES_TERM=OFF
 # Part of swi-prolog-lite... ...but needed to build documentation.
 CMAKE_ARGS+=		-DSWIPL_PACKAGES_ARCHIVE=ON
 
-# XXX: Explicitly disable all not wanted packages to avoid possible build
-# XXX: failures. For a complete list please see:
-# XXX:  ${WRKSRC}/cmake/PackageSelection.cmake
-CMAKE_ARGS+=		-DSWIPL_PACKAGES_ODBC=OFF
-CMAKE_ARGS+=		-DSWIPL_PACKAGES_BDB=OFF
-CMAKE_ARGS+=		-DSWIPL_PACKAGES_PCRE=OFF
-CMAKE_ARGS+=		-DSWIPL_PACKAGES_YAML=OFF
-CMAKE_ARGS+=		-DSWIPL_PACKAGES_TIPC=OFF
-CMAKE_ARGS+=		-DSWIPL_PACKAGES_QT=OFF
+# Part of swi-prolog-jpl
 CMAKE_ARGS+=		-DSWIPL_PACKAGES_JAVA=OFF
 
 SWIPL_PACKAGES_COMPONENTS+=	Graphics_subsystem


Home | Main Index | Thread Index | Old Index