[Pkg-electronics-commits] [gnucap] 02/02: handle LDFLAGS during auto_build

felix salfelder felix-guest at moszumanska.debian.org
Wed Aug 10 21:37:23 UTC 2016


This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository gnucap.

commit b7a62e00ad1f46da31dec5f4b8edb16c8f2f5be0
Author: Felix Salfelder <felix at salfelder.org>
Date:   Wed Aug 10 22:39:12 2016 +0100

    handle LDFLAGS during auto_build
    
    similarly insane as in auto_install override
---
 debian/rules | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 9c9beeb..7dd64cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,18 +34,33 @@ override_dh_auto_configure:
 	grep GNUCAP_SSP include/md.h || \
 	sed -i '/SYSTEMSTARTPATH/s/"PATH"/"GNUCAP_SSP"/' include/md.h
 
+# workaround: these are hardwired, need to pass them back
+LIB_LDFLAGS = -shared
+EXEC_LDFLAGS = -rdynamic -L../../lib/O
+
 override_dh_auto_build:
 	$(MAKE) -C lib \
-	        LDFLAGS="-shared -Wl,--enable-new-dtags \
-	                         -Wl,-rpath -Wl,${pkglibdir} \
-	                         -Wl,-soname -Wl,libgnucap-0.so \
+	        LDFLAGS="$(LIB_LDFLAGS) \
+	                 -Wl,--enable-new-dtags \
+	                 -Wl,-rpath -Wl,${pkglibdir} \
+	                 -Wl,-soname -Wl,libgnucap-0.so \
 	                  $(LDFLAGS)" \
 	        CPPFLAGS="$(CPPFLAGS)" \
 	        CXXFLAGS="$(CXXFLAGS)"
 	cd $(CURDIR)/lib/O; $(LN_S) libgnucap.so libgnucap-0.so
 
+	$(MAKE) -C modelgen \
+	        LDFLAGS="$(EXEC_LDFLAGS) $(LDFLAGS)" \
+	        CPPFLAGS="$(CPPFLAGS)" \
+	        CXXFLAGS="$(CXXFLAGS)"
+
+	$(MAKE) -C apps \
+	        LDFLAGS="$(LIB_LDFLAGS) $(LDFLAGS)" \
+	        CPPFLAGS="$(CPPFLAGS)" \
+	        CXXFLAGS="$(CXXFLAGS)"
+
 	dh_auto_build --parallel -- \
-	            notyet_LDFLAGS="$(LDFLAGS)" \
+	            LDFLAGS="$(EXEC_LDFLAGS) $(LDFLAGS)" \
 	            CPPFLAGS="$(CPPFLAGS)" \
 	            CXXFLAGS="$(CXXFLAGS)"
 #	#$(MAKE) -C man html/index.html

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/gnucap.git



More information about the Pkg-electronics-commits mailing list