[med-svn] r22757 - in trunk/packages/bowtie/trunk/debian: . patches

[Sascha Steinbiss]

Author: satta
Date: 2016-09-07 10:41:37 +0000 (Wed, 07 Sep 2016)
New Revision: 22757

Modified:
   trunk/packages/bowtie/trunk/debian/changelog
   trunk/packages/bowtie/trunk/debian/patches/reproducible.patch
Log:
make build reproducible again


Modified: trunk/packages/bowtie/trunk/debian/changelog
===================================================================
--- trunk/packages/bowtie/trunk/debian/changelog	2016-09-06 16:50:33 UTC (rev 22756)
+++ trunk/packages/bowtie/trunk/debian/changelog	2016-09-07 10:41:37 UTC (rev 22757)
@@ -1,3 +1,11 @@
+bowtie (1.1.2-5) unstable; urgency=medium
+
+  * Team upload.
+  * Make build reproducible again.
+    - Remove build directory from recorded CFLAGS.
+
+ -- Sascha Steinbiss <satta at debian.org>  Wed, 07 Sep 2016 10:13:36 +0000
+
 bowtie (1.1.2-4) unstable; urgency=medium
 
   * Team upload.

Modified: trunk/packages/bowtie/trunk/debian/patches/reproducible.patch
===================================================================
--- trunk/packages/bowtie/trunk/debian/patches/reproducible.patch	2016-09-06 16:50:33 UTC (rev 22756)
+++ trunk/packages/bowtie/trunk/debian/patches/reproducible.patch	2016-09-07 10:41:37 UTC (rev 22757)
@@ -15,3 +15,14 @@
       $(FILE_FLAGS) \
       $(PTHREAD_DEF) \
       $(PREF_DEF) \
+@@ -217,8 +217,8 @@
+      $(SHMEM_DEF)
+ 
+ ALL_FLAGS = $(EXTRA_FLAGS) $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(LDFLAGS)
+-DEBUG_DEFS = -DCOMPILER_OPTIONS="\"$(DEBUG_FLAGS) $(ALL_FLAGS)\""
+-RELEASE_DEFS = -DCOMPILER_OPTIONS="\"$(RELEASE_FLAGS) $(ALL_FLAGS)\""
++DEBUG_DEFS = -DCOMPILER_OPTIONS="\"$(DEBUG_FLAGS) $(subst $(shell pwd),.,$(ALL_FLAGS))\""
++RELEASE_DEFS = -DCOMPILER_OPTIONS="\"$(RELEASE_FLAGS) $(subst $(shell pwd),.,$(ALL_FLAGS))\""
+ 
+ #
+ # bowtie-build targets