swi-prolog-lite: Inject CFLAGS via C{M,O}FLAGS

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: swi-prolog-lite: Inject CFLAGS via C{M,O}FLAGS
From: Leonardo Taccari <leot%NetBSD.org@localhost>
Date: Mon, 01 Oct 2018 21:39:09 +0000
Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Mon Oct 1 23:39:09 2018 +0200
Changeset:	078df53acdbd88884264e28ff1f30bcd9c9d72a4

Modified Files:
	swi-prolog-lite/Makefile.common
	swi-prolog-lite/distinfo
	swi-prolog-lite/patches/patch-packages_Dialect.defs.in
Removed Files:
	swi-prolog-lite/TODO
	swi-prolog-lite/patches/patch-src_Makefile.in
	swi-prolog-lite/patches/patch-src_libtai_Makefile.in
	swi-prolog-lite/patches/patch-src_os_windows_Makefile.in
	swi-prolog-lite/patches/patch-src_rc_Makefile.in

Log Message:
swi-prolog-lite: Inject CFLAGS via C{M,O}FLAGS

Instead of patching several Makefile-s just inject CFLAGS and -fPIC
via CMFLAGS and COFLAGS that are populated during the configure
phase.

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

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                          |  3 ++-
 swi-prolog-lite/TODO                                     |  3 ---
 swi-prolog-lite/distinfo                                 |  6 +-----
 swi-prolog-lite/patches/patch-packages_Dialect.defs.in   | 12 ------------
 swi-prolog-lite/patches/patch-src_Makefile.in            | 15 ---------------
 swi-prolog-lite/patches/patch-src_libtai_Makefile.in     | 15 ---------------
 swi-prolog-lite/patches/patch-src_os_windows_Makefile.in | 15 ---------------
 swi-prolog-lite/patches/patch-src_rc_Makefile.in         | 15 ---------------
 8 files changed, 3 insertions(+), 81 deletions(-)

diffs:
diff --git a/swi-prolog-lite/Makefile.common b/swi-prolog-lite/Makefile.common
index ffd55b0b7e..44fabccfce 100644
--- a/swi-prolog-lite/Makefile.common
+++ b/swi-prolog-lite/Makefile.common
@@ -17,4 +17,5 @@ DIST_SUBDIR=		swi-prolog
 DISTINFO_FILE=		${.CURDIR}/../../wip/swi-prolog-lite/distinfo
 PATCHDIR=		${.CURDIR}/../../wip/swi-prolog-lite/patches
 
