[SCM] stk/master: Fix order of .o files

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0e12473b9753698d765f78b03e9e78a411afa20f
Author: Alexis Bienvenüe <pado at passoire.fr>
Date:   Thu May 12 00:08:28 2016 -0300

    Fix order of .o files
    
    Allows the build to be reproducible
    
    Closes: #822566

diff --git a/debian/patches/0008-Sort-o-files b/debian/patches/0008-Sort-o-files
new file mode 100644
index 0000000..4db9880
--- /dev/null
+++ b/debian/patches/0008-Sort-o-files
@@ -0,0 +1,71 @@
+Description: Sort *.o files
+ Fix the order in which *.o files are merged to build the shared lib,
+ to get reproducible build.
+Author: Alexis Bienvenüe <pado at passoire.fr>
+
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -90,7 +90,7 @@ $(STATICLIB) : $(OBJECTS)
+ 
+ $(SHAREDLIB) : $(OBJECTS)
+ 	$(RM) -f $(@) $(SHAREDLIB).$(MAJOR) $(SHAREDLIB)
+-	$(CC) $(LDFLAGS) -fPIC @libflags@ $(OBJECT_PATH)/*.o $(LIBS)
++	$(CC) $(LDFLAGS) -fPIC @libflags@ `LC_ALL=C ls $(OBJECT_PATH)/*.o` $(LIBS)
+ 	$(LN) -s @sharedname@ $(SHAREDLIB)
+ 
+ install-headers:
+--- a/projects/demo/Makefile.in
++++ b/projects/demo/Makefile.in
+@@ -63,7 +63,7 @@ $(OBJECT_PATH)/.placeholder:
+ 	touch $(OBJECT_PATH)/.placeholder
+ 
+ stk-demo: demo.cpp $(OBJECTS)
+-	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o stk-demo demo.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o stk-demo demo.cpp `LC_ALL=C ls $(OBJECT_PATH)/*.o` $(LIBRARY)
+ 
+ libdemo: demo.cpp
+ 	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o demo utilities.cpp demo.cpp -L../../src -lstk $(LIBRARY)
+--- a/projects/effects/Makefile.in
++++ b/projects/effects/Makefile.in
+@@ -52,7 +52,7 @@ $(OBJECT_PATH)/.placeholder:
+ 	touch $(OBJECT_PATH)/.placeholder
+ 
+ effects: effects.cpp $(OBJECTS)
+-	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o effects effects.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o effects effects.cpp `LC_ALL=C ls $(OBJECT_PATH)/*.o` $(LIBRARY)
+ 
+ libeffects: effects.cpp
+ 	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o effects effects.cpp -L../../src -lstk $(LIBRARY)
+--- a/projects/eguitar/Makefile.in
++++ b/projects/eguitar/Makefile.in
+@@ -52,7 +52,7 @@ $(OBJECT_PATH)/.placeholder:
+ 	touch $(OBJECT_PATH)/.placeholder
+ 
+ eguitar: eguitar.cpp $(OBJECTS)
+-	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o eguitar eguitar.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o eguitar eguitar.cpp `LC_ALL=C ls $(OBJECT_PATH)/*.o` $(LIBRARY)
+ 
+ libeguitar: eguitar.cpp
+ 	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o eguitar utilities.cpp eguitar.cpp -L../../src -lstk $(LIBRARY)
+--- a/projects/examples/Makefile.in
++++ b/projects/examples/Makefile.in
+@@ -57,7 +57,7 @@ strip :
+ 	strip $(PROGRAMS)
+ 
+ audioprobe: @objects@
+-	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o audioprobe audioprobe.cpp $(OBJECT_PATH)/*.o $(LIBRARY) -lrtaudio
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o audioprobe audioprobe.cpp `LC_ALL=C ls $(OBJECT_PATH)/*.o` $(LIBRARY) -lrtaudio
+ 
+ midiprobe:
+ 	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o midiprobe midiprobe.cpp $(LIBRARY) -lrtmidi
+--- a/projects/ragamatic/Makefile.in
++++ b/projects/ragamatic/Makefile.in
+@@ -53,7 +53,7 @@ $(OBJECT_PATH)/.placeholder:
+ 	touch $(OBJECT_PATH)/.placeholder
+ 
+ ragamat: ragamat.cpp $(OBJECTS)
+-	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o ragamat ragamat.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o ragamat ragamat.cpp `LC_ALL=C ls $(OBJECT_PATH)/*.o` $(LIBRARY)
+ 
+ libragamat: ragamat.cpp Tabla.cpp Drone.cpp VoicDrum.cpp
+ 	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o ragamat Tabla.cpp Drone.cpp VoicDrum.cpp ragamat.cpp -L../../src -lstk $(LIBRARY)
diff --git a/debian/patches/series b/debian/patches/series
index 25e56c4..d0f0fc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-Fix-install-target-for-new-soname-scheme.patch
 0007-Finish-renaming-SKINI.patch
 0007-demo-needs-rt.patch
+0008-Sort-o-files

-- 
stk packaging