replaced PREFIX= with DESTDIR= to make builds reproducible (issue #166)

This commit is contained in:
Trammell Hudson 2017-04-06 16:01:56 -04:00
parent 09718fc97e
commit 96fe3f3f09
Failed to extract signature
4 changed files with 16 additions and 8 deletions

View File

@ -10,13 +10,14 @@ libusb_hash := 7dce9cce9a81194b7065ee912bcd55eeffebab694ea403ffb91b67db66b1824b
libusb_configure := ./configure \ libusb_configure := ./configure \
CC="$(heads_cc)" \ CC="$(heads_cc)" \
--host i386-elf-linux \ --host i386-elf-linux \
--prefix "$(INSTALL)" \ --prefix "/" \
--disable-udev \ --disable-udev \
# Run one build to generate the executables with the pre-defined # Run one build to generate the executables with the pre-defined
# exec_prefix and datarootdir, then a second make to install the binaries # exec_prefix and datarootdir, then a second make to install the binaries
# into our actual target location # into our actual target location
libusb_target := $(MAKE_JOBS) \ libusb_target := $(MAKE_JOBS) \
DESTDIR="$(INSTALL)" \
install \ install \
libusb_libraries := libusb/.libs/libusb-1.0.so.0 libusb_libraries := libusb/.libs/libusb-1.0.so.0

View File

@ -12,15 +12,16 @@ libusb-compat_hash := 404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea32
libusb-compat_configure := ./configure \ libusb-compat_configure := ./configure \
CC="$(heads_cc)" \ CC="$(heads_cc)" \
--host i386-elf-linux \ --host i386-elf-linux \
--prefix "$(INSTALL)" \ --prefix "/" \
PKG_CONFIG=/bin/false \ PKG_CONFIG=/bin/false \
LIBUSB_1_0_CFLAGS="-I$(INSTALL)/include/libusb-1.0" \ LIBUSB_1_0_CFLAGS="-I$(INSTALL)/include/libusb-1.0" \
LIBUSB_1_0_LIBS="-L$(INSTALL)/lib -lusb-1.0" \ LIBUSB_1_0_LIBS="$(INSTALL)/libusb-1.0.so" \
# Run one build to generate the executables with the pre-defined # Run one build to generate the executables with the pre-defined
# exec_prefix and datarootdir, then a second make to install the binaries # exec_prefix and datarootdir, then a second make to install the binaries
# into our actual target location # into our actual target location
libusb-compat_target := $(MAKE_JOBS) \ libusb-compat_target := $(MAKE_JOBS) \
DESTDIR="$(INSTALL)" \
install \ install \
libusb-compat_libraries := libusb/.libs/libusb-0.1.so.4 libusb-compat_libraries := libusb/.libs/libusb-0.1.so.4

View File

@ -14,7 +14,7 @@ lvm2_configure := \
ac_cv_func_realloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes \
./configure \ ./configure \
--host i386-elf-linux \ --host i386-elf-linux \
--prefix $(INSTALL) \ --prefix "/" \
--disable-selinux \ --disable-selinux \
--disable-udev-systemd-background-jobs \ --disable-udev-systemd-background-jobs \
--disable-realtime \ --disable-realtime \
@ -27,7 +27,12 @@ lvm2_configure := \
# not sure why LIB_SUFFIX is not defined in the cross build # not sure why LIB_SUFFIX is not defined in the cross build
lvm2_target := \ lvm2_target := \
$(MAKE_JOBS) \ $(MAKE_JOBS) \
all install_device-mapper \ all \
&& \
$(MAKE) \
-C $(build)/$(lvm2_dir) \
DESTDIR="$(INSTALL)" \
install_device-mapper \
lvm2_libraries := libdm/libdevmapper.so.1.02 lvm2_libraries := libdm/libdevmapper.so.1.02

View File

@ -22,8 +22,8 @@ pciutils_target := \
ZLIB=no \ ZLIB=no \
HWDB=no \ HWDB=no \
SHARED=yes \ SHARED=yes \
IDSDIR=/ \ IDSDIR="/" \
PREFIX=$(INSTALL) \ PREFIX="/" \
&& \ && \
$(MAKE) \ $(MAKE) \
-C $(build)/$(pciutils_dir) \ -C $(build)/$(pciutils_dir) \
@ -31,7 +31,8 @@ pciutils_target := \
ZLIB=no \ ZLIB=no \
HWDB=no \ HWDB=no \
SHARED=yes \ SHARED=yes \
PREFIX=$(INSTALL) \ PREFIX="/" \
DESTDIR="$(INSTALL)" \
install \ install \
install-lib \ install-lib \