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

[Sascha Steinbiss]

Author: sascha-guest
Date: 2016-05-25 22:03:35 +0000 (Wed, 25 May 2016)
New Revision: 22019

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


Modified: trunk/packages/bowtie/trunk/debian/changelog
===================================================================
--- trunk/packages/bowtie/trunk/debian/changelog	2016-05-25 05:51:04 UTC (rev 22018)
+++ trunk/packages/bowtie/trunk/debian/changelog	2016-05-25 22:03:35 UTC (rev 22019)
@@ -1,3 +1,11 @@
+bowtie (1.1.2-4) unstable; urgency=medium
+
+  * Team upload.
+  * Make build reproducible.
+    - Remove build hostname and compiler version from binary.
+
+ -- Sascha Steinbiss <sascha at steinbiss.name>  Wed, 25 May 2016 22:03:08 +0000
+
 bowtie (1.1.2-3) unstable; urgency=medium
 
   * Enable building arch independent packages separately

Added: trunk/packages/bowtie/trunk/debian/patches/reproducible.patch
===================================================================
--- trunk/packages/bowtie/trunk/debian/patches/reproducible.patch	                        (rev 0)
+++ trunk/packages/bowtie/trunk/debian/patches/reproducible.patch	2016-05-25 22:03:35 UTC (rev 22019)
@@ -0,0 +1,77 @@
+Description: make build reproducible
+Author: Sascha Steinbiss <sascha at steinbiss.name>
+--- a/Makefile
++++ b/Makefile
+@@ -207,9 +207,9 @@
+ 
+ DEFS=-fno-strict-aliasing \
+      -DBOWTIE_VERSION="\"`cat VERSION`\"" \
+-     -DBUILD_HOST="\"`hostname`\"" \
+-     -DBUILD_TIME="\"`date`\"" \
+-     -DCOMPILER_VERSION="\"`$(CXX) -v 2>&1 | tail -1`\"" \
++     -DBUILD_HOST="\"\"" \
++     -DBUILD_TIME="\"\"" \
++     -DCOMPILER_VERSION="\"\"" \
+      $(FILE_FLAGS) \
+      $(PTHREAD_DEF) \
+      $(PREF_DEF) \
+--- a/bowtie_inspect.cpp
++++ b/bowtie_inspect.cpp
+@@ -496,7 +496,7 @@
+ 			} else {
+ 				cout << "Neither 32- nor 64-bit: sizeof(void*) = " << sizeof(void*) << endl;
+ 			}
+-			cout << "Built on " << BUILD_HOST << endl;
++			/* cout << "Built on " << BUILD_HOST << endl;
+ 			cout << BUILD_TIME << endl;
+ 			cout << "Compiler: " << COMPILER_VERSION << endl;
+ 			cout << "Options: " << COMPILER_OPTIONS << endl;
+@@ -504,7 +504,7 @@
+ 				 << sizeof(int)
+ 				 << ", " << sizeof(long) << ", " << sizeof(long long)
+ 				 << ", " << sizeof(void *) << ", " << sizeof(size_t)
+-				 << ", " << sizeof(off_t) << "}" << endl;
++				 << ", " << sizeof(off_t) << "}" << endl; */
+ 			return 0;
+ 		}
+ 
+--- a/ebwt_build.cpp
++++ b/ebwt_build.cpp
+@@ -526,7 +526,7 @@
+ 			} else {
+ 				cout << "Neither 32- nor 64-bit: sizeof(void*) = " << sizeof(void*) << endl;
+ 			}
+-			cout << "Built on " << BUILD_HOST << endl;
++			/* cout << "Built on " << BUILD_HOST << endl;
+ 			cout << BUILD_TIME << endl;
+ 			cout << "Compiler: " << COMPILER_VERSION << endl;
+ 			cout << "Options: " << COMPILER_OPTIONS << endl;
+@@ -534,7 +534,7 @@
+ 				 << sizeof(int)
+ 				 << ", " << sizeof(long) << ", " << sizeof(long long)
+ 				 << ", " << sizeof(void *) << ", " << sizeof(size_t)
+-				 << ", " << sizeof(off_t) << "}" << endl;
++				 << ", " << sizeof(off_t) << "}" << endl; */
+ 			return 0;
+ 		}
+ 
+--- a/ebwt_search.cpp
++++ b/ebwt_search.cpp
+@@ -2837,7 +2837,7 @@
+ 			} else {
+ 				cout << "Neither 32- nor 64-bit: sizeof(void*) = " << sizeof(void*) << endl;
+ 			}
+-			cout << "Built on " << BUILD_HOST << endl;
++			/* cout << "Built on " << BUILD_HOST << endl;
+ 			cout << BUILD_TIME << endl;
+ 			cout << "Compiler: " << COMPILER_VERSION << endl;
+ 			cout << "Options: " << COMPILER_OPTIONS << endl;
+@@ -2845,7 +2845,7 @@
+ 				 << sizeof(int)
+ 				 << ", " << sizeof(long) << ", " << sizeof(long long)
+ 				 << ", " << sizeof(void *) << ", " << sizeof(size_t)
+-				 << ", " << sizeof(off_t) << "}" << endl;
++				 << ", " << sizeof(off_t) << "}" << endl; */
+ 			return 0;
+ 		}
+ 	#ifdef CHUD_PROFILING

Modified: trunk/packages/bowtie/trunk/debian/patches/series
===================================================================
--- trunk/packages/bowtie/trunk/debian/patches/series	2016-05-25 05:51:04 UTC (rev 22018)
+++ trunk/packages/bowtie/trunk/debian/patches/series	2016-05-25 22:03:35 UTC (rev 22019)
@@ -11,3 +11,4 @@
 ppc64el.patch
 enable_arm64.patch
 spelling.patch
+reproducible.patch