[med-svn] r20575 - in trunk/packages/aegean/trunk/debian: . patches

[Sascha Steinbiss]

Author: sascha-guest
Date: 2015-11-29 19:23:06 +0000 (Sun, 29 Nov 2015)
New Revision: 20575

Added:
   trunk/packages/aegean/trunk/debian/patches/sort_source_files
Modified:
   trunk/packages/aegean/trunk/debian/changelog
   trunk/packages/aegean/trunk/debian/patches/series
   trunk/packages/aegean/trunk/debian/rules
Log:
work on reproducibility


Modified: trunk/packages/aegean/trunk/debian/changelog
===================================================================
--- trunk/packages/aegean/trunk/debian/changelog	2015-11-29 13:31:39 UTC (rev 20574)
+++ trunk/packages/aegean/trunk/debian/changelog	2015-11-29 19:23:06 UTC (rev 20575)
@@ -1,3 +1,10 @@
+aegean (0.14.1+dfsg2-2) unstable; urgency=low
+
+  * d/rules: build w/o parallelism, set LC_ALL
+  * patch Makefile to remove nondeterminism
+
+ -- Sascha Steinbiss <sascha at steinbiss.name>  Sun, 29 Nov 2015 19:19:01 +0000
+
 aegean (0.14.1+dfsg2-1) unstable; urgency=medium
 
   * Exclude DataTables JS source, add Depends to new package

Modified: trunk/packages/aegean/trunk/debian/patches/series
===================================================================
--- trunk/packages/aegean/trunk/debian/patches/series	2015-11-29 13:31:39 UTC (rev 20574)
+++ trunk/packages/aegean/trunk/debian/patches/series	2015-11-29 19:23:06 UTC (rev 20575)
@@ -5,3 +5,4 @@
 fix_m64_on_some_archs
 adjust_datapath
 follow_links
+sort_source_files

Added: trunk/packages/aegean/trunk/debian/patches/sort_source_files
===================================================================
--- trunk/packages/aegean/trunk/debian/patches/sort_source_files	                        (rev 0)
+++ trunk/packages/aegean/trunk/debian/patches/sort_source_files	2015-11-29 19:23:06 UTC (rev 20575)
@@ -0,0 +1,12 @@
+Description: Sort_source_files
+--- a/Makefile
++++ b/Makefile
+@@ -21,7 +21,7 @@
+ #----- Source, header, and object files -----#
+ 
+ # AEGeAn core class and module files
+-AGN_SRCS=$(wildcard src/core/Agn*.c)
++AGN_SRCS=$(sort $(wildcard src/core/Agn*.c))
+ AGN_OBJS=$(patsubst src/core/%.c,obj/%.o,$(AGN_SRCS))
+ AGN_HDRS=$(patsubst src/core%.c,inc/core/%.h,$(AGN_SRCS))
+ 

Modified: trunk/packages/aegean/trunk/debian/rules
===================================================================
--- trunk/packages/aegean/trunk/debian/rules	2015-11-29 13:31:39 UTC (rev 20574)
+++ trunk/packages/aegean/trunk/debian/rules	2015-11-29 19:23:06 UTC (rev 20575)
@@ -6,6 +6,7 @@
 VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[~-].*//')
 OVERSION := $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[+].*//')
 export DESTDIR=$(CURDIR)/debian/tmp
+export LC_ALL=C.UTF-8
 
 BITS:=$(shell dpkg-architecture | grep DEB_BUILD_ARCH_BITS | cut -f 2 -d'=')
 ifeq ($(BITS),64)
@@ -15,10 +16,10 @@
 endif
 
 %:
-	dh $@ --parallel
+	dh $@
 
 override_dh_auto_build:
-	dh_auto_build --parallel -- prefix=$(DESTDIR) 64bit=$(64BIT) errorcheck=no
+	dh_auto_build -- prefix=$(DESTDIR) 64bit=$(64BIT) errorcheck=no
 
 override_dh_auto_test:
 	#dh_auto_test -- useshared=yes 64bit=$(64BIT) testthreads=5