pkgsrc-WIP-changes archive

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

swi-prolog*: Move USE_LANGUAGES and SWIPL_ARCH definition to Makefile.common



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

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

Log Message:
swi-prolog*: Move USE_LANGUAGES and SWIPL_ARCH definition to Makefile.common

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

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

diffstat:
 swi-prolog-jpl/Makefile         | 3 ---
 swi-prolog-lite/Makefile        | 3 ---
 swi-prolog-lite/Makefile.common | 3 +++
 swi-prolog-packages/Makefile    | 3 ---
 4 files changed, 3 insertions(+), 9 deletions(-)

diffs:
diff --git a/swi-prolog-jpl/Makefile b/swi-prolog-jpl/Makefile
index fd9d184f00..5914af7efd 100644
--- a/swi-prolog-jpl/Makefile
+++ b/swi-prolog-jpl/Makefile
@@ -9,9 +9,6 @@ COMMENT=		Packages for SWI Prolog
 
 USE_TOOLS+=		pkg-config
 
-USE_LANGUAGES=		c c++
-
-CMAKE_ARGS+=		-DSWIPL_ARCH=${MACHINE_GNU_PLATFORM}
 CMAKE_ARGS+=		-DSWIPL_PACKAGES_JAVA=ON
 CMAKE_ARGS+=		-DINSTALL_PACKAGES=OFF
 CMAKE_ARGS+=		-DINSTALL_DOCUMENTATION=OFF
diff --git a/swi-prolog-lite/Makefile b/swi-prolog-lite/Makefile
index 2f7152f53b..7800281567 100644
--- a/swi-prolog-lite/Makefile
+++ b/swi-prolog-lite/Makefile
@@ -7,7 +7,6 @@ PKGNAME=		swi-prolog-lite-${SWIPLVERS}
 MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 COMMENT=		ISO/Edinburgh-style Prolog compiler
 
-CMAKE_ARGS+=		-DSWIPL_ARCH=${MACHINE_GNU_PLATFORM}
 CMAKE_ARGS+=		-DSWIPL_INSTALL_MANPAGES=${PKGMANDIR}/man1
 CMAKE_ARGS+=		-DSWIPL_PACKAGES_BASIC=ON
 CMAKE_ARGS+=		-DSWIPL_PACKAGES_ARCHIVE=ON
@@ -23,8 +22,6 @@ CMAKE_ARGS+=		-DSWIPL_PACKAGES_X=OFF
 
 USE_TOOLS+=		bash:run
 
-USE_LANGUAGES=		c c++
-
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(LP64PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@) || \
diff --git a/swi-prolog-lite/Makefile.common b/swi-prolog-lite/Makefile.common
index 68fdf9bbb3..37ab12bfac 100644
--- a/swi-prolog-lite/Makefile.common
+++ b/swi-prolog-lite/Makefile.common
@@ -19,6 +19,7 @@ PATCHDIR=		${.CURDIR}/../../wip/swi-prolog-lite/patches
 
 USE_CMAKE=		yes
 CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+=		-DSWIPL_ARCH=${MACHINE_GNU_PLATFORM}
 
 # XXX: Explicitly disable all not wanted packages to avoid possible build
 # XXX: failures. For a complete list please see:
@@ -30,6 +31,8 @@ CMAKE_ARGS+=		-DSWIPL_PACKAGES_YAML=OFF
 CMAKE_ARGS+=		-DSWIPL_PACKAGES_TIPC=OFF
 CMAKE_ARGS+=		-DSWIPL_PACKAGES_QT=OFF
 
+USE_LANGUAGES=		c c++
+
 # 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 75d13e6fd3..6863655bd3 100644
--- a/swi-prolog-packages/Makefile
+++ b/swi-prolog-packages/Makefile
@@ -9,9 +9,6 @@ COMMENT=		Packages for SWI Prolog
 
 USE_TOOLS+=		pkg-config
 
-USE_LANGUAGES=		c c++
-
-CMAKE_ARGS+=		-DSWIPL_ARCH=${MACHINE_GNU_PLATFORM}
 CMAKE_ARGS+=		-DINSTALL_PACKAGES=ON
 CMAKE_ARGS+=		-DINSTALL_DOCUMENTATION=ON
 


Home | Main Index | Thread Index | Old Index