patches: add configure_find_lc_all.patch

diff --git a/debian/changelog b/debian/changelog
index dd1fecd94089c5eff61876e061b9edf2bdc2f3fd..a9b8df1ff1dd52a552855916ccb5108a2b89c699 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ collectd (5.5.2-2) UNRELEASED; urgency=low
     - Set urgency back to low.
   * debian/control:
     - Update GCrypt's package name to libgcrypt20-dev.
+  * debian/patches:
+    - Added configure_find_lc_all.patch: forcing locale in configure script
+      will hopefully fix build reproducibility on non-amd64 plafroms.
 
  -- Marc Fournier <marc@bl.uem.li>  Wed, 21 Sep 2016 13:45:32 +0200
 

diff --git a/debian/patches/configure_find_lc_all.patch b/debian/patches/configure_find_lc_all.patch
new file mode 100644 (file)
index 0000000..00f31be
--- /dev/null
+++ b/debian/patches/configure_find_lc_all.patch
@@ -0,0 +1,51 @@
+Description: set locale when running find, to ensure a reproducible sort order
+Author: Marc Fournier <marc@bl.uem.li>
+diff --git a/configure.ac b/configure.ac
+index ceb0b30..2d05efa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2258,7 +2258,7 @@ then
+       if test -d "$with_java_home"
+       then
+               AC_MSG_CHECKING([for jni.h])
+-              TMPVAR=`find -L "$with_java_home" -name jni.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
++              TMPVAR=`LC_ALL=C find -L "$with_java_home" -name jni.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
+               if test "x$TMPVAR" != "x"
+               then
+                       AC_MSG_RESULT([found in $TMPVAR])
+@@ -2268,7 +2268,7 @@ then
+               fi
+ 
+               AC_MSG_CHECKING([for jni_md.h])
+-              TMPVAR=`find -L "$with_java_home" -name jni_md.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
++              TMPVAR=`LC_ALL=C find -L "$with_java_home" -name jni_md.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
+               if test "x$TMPVAR" != "x"
+               then
+                       AC_MSG_RESULT([found in $TMPVAR])
+@@ -2278,7 +2278,7 @@ then
+               fi
+ 
+               AC_MSG_CHECKING([for libjvm.so])
+-              TMPVAR=`find -L "$with_java_home" -type f \( -name libjvm.so -o -name libjvm.dylib \) -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
++              TMPVAR=`LC_ALL=C find -L "$with_java_home" -type f \( -name libjvm.so -o -name libjvm.dylib \) -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
+               if test "x$TMPVAR" != "x"
+               then
+                       AC_MSG_RESULT([found in $TMPVAR])
+@@ -2290,7 +2290,7 @@ then
+               if test "x$JAVAC" = "x"
+               then
+                       AC_MSG_CHECKING([for javac])
+-                      TMPVAR=`find -L "$with_java_home" -name javac -type f 2>/dev/null | head -n 1`
++                      TMPVAR=`LC_ALL=C find -L "$with_java_home" -name javac -type f 2>/dev/null | head -n 1`
+                       if test "x$TMPVAR" != "x"
+                       then
+                               JAVAC="$TMPVAR"
+@@ -2302,7 +2302,7 @@ then
+               if test "x$JAR" = "x"
+               then
+                       AC_MSG_CHECKING([for jar])
+-                      TMPVAR=`find -L "$with_java_home" -name jar -type f 2>/dev/null | head -n 1`
++                      TMPVAR=`LC_ALL=C find -L "$with_java_home" -name jar -type f 2>/dev/null | head -n 1`
+                       if test "x$TMPVAR" != "x"
+                       then
+                               JAR="$TMPVAR"

diff --git a/debian/patches/series b/debian/patches/series
index 596420ab80697d2c2c0082eba03e6af1e0bbd63a..38ab83f6d8d7a3d524a954e6c742244e75986cd8 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 bts832577-gcry-control.patch
+configure_find_lc_all.patch
 rrd_filter_path.patch
 collection_conf_path.patch
 myplugin_includes.patch