From 98e858bf9dedaf18d450d347209a1c963541ebd2 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 1 Sep 2016 23:13:04 -0400 Subject: [PATCH] debian: fix build reproducibility problems in the rules file The configure file needs to be run using a relative pathname so that when $(srcdir) gets introduced into binary file, the location of the build directory doesn't find its way into the binaries. Signed-off-by: Theodore Ts'o --- debian/rules | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/rules b/debian/rules index ca016dd..157dd6c 100755 --- a/debian/rules +++ b/debian/rules @@ -294,7 +294,7 @@ ${CFGSTDSTAMP}: mkdir -p ${stdbuilddir} ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) cd ${stdbuilddir} && AWK=/usr/bin/awk \ - ${topdir}/configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS} \ + ../../configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS} \ ${EXTRA_CONF_FLAGS} CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" \ LDFLAGS="$(LDFLAGS)" CFLAGS_SHLIB="$(CFLAGS_SHLIB)" \ CFLAGS_STLIB="$(CFLAGS_STLIB)" \ @@ -302,7 +302,7 @@ ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) LDFLAGS_STATIC="$(LDFLAGS_STATIC)" else cd ${stdbuilddir} && AWK=/usr/bin/awk CC="${DEB_HOST_GNU_TYPE}-gcc" \ - ${topdir}/configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS} \ + ../../configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS} \ ${EXTRA_CONF_FLAGS} --build=$(DEB_BUILD_GNU_TYPE) \ --host=$(DEB_HOST_GNU_TYPE) CFLAGS="${CFLAGS}" \ CPPFLAGS="$(CPPFLAGS)" CFLAGS_SHLIB="$(CFLAGS_SHLIB)" \ @@ -316,7 +316,7 @@ endif ifneq ($(ismips),) mkdir -p ${mipsbuilddir} ${mipsbuilddir64} cd ${mipsbuilddir} && AWK=/usr/bin/awk \ - ${topdir}/configure ${COMMON_CONF_FLAGS} \ + ../../configure ${COMMON_CONF_FLAGS} \ ${MIPS_NOPIC_CONF_FLAGS} CFLAGS="${CFLAGS}" \ CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ CFLAGS_SHLIB="$(CFLAGS_SHLIB)" \ @@ -324,7 +324,7 @@ ifneq ($(ismips),) LDFLAGS_SHLIB="$(LDFLAGS_SHLIB)" \ LDFLAGS_STATIC="$(LDFLAGS_STATIC)" cd ${mipsbuilddir64} && AWK=/usr/bin/awk \ - ${topdir}/configure ${COMMON_CONF_FLAGS} \ + ../../configure ${COMMON_CONF_FLAGS} \ ${MIPS_NOPIC_CONF_FLAGS} CFLAGS="${CFLAGS}" \ CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ CFLAGS_SHLIB="$(CFLAGS_SHLIB)" \ @@ -343,7 +343,7 @@ ${CFGBFSTAMP}: mkdir -p ${bfbuilddir} ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) cd ${bfbuilddir} && AWK=/usr/bin/awk \ - ${topdir}/configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} \ + ../../configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} \ ${EXTRA_CONF_FLAGS} CFLAGS="${CFLAGS} ${BF_CFLAGS}" \ CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ CFLAGS_SHLIB="$(CFLAGS_SHLIB)" \ @@ -352,7 +352,7 @@ ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) LDFLAGS_STATIC="$(LDFLAGS_STATIC)" else cd ${bfbuilddir} && AWK=/usr/bin/awk CC="${DEB_HOST_GNU_TYPE}-gcc" \ - ${topdir}/configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} \ + ../../configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} \ ${EXTRA_CONF_FLAGS} --build=$(DEB_BUILD_GNU_TYPE) \ --host=$(DEB_HOST_GNU_TYPE) CFLAGS="${CFLAGS}" \ CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ -- 1.8.3.1