[arch-commits] Commit in lcalc/trunk (PKGBUILD lcalc-system-cflags.patch)

[Antonio Rojas]

    Date: Monday, August 5, 2019 @ 09:18:31
  Author: arojas
Revision: 497459

Use system build flags

Added:
  lcalc/trunk/lcalc-system-cflags.patch
Modified:
  lcalc/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   21 ++++++++++++---------
 lcalc-system-cflags.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-05 09:09:00 UTC (rev 497458)
+++ PKGBUILD	2019-08-05 09:18:31 UTC (rev 497459)
@@ -2,7 +2,7 @@
 
 pkgname=lcalc
 pkgver=1.23
-pkgrel=17
+pkgrel=18
 pkgdesc="C++ L-function class library and command line interface"
 arch=(x86_64)
 url="http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html"
@@ -10,14 +10,15 @@
 depends=(pari)
 makedepends=(chrpath)
 #source=("http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/L-$pkgver.tar.gz"
-source=("http://mirrors.mit.edu/sage/spkg/upstream/lcalc/lcalc-$pkgver.tar.bz2"
-        Lcommon.h.patch gcc-4.9.patch pari-2.7.patch gcc-5.patch lcalc-c++11.patch)
-md5sums=('de7dc4e06cff7a89c5d922b4acc2be01'
-         '8af1dd6d3118bb785f193283a31305a2'
-         '436dd35b06766dffad0941bcfb511e89'
-         '187024b6d6f259209645af68ca8787f2'
-         '88d8a28a75e0bc143d0898f2797d1c54'
-         'ad0fcfb066e92fa57b32a78d11f434e1')
+source=("https://mirrors.mit.edu/sage/spkg/upstream/lcalc/lcalc-$pkgver.tar.bz2"
+        Lcommon.h.patch gcc-4.9.patch pari-2.7.patch gcc-5.patch lcalc-c++11.patch lcalc-system-cflags.patch)
+sha256sums=('83d4253ec2f38553b21190d6d0c6b71bab7ea14717f6dde5bd18f60775d3cdb0'
+            'cad59ddc93f6fecf238d56e09ab29e59d8b8129d2c8dc10f32b643e86eb1cce1'
+            '55c6c9f969593f24c75a85e7a150b876671356aa68ceb8e77c563a645897643e'
+            '437e3870342ef4cb5749398ead9381504403e7e1f99efadab95f4a607678b400'
+            '66bfa8df3a7cadbe9cfc9f7f05e0dedd0195e68db048e05ce4e1a96d25946aef'
+            '89820d96a0106365875246c36d4adf86f4464cba80bf03095c9a21e2fccb8e69'
+            '045604ebff18ea126c597f076b7c22f331e5767a8c59f4d726d7e9dd7aef8fc7')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -30,6 +31,8 @@
   sed -e 's|include/Lfunction|include/libLfunction|g' -i src/Makefile
 # make headers C++11 compliant
   patch -p1 -i ../lcalc-c++11.patch
+# use system CFLAGS/LDFLAGS
+  patch -p1 -i ../lcalc-system-cflags.patch
 }
 
 build() {

Added: lcalc-system-cflags.patch
===================================================================
--- lcalc-system-cflags.patch	                        (rev 0)
+++ lcalc-system-cflags.patch	2019-08-05 09:18:31 UTC (rev 497459)
@@ -0,0 +1,32 @@
+--- lcalc-1.23/src/Makefile.orig	2019-08-05 09:09:40.888836276 +0000
++++ lcalc-1.23/src/Makefile	2019-08-05 09:10:16.912666730 +0000
+@@ -58,7 +58,7 @@
+    #MACHINE_SPECIFIC_FLAGS = -mpowerpc -mpowerpc64 -m64
+ endif
+ 
+-CCFLAGS =  -Wa,-W -O3 $(OPENMP_FLAG) -Wno-deprecated $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA)
++CCFLAGS =  -Wa,-W -O3 $(OPENMP_FLAG) -Wno-deprecated $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA) $(CXXFLAGS)
+ #CCFLAGS =  -Wa,-W -O3 $(OPENMP_FLAG)  $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA)
+ #CCFLAGS =  -Wa,-W -O2 -fno-exceptions -Wno-deprecated $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA)
+ 
+@@ -104,9 +104,9 @@
+ endif
+ 
+ ifeq ($(PARI_DEFINE),-DINCLUDE_PARI)
+-    LDFLAGS = $(LDFLAGS2) -L$(LOCATION_PARI_LIBRARY) -lpari
++    LDFLAGS += $(LDFLAGS2) -L$(LOCATION_PARI_LIBRARY) -lpari
+ else
+-    LDFLAGS = $(LDFLAGS2)
++    LDFLAGS += $(LDFLAGS2) 
+ endif
+ 
+ 
+@@ -262,7 +262,7 @@
+ 
+ 
+ libLfunction.so: $(OBJ_L)
+-	g++ -$(DYN_OPTION)  -o libLfunction.so $(OBJ_L)
++	g++ -$(DYN_OPTION)  -o libLfunction.so $(OBJ_L) $(LDFLAGS)
+ 
+ clean:
+ 	rm -f *.o lcalc libLfunction.so example_programs/example