patches/configure_find_lc_all.patch: pipe find results to sort, fixing build reproduc...

diff --git a/debian/changelog b/debian/changelog
index 9872a06c9dea640125bb43c42f7a2299e61e7bd5..e90125ca2732f02f0f93fffb2d1565f06f5fe73c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ collectd (5.6.1-1) UNRELEASED; urgency=medium
       Shish for reporting this (Closes: #839771).
     - rrdcached plugin now reconnects to daemon. Thanks to Matthias Urlichs
       for reporting this (Closes: #657877).
+  * debian/patches:
+    - Update configure_find_lc_all.patch to reliably pick the same JVM for
+      each build, making the process reproducible.
   * debian/rules:
     - Disable building the barometer, drbd, fhcount and ipc plugins on
       kfreebsd architectures, as they are Linux-only.

diff --git a/debian/patches/configure_find_lc_all.patch b/debian/patches/configure_find_lc_all.patch
index 00f31be080a92b624c9efbc2fdaea4f68067b80a..f2236732ee1d985f4dd212c59f6e491e10ad6f18 100644 (file)
--- a/debian/patches/configure_find_lc_all.patch
+++ b/debian/patches/configure_find_lc_all.patch
@@ -9,7 +9,7 @@ index ceb0b30..2d05efa 100644
        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`
++              TMPVAR=`LC_ALL=C find -L "$with_java_home" -name jni.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | sort | head -n 1`
                if test "x$TMPVAR" != "x"
                then
                        AC_MSG_RESULT([found in $TMPVAR])
@@ -18,7 +18,7 @@ index ceb0b30..2d05efa 100644
  
                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`
++              TMPVAR=`LC_ALL=C find -L "$with_java_home" -name jni_md.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | sort | head -n 1`
                if test "x$TMPVAR" != "x"
                then
                        AC_MSG_RESULT([found in $TMPVAR])
@@ -27,7 +27,7 @@ index ceb0b30..2d05efa 100644
  
                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`
++              TMPVAR=`LC_ALL=C find -L "$with_java_home" -type f \( -name libjvm.so -o -name libjvm.dylib \) -exec 'dirname' '{}' ';' 2>/dev/null | sort | head -n 1`
                if test "x$TMPVAR" != "x"
                then
                        AC_MSG_RESULT([found in $TMPVAR])
@@ -36,7 +36,7 @@ index ceb0b30..2d05efa 100644
                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`
++                      TMPVAR=`LC_ALL=C find -L "$with_java_home" -name javac -type f 2>/dev/null | sort | head -n 1`
                        if test "x$TMPVAR" != "x"
                        then
                                JAVAC="$TMPVAR"
@@ -45,7 +45,7 @@ index ceb0b30..2d05efa 100644
                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`
++                      TMPVAR=`LC_ALL=C find -L "$with_java_home" -name jar -type f 2>/dev/null | sort | head -n 1`
                        if test "x$TMPVAR" != "x"
                        then
                                JAR="$TMPVAR"