pkgsrc-WIP-changes archive

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

swi-prolog-packages: Explicitly pass not wanted package



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sat Feb 2 17:59:48 2019 +0100
Changeset:	1e26435fe72b25082754080c81a47edf480a2cbb

Modified Files:
	swi-prolog-packages/Makefile
	swi-prolog-packages/TODO

Log Message:
swi-prolog-packages: Explicitly pass not wanted package

Unfortunately the logic to build package can be problematic, e.g.
the build issue documented in TODO happened because unixodbc was
installed.

Pass -DSWIPL_PACKAGES_<package>=OFF to disable all unwanted ones.

Now the build phase completes! (...but there is still a lot of work for the
`install' one!)

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

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

diffstat:
 swi-prolog-packages/Makefile | 11 +++++++++++
 swi-prolog-packages/TODO     | 11 +----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diffs:
diff --git a/swi-prolog-packages/Makefile b/swi-prolog-packages/Makefile
index 0107df705a..f684c1db17 100644
--- a/swi-prolog-packages/Makefile
+++ b/swi-prolog-packages/Makefile
@@ -16,6 +16,17 @@ CMAKE_ARGS+=		-DSWIPL_ARCH=${MACHINE_GNU_PLATFORM}
 CMAKE_ARGS+=		-DSWIPL_PACKAGES=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
+CMAKE_ARGS+=		-DSWIPL_PACKAGES_TIPC=OFF
+CMAKE_ARGS+=		-DSWIPL_PACKAGES_QT=OFF
+CMAKE_ARGS+=		-DSWIPL_PACKAGES_JAVA=OFF
+
 CMAKE_ARGS+=		-DCMAKE_INSTALL_COMPONENT=Core_packages
 CMAKE_ARGS+=		-DCMAKE_INSTALL_COMPONENT=Archive_interface
 CMAKE_ARGS+=		-DCMAKE_INSTALL_COMPONENT=Commandline_editors
diff --git a/swi-prolog-packages/TODO b/swi-prolog-packages/TODO
index 722901fdd1..83bec5eec7 100644
--- a/swi-prolog-packages/TODO
+++ b/swi-prolog-packages/TODO
@@ -1,11 +1,2 @@
 Still needs a lot of work.
-Build fails due:
-
-Scanning dependencies of target plugin_odbc4pl
-[ 30%] Building C object packages/odbc/CMakeFiles/plugin_odbc4pl.dir/odbc.c.o
-.../pkgsrc/wip/swi-prolog-packages/work/swipl-8.0.1/packages/odbc/odbc.c:56:17: fatal error: sql.h: No such file or directory
- #include <sql.h>
-                 ^
-compilation terminated.
---- packages/odbc/CMakeFiles/plugin_odbc4pl.dir/odbc.c.o ---
-*** [packages/odbc/CMakeFiles/plugin_odbc4pl.dir/odbc.c.o] Error code 1
+`install' phase needs to be tested and adjusted.


Home | Main Index | Thread Index | Old Index