From c48f286015cc2282b0dff7789521587996fb7e16 Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Thu, 22 Sep 2016 09:23:35 +0200 Subject: [PATCH] patches/configure_find_lc_all.patch: pipe find results to sort, fixing build reproducibility --- debian/changelog | 3 +++ debian/patches/configure_find_lc_all.patch | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9872a06..e90125c 100644 --- 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 00f31be..f223673 100644 --- 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" -- 2.30.2