-CFLAGS+=		-fPIC
+CONFIGURE_ENV+=		CMFLAGS="-fPIC"
+CONFIGURE_ENV+=		COFLAGS=${CFLAGS:M*:Q}
diff --git a/swi-prolog-lite/TODO b/swi-prolog-lite/TODO
deleted file mode 100644
index 23e3b9bd0a..0000000000
--- a/swi-prolog-lite/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-- Can the patches needed to adjust CFLAGS be removed (and instead use other
-  C*FLAGS to inject pkgsrc CFLAGS)?
-- Can the patches to add `-fPIC' be removed? (and instead use C*FLAGS)
diff --git a/swi-prolog-lite/distinfo b/swi-prolog-lite/distinfo
index bb85e3f4f7..ee6a0280ff 100644
--- a/swi-prolog-lite/distinfo
+++ b/swi-prolog-lite/distinfo
@@ -5,13 +5,9 @@ RMD160 (swi-prolog/swipl-7.6.4.tar.gz) = 26e4358d277761380298d9e8c189e9aa1147609
 SHA512 (swi-prolog/swipl-7.6.4.tar.gz) = f0ed16e4f1436115651c38a0bb37008d0dadad5a19b0f09894fcfc51dd3d429f86488e89cce00788c3c36cc2f0cd2957f92df47d5441133a6f8ea9d91ca5470f
 Size (swi-prolog/swipl-7.6.4.tar.gz) = 16777875 bytes
 SHA1 (patch-ad) = f5e7ec0cce757963e021539a397af387eff5cf8f
-SHA1 (patch-packages_Dialect.defs.in) = 0c25681b04c428f85be1192622a646fe311b42ec
+SHA1 (patch-packages_Dialect.defs.in) = 29d327a373473c8a5303127c60d4cb78e0c8b74d
 SHA1 (patch-packages_clib_sha1_brg_endian.h) = e7bc21953cedafce67e0070b9ec326446bf474fa
-SHA1 (patch-src_Makefile.in) = d71ce5f67d5c78579d860ab4889f78d380f6a1b8
-SHA1 (patch-src_libtai_Makefile.in) = f36eaf85e5e9109184528888de99fa0929229652
 SHA1 (patch-src_os_pl-files.c) = 222a9a4682808fc62e410b01f38e31c4dcc62f53
-SHA1 (patch-src_os_windows_Makefile.in) = b7e8c2035e626ab9c29d14818da0e1ac0c6a23fc
 SHA1 (patch-src_pl-funcs.h) = fd821e245ca49a42e595096d05a21ee20d25c41c
 SHA1 (patch-src_pl-rsort.c) = 233430c9ead3e1361f40ae541d0527408a141d6e
 SHA1 (patch-src_pl-thread.c) = 204e9afd776cbb3c9213ec41ac373b02b3fde8ac
-SHA1 (patch-src_rc_Makefile.in) = a6a520369cae96100359ad6084201ff1fa5f9ea7
diff --git a/swi-prolog-lite/patches/patch-packages_Dialect.defs.in b/swi-prolog-lite/patches/patch-packages_Dialect.defs.in
index 8b4484ba57..341f301c84 100644
--- a/swi-prolog-lite/patches/patch-packages_Dialect.defs.in
+++ b/swi-prolog-lite/patches/patch-packages_Dialect.defs.in
@@ -1,19 +1,7 @@
 $NetBSD: patch-packages_Dialect.defs.in,v 1.1 2014/05/28 10:29:12 markd Exp $
 
-Pass -fPIC (needed by swi-prolog-jpl).
-Do not ignore CFLAGS.
-
 --- packages/Dialect.defs.in.orig	2014-05-27 12:23:38.000000000 +0000
 +++ packages/Dialect.defs.in
-@@ -44,7 +44,7 @@ SO=@SO_EXT@
- SO_PATH=@SO_PATH@
- COFLAGS=@COFLAGS@
- CWFLAGS=@CWFLAGS@
--CMFLAGS=@CMFLAGS@
-+CMFLAGS=@CMFLAGS@ -fPIC
- CIFLAGS=@CIFLAGS@ -I@abs_top_builddir@/../include
- DEFS=@DEFS@ -D__SWI_PROLOG__
- CFLAGS=$(COFLAGS) $(CWFLAGS) $(CMFLAGS) $(CIFLAGS) $(PKGCFLAGS) $(DEFS)
 @@ -57,7 +57,7 @@ else
  LIBPLSO=$(LIBPLEMBED)
  endif
diff --git a/swi-prolog-lite/patches/patch-src_Makefile.in b/swi-prolog-lite/patches/patch-src_Makefile.in
deleted file mode 100644
index f516496821..0000000000
--- a/swi-prolog-lite/patches/patch-src_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Do not ignore CFLAGS.
-
---- src/Makefile.in.orig	2018-01-12 12:04:38.000000000 +0000
-+++ src/Makefile.in
-@@ -87,7 +87,7 @@ CWFLAGS=@CWFLAGS@
- CIFLAGS=@CIFLAGS@
- CMFLAGS=@CMFLAGS@
- CPFLAGS=
--CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) $(CPFLAGS)
-+CFLAGS+=	$(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) $(CPFLAGS)
- LDFLAGS=@LDFLAGS@ $(CPFLAGS)
- LDOFLAGS=@LDOFLAGS@
- STACKFLAGS=@STACKFLAGS@
diff --git a/swi-prolog-lite/patches/patch-src_libtai_Makefile.in b/swi-prolog-lite/patches/patch-src_libtai_Makefile.in
deleted file mode 100644
index 77cf5f6072..0000000000
--- a/swi-prolog-lite/patches/patch-src_libtai_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Do not ignore CFLAGS.
-
---- src/libtai/Makefile.in.orig	2018-01-12 12:04:38.000000000 +0000
-+++ src/libtai/Makefile.in
-@@ -30,7 +30,7 @@ CIFLAGS=@CIFLAGS@
- CMFLAGS=@CMFLAGS@
- CPFLAGS=
- LDFLAGS=@LDFLAGS@ $(CPFLAGS)
--CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) $(CPFLAGS)
-+CFLAGS+=	$(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) $(CPFLAGS)
- 
- INSTALL=@INSTALL@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
diff --git a/swi-prolog-lite/patches/patch-src_os_windows_Makefile.in b/swi-prolog-lite/patches/patch-src_os_windows_Makefile.in
deleted file mode 100644
index 166e557fb1..0000000000
--- a/swi-prolog-lite/patches/patch-src_os_windows_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Do not ignore CFLAGS.
-
---- src/os/windows/Makefile.in.orig	2018-01-12 12:04:38.000000000 +0000
-+++ src/os/windows/Makefile.in
-@@ -17,7 +17,7 @@ CWFLAGS=@CWFLAGS@
- CIFLAGS=@CIFLAGS@
- CMFLAGS=@CMFLAGS@
- CPFLAGS=
--CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) $(CPFLAGS)
-+CFLAGS+=	$(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) $(CPFLAGS)
- LDFLAGS=@LDFLAGS@ $(CPFLAGS)
- 
- PLHOME=../../..
diff --git a/swi-prolog-lite/patches/patch-src_rc_Makefile.in b/swi-prolog-lite/patches/patch-src_rc_Makefile.in
deleted file mode 100644
index 235ec227c5..0000000000
--- a/swi-prolog-lite/patches/patch-src_rc_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Do not ignore CFLAGS.
-
---- src/rc/Makefile.in.orig	2018-01-12 12:04:38.000000000 +0000
-+++ src/rc/Makefile.in
-@@ -34,7 +34,7 @@ CIFLAGS=@CIFLAGS@
- CMFLAGS=@CMFLAGS@
- CPFLAGS=
- LDFLAGS=@PROGLDFLAGS@ $(CPFLAGS)
--CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) $(CPFLAGS)
-+CFLAGS+=	$(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) $(CPFLAGS)
- 
- INSTALL=@INSTALL@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
Prev by Date: webkit-gtk: Limit patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp to OpenBSD
Next by Date: compiler-rt-netbsd: Update to SVN r. 343523
Previous by Thread: webkit-gtk: Limit patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp to OpenBSD
Next by Thread: compiler-rt-netbsd: Update to SVN r. 343523
Indexes:
Home | Main Index | Thread Index | Old Index