[med-svn] r13800 - in trunk/packages/ncbi-blast+/trunk/debian: . patches

[Aaron M. Ucko]

Author: ucko
Date: 2013-06-03 02:59:12 +0000 (Mon, 03 Jun 2013)
New Revision: 13800

Modified:
   trunk/packages/ncbi-blast+/trunk/debian/changelog
   trunk/packages/ncbi-blast+/trunk/debian/patches/use_pie_for_apps
   trunk/packages/ncbi-blast+/trunk/debian/rules
Log:
* debian/patches/use_pie_for_apps: Explicitly build all executables with
  -fPIE -pie, to avoid giving project_tree_builder a partial PIE
  treatment that now fails on mips and mipsel.  (Closes: #710807.)
* debian/rules: Retire redundant APP_LDFLAGS override.


Modified: trunk/packages/ncbi-blast+/trunk/debian/changelog
===================================================================
--- trunk/packages/ncbi-blast+/trunk/debian/changelog	2013-06-03 02:55:44 UTC (rev 13799)
+++ trunk/packages/ncbi-blast+/trunk/debian/changelog	2013-06-03 02:59:12 UTC (rev 13800)
@@ -1,8 +1,12 @@
 ncbi-blast+ (2.2.28-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET.
+  * debian/patches/use_pie_for_apps: Explicitly build all executables with
+    -fPIE -pie, to avoid giving project_tree_builder a partial PIE
+    treatment that now fails on mips and mipsel.  (Closes: #710807.)
+  * debian/rules: Retire redundant APP_LDFLAGS override.
 
- -- Aaron M. Ucko <ucko at debian.org>  Sun, 02 Jun 2013 22:55:40 -0400
+ -- Aaron M. Ucko <ucko at debian.org>  Sun, 02 Jun 2013 22:59:08 -0400
 
 ncbi-blast+ (2.2.28-1) unstable; urgency=low
 

Modified: trunk/packages/ncbi-blast+/trunk/debian/patches/use_pie_for_apps
===================================================================
--- trunk/packages/ncbi-blast+/trunk/debian/patches/use_pie_for_apps	2013-06-03 02:55:44 UTC (rev 13799)
+++ trunk/packages/ncbi-blast+/trunk/debian/patches/use_pie_for_apps	2013-06-03 02:59:12 UTC (rev 13800)
@@ -1,13 +1,13 @@
 Subject: build executables with -fPIE, not -fPIC
 
-* -fPIC is only useful for shared libraries; substitute -fPIE (to be
-   accompanied by appropriate APP_LDFLAGS) when building executables.
+* -fPIC is only useful for shared libraries; substitute -fPIE (along
+   with -pie at link time) when building executables.
 
 Author: Aaron M. Ucko <ucko at debian.org>
 Last-Update: 2012-05-10
 --- a/c++/src/build-system/Makefile.app.in
 +++ b/c++/src/build-system/Makefile.app.in
-@@ -24,8 +24,8 @@
+@@ -24,8 +24,8 @@ default_rule: all
  
  ### C/C++ source file compilation (and maybe auto-dependencies) build rules
  
@@ -18,3 +18,12 @@
  SOURCES      = @UNIX_SRC@ $(SRC)
  include $(builddir)/Makefile.$(Rules)
  
+@@ -72,7 +72,7 @@ rebuild-libs:
+ 
+ $(XAPP): $(XOBJ) $(XLIBDEP)
+ 	@-$(RM) .$(XAPP).stamp
+-	$(LINK_WRAPPER) $(LINK) $(LDFLAGS) $(APP_LDFLAGS) $(XOBJ) $(XOBJ2) $(PRE_LIBS) $(XLIB) $(XAPP_LIBS) @f_outexe@$(XAPP) $(LINK_FILTER)
++	$(LINK_WRAPPER) $(LINK) $(LDFLAGS) $(APP_LDFLAGS) -fPIE -pie $(XOBJ) $(XOBJ2) $(PRE_LIBS) $(XLIB) $(XAPP_LIBS) @f_outexe@$(XAPP) $(LINK_FILTER)
+ 	$(STRIP) $(XAPP)
+ 	$(POST_LINK) $(XAPP)
+ ifneq "$(BINCOPY)" "@:"

Modified: trunk/packages/ncbi-blast+/trunk/debian/rules
===================================================================
--- trunk/packages/ncbi-blast+/trunk/debian/rules	2013-06-03 02:55:44 UTC (rev 13799)
+++ trunk/packages/ncbi-blast+/trunk/debian/rules	2013-06-03 02:59:12 UTC (rev 13800)
@@ -42,8 +42,7 @@
 
 override_dh_auto_build:
 	cd c++/BUILD/build  && \
-	    make -f Makefile.flat all_projects="$(proj)" \
-	      APP_LDFLAGS='-Wl,-E -fPIE -pie'
+	    make -f Makefile.flat all_projects="$(proj)"
 
 override_dh_auto_test:
 	-dh_auto_test