[med-svn] [ltrsift] 01/02: improve reproducibility

[Sascha Steinbiss]

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

sascha-guest pushed a commit to branch master
in repository ltrsift.

commit 3d5cbb93b596bea032740685a35550bed73eeea8
Author: Sascha Steinbiss <sascha at steinbiss.name>
Date:   Fri Apr 22 09:14:28 2016 +0000

    improve reproducibility
---
 debian/changelog                            |  7 +++
 debian/patches/use_deterministic_file_order | 88 ++++++++++++++++++++++++++++-
 2 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 78a6b2e..10cea05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ltrsift (1.0.2-7) unstable; urgency=medium
+
+  * Remove -m32/-m64 for building for i386 reproducibility.
+  * Enable compiler output.
+
+ -- Sascha Steinbiss <sascha at steinbiss.name>  Fri, 22 Apr 2016 09:08:50 +0000
+
 ltrsift (1.0.2-6) unstable; urgency=medium
 
   * Update d/upstream/metadata.
diff --git a/debian/patches/use_deterministic_file_order b/debian/patches/use_deterministic_file_order
index f039bac..78e4b4d 100644
--- a/debian/patches/use_deterministic_file_order
+++ b/debian/patches/use_deterministic_file_order
@@ -1,12 +1,96 @@
 Description: Use_deterministic_file_order
 --- a/Makefile
 +++ b/Makefile
-@@ -11,7 +11,7 @@
+@@ -11,24 +11,12 @@
  GT_FLAGS_STATIC := $(GT_FLAGS) `pkg-config --cflags --libs pango pangocairo`
  GT_FLAGS += -lgenometools -L$(gt_prefix)/lib $(LDFLAGS)
  GTK_FLAGS = `pkg-config --cflags --libs gtk+-2.0 gthread-2.0`
 -SOURCES := $(wildcard src/*.c)
+-OBJECTS := $(filter-out obj/src/ltrsift.o obj/src/ltrsift_encode.o, $(SOURCES:%.c=obj/%.o))
 +SOURCES := $(sort $(wildcard src/*.c))
- OBJECTS := $(filter-out obj/src/ltrsift.o obj/src/ltrsift_encode.o, $(SOURCES:%.c=obj/%.o))
++OBJECTS := $(sort $(filter-out obj/src/ltrsift.o obj/src/ltrsift_encode.o, $(SOURCES:%.c=obj/%.o)))
  
  # system specific stuff (concerning 64bit compilation)
+ MACHINE:=$(shell uname -m)
+ 
+-ifeq ($(64bit),yes)
+-  ifneq ($(MACHINE),x86_64)
+-    m64=yes
+-  endif
+-  BIT:=64bit
+-else
+-  ifeq ($(MACHINE),x86_64)
+-    m32=yes
+-  endif
+-  BIT:=32bit
+-endif
+-
+ ifneq ($(opt),no)
+   CFLAGS += -O3
+ endif
+@@ -37,19 +25,6 @@
+   STATICBIN := bin/ltrsift_static bin/ltrsift_encode_static
+ endif
+ 
+-ifneq ($(x32),yes)
+-  ifeq ($(m32),yes)
+-    CFLAGS += -m32
+-  endif
+-
+-  ifeq ($(m64),yes)
+-    ifeq (,$(filter $(MACHINE),arm64 ia64 alpha mips64 mips64el aarch64))
+-      CFLAGS += -m64
+-    endif
+-  endif
+-endif
+-
+-
+ ifneq ($(errorcheck),no)
+   CFLAGS += -Werror
+ endif
+@@ -73,30 +48,30 @@
+ 
+ obj/%.o: %.c
+ 	@echo "[compile $@]"
+-	@$(CC) -c $(CFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(GTK_FLAGS) $(GT_FLAGS) $< -o $(@)
++	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(GTK_FLAGS) $(GT_FLAGS) $< -o $(@)
+ 
+ bin/ltrsift: $(OBJECTS) obj/src/ltrsift.o
+ 	@echo "[linking $@]"
+-	@$(CC) $(OBJECTS) obj/src/ltrsift.o -o $@ $(CFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(GTK_FLAGS) $(GT_FLAGS)
++	$(CC) $(OBJECTS) obj/src/ltrsift.o -o $@ $(CFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(GTK_FLAGS) $(GT_FLAGS)
+ 
+ bin/ltrsift_encode: obj/src/ltrsift_encode.o
+ 	@echo "[linking $@]"
+-	@$(CC) obj/src/ltrsift_encode.o -o $@ $(CFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(GT_FLAGS)
++	$(CC) obj/src/ltrsift_encode.o -o $@ $(CFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(GT_FLAGS)
+ 
+ bin/ltrsift_static: obj/src/ltrsift.o $(OBJECTS) $(gt_prefix)/lib/libgenometools.a
+ 	@echo "[linking $@]"
+-	@$(CC) $(OBJECTS) obj/src/ltrsift.o $(gt_prefix)/lib/libgenometools.a \
++	$(CC) $(OBJECTS) obj/src/ltrsift.o $(gt_prefix)/lib/libgenometools.a \
+ 	  -o $@ $(CFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(GT_FLAGS_STATIC) $(GTK_FLAGS) -lbz2
+ 
+ bin/ltrsift_encode_static: obj/src/ltrsift_encode.o $(gt_prefix)/lib/libgenometools.a
+ 	@echo "[linking $@]"
+-	@$(CC) obj/src/ltrsift_encode.o $(gt_prefix)/lib/libgenometools.a \
++	$(CC) obj/src/ltrsift_encode.o $(gt_prefix)/lib/libgenometools.a \
+ 	   -o $@ $(CFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) \
+ 	   $(GT_FLAGS_STATIC) -lbz2 -lz -lcairo -lm
+ 
+ bin obj obj/src:
+ 	@echo '[create $(@)]'
+-	@test -d $(@) || mkdir -p $(@)
++	test -d $(@) || mkdir -p $(@)
+ 
+ clean:
+ 	rm -rf obj
+@@ -110,7 +85,7 @@
+ MACHINE:=$(shell uname -m)
+ VERSION:="`cat $(CURDIR)/VERSION`"
+ SYSTEMNAME:="$(SYSTEM)_$(MACHINE)"
+-GTDISTBASENAME:="ltrsift-$(VERSION)-$(SYSTEMNAME)-${BIT}"
++GTDISTBASENAME:="ltrsift-$(VERSION)-$(SYSTEMNAME)"
+ DISTDIR:="$(CURDIR)/dist/$(SYSTEMNAME)"
+ SCRIPTSDIR:="$(CURDIR)/scripts"
+ GTDISTDIR:="$(DISTDIR)/$(GTDISTBASENAME)"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ltrsift.git