From 90216068f438a2a60dc01276b141f44bb20189d6 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 24 May 2020 18:07:27 +0200 Subject: [PATCH] Makefile: Support passing environment variables through make--and use it to support host compilers that use environment variables CPATH etc --- Makefile | 9 +++++++-- modules/busybox | 1 + modules/cairo | 1 + modules/cryptsetup | 1 + modules/dropbear | 1 + modules/fbwhiptail | 1 + modules/flashrom | 1 + modules/flashtools | 1 + modules/frotz | 1 + modules/gpg | 1 + modules/gpg2 | 1 + modules/kexec | 1 + modules/libassuan | 1 + modules/libgcrypt | 3 +++ modules/libgpg-error | 1 + modules/libksba | 1 + modules/libpng | 1 + modules/libremkey-hotp-verification | 1 + modules/libusb | 1 + modules/libusb-compat | 1 + modules/lvm2 | 1 + modules/mbedtls | 1 + modules/msrtools | 1 + modules/newt | 1 + modules/npth | 1 + modules/pciutils | 1 + modules/pinentry | 1 + modules/pixman | 1 + modules/popt | 1 + modules/qrencode | 1 + modules/slang | 1 + modules/tpmtotp | 1 + modules/util-linux | 1 + modules/zlib | 1 + 34 files changed, 42 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a0bda55be..070be2ac1 100644 --- a/Makefile +++ b/Makefile @@ -126,6 +126,11 @@ CROSS_TOOLS_NOCC := \ CROSS_TOOLS := \ CC="$(heads_cc)" \ + CPP="$(CROSS)cpp" \ + CXXCPP="$(CROSS)cpp" \ + $(if $(CC_FOR_BUILD),CC_FOR_BUILD="$(CC_FOR_BUILD)",) \ + $(if $(BUILD_CC),BUILD_CC="$(BUILD_CC)",) \ + $(if $(HOSTCC),HOSTCC="$(HOSTCC)",) \ $(CROSS_TOOLS_NOCC) \ @@ -352,7 +357,7 @@ define define_module = echo "$(MAKE) \ -C \"$(build)/$($1_dir)\" \ $($1_target)" ; \ - $(MAKE) \ + $($1_make_environment) $(MAKE) \ -C "$(build)/$($1_dir)" \ $($1_target) \ ) \ @@ -457,7 +462,7 @@ $(COREBOOT_UTIL_DIR)/superiotool/superiotool \ $(COREBOOT_UTIL_DIR)/inteltool/inteltool \ : $(build)/$(coreboot_base_dir)/.canary +$(call do,MAKE,$(notdir $@),\ - $(MAKE) -C "$(dir $@)" $(CROSS_TOOLS) \ + CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" $(MAKE) -C "$(dir $@)" $(CROSS_TOOLS) \ ) # superio depends on zlib and pciutils diff --git a/modules/busybox b/modules/busybox index f8f8a8307..b882ba990 100644 --- a/modules/busybox +++ b/modules/busybox @@ -11,6 +11,7 @@ busybox_hash := 604553b7dbd59ded9e3ad7c6af49ed2cff599adf3e54d9463e5e0027b362019c busybox_configure := $(MAKE) CC="$(heads_cc)" oldconfig busybox_config := config/busybox.config busybox_output := busybox +busybox_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" busybox_target := \ $(CROSS_TOOLS) \ $(MAKE_JOBS) \ diff --git a/modules/cairo b/modules/cairo index 647ed2ca7..e3f6d08b2 100644 --- a/modules/cairo +++ b/modules/cairo @@ -23,6 +23,7 @@ cairo_configure := \ && mv libtool-2 libtool \ && chmod 755 libtool +cairo_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" cairo_target := \ $(MAKE_JOBS) \ $(CROSS_TOOLS) \ diff --git a/modules/cryptsetup b/modules/cryptsetup index 4cea7f359..190d89c3a 100644 --- a/modules/cryptsetup +++ b/modules/cryptsetup @@ -20,6 +20,7 @@ cryptsetup_configure := ./configure \ # but after building, replace prefix so that they will be installed # in the correct directory. +cryptsetup_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" cryptsetup_target := \ $(MAKE_JOBS) \ && $(MAKE) \ diff --git a/modules/dropbear b/modules/dropbear index 998087c6d..5703f1aba 100644 --- a/modules/dropbear +++ b/modules/dropbear @@ -19,6 +19,7 @@ dropbear_configure := ./configure \ --disable-wtmpx \ dropbear_output := ssh scp dropbear +dropbear_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" dropbear_target := \ $(MAKE_JOBS) \ $(CROSS_TOOLS) \ diff --git a/modules/fbwhiptail b/modules/fbwhiptail index f54a62d82..1f3499023 100644 --- a/modules/fbwhiptail +++ b/modules/fbwhiptail @@ -6,6 +6,7 @@ fbwhiptail_version := git fbwhiptail_dir := fbwhiptail fbwhiptail_repo := https://source.puri.sm/coreboot/fbwhiptail.git +fbwhiptail_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" fbwhiptail_target := \ $(MAKE_JOBS) \ $(CROSS_TOOLS) \ diff --git a/modules/flashrom b/modules/flashrom index 1f6b1566c..fc189f7b2 100644 --- a/modules/flashrom +++ b/modules/flashrom @@ -11,6 +11,7 @@ flashrom_tar := flashrom-$(flashrom_version).tar.bz2 flashrom_url := https://download.flashrom.org/releases/$(flashrom_tar) flashrom_hash := e1f8d95881f5a4365dfe58776ce821dfcee0f138f75d0f44f8a3cd032d9ea42b +flashrom_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" flashrom_target := \ $(MAKE_JOBS) \ $(CROSS_TOOLS) \ diff --git a/modules/flashtools b/modules/flashtools index d95c21528..4ea087f99 100644 --- a/modules/flashtools +++ b/modules/flashtools @@ -11,6 +11,7 @@ flashtools_tar := flashtools-$(flashtools_version).tar.gz flashtools_url := https://github.com/osresearch/flashtools/archive/v$(flashtools_version).tar.gz flashtools_hash := e8205aa3d19e536080f5974ed06ab9a88c4c3f37870c2f6a3a08a2f39302c22c +flashtools_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" flashtools_target := \ $(CROSS_TOOLS) \ CFLAGS="-I$(INSTALL)/include" \ diff --git a/modules/frotz b/modules/frotz index 611e04a91..185c4e66e 100644 --- a/modules/frotz +++ b/modules/frotz @@ -8,6 +8,7 @@ frotz_hash := dbb5eb3bc95275dcb984c4bdbaea58bc1f1b085b20092ce6e86d9f0bf3ba858f frotz_configure := touch .config +frotz_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" frotz_target := \ $(MAKE_JOBS) \ $(CROSS_TOOLS) \ diff --git a/modules/gpg b/modules/gpg index 4d4440a11..70dee7d7c 100644 --- a/modules/gpg +++ b/modules/gpg @@ -39,6 +39,7 @@ gpg_configure := ./configure \ # Run one build to generate the executables with the pre-defined # exec_prefix and datarootdir, then a second make to install the binaries # into our actual target location +gpg_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" gpg_target := $(MAKE_JOBS) \ && $(MAKE) -C $(build)/$(gpg_dir) \ DESTDIR="$(INSTALL)" \ diff --git a/modules/gpg2 b/modules/gpg2 index 060998992..42226d9ae 100644 --- a/modules/gpg2 +++ b/modules/gpg2 @@ -43,6 +43,7 @@ gpg2_configure := ./configure \ # Run one build to generate the executables with the pre-defined # exec_prefix and datarootdir, then a second make to install the binaries # into our actual target location +gpg2_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" gpg2_target := $(MAKE_JOBS) \ && $(MAKE) -C $(build)/$(gpg2_dir) \ DESTDIR="$(INSTALL)" \ diff --git a/modules/kexec b/modules/kexec index 18f27dcf0..19a75e4ab 100644 --- a/modules/kexec +++ b/modules/kexec @@ -14,6 +14,7 @@ kexec_configure := ./configure \ --without-lzma \ && $(MAKE) clean +kexec_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" kexec_target := \ $(MAKE_JOBS) \ $(CROSS_TOOLS) \ diff --git a/modules/libassuan b/modules/libassuan index 800993404..74025646f 100644 --- a/modules/libassuan +++ b/modules/libassuan @@ -12,6 +12,7 @@ libassuan_configure := ./configure \ --disable-static \ --with-gpg-error-prefix="$(INSTALL)" \ +libassuan_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" libassuan_target := $(MAKE_JOBS) \ DESTDIR="$(INSTALL)" \ $(CROSS_TOOLS) \ diff --git a/modules/libgcrypt b/modules/libgcrypt index 602995498..1b1f6242a 100644 --- a/modules/libgcrypt +++ b/modules/libgcrypt @@ -12,6 +12,9 @@ libgcrypt_configure := ./configure \ --disable-static \ --with-gpg-error-prefix="$(INSTALL)" \ --disable-asm \ + --disable-nls \ + +libgcrypt_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" libgcrypt_target := $(MAKE_JOBS) \ DESTDIR="$(INSTALL)" \ diff --git a/modules/libgpg-error b/modules/libgpg-error index 00bd06440..6a8a02b19 100644 --- a/modules/libgpg-error +++ b/modules/libgpg-error @@ -15,6 +15,7 @@ libgpg-error_configure := ./configure \ --disable-doc \ --disable-tests \ +libgpg-error_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" CC_FOR_BUILD="$(CC_FOR_BUILD)" libgpg-error_target := $(MAKE_JOBS) \ DESTDIR="$(INSTALL)" \ $(CROSS_TOOLS) \ diff --git a/modules/libksba b/modules/libksba index 587280ed9..bc2950b93 100644 --- a/modules/libksba +++ b/modules/libksba @@ -12,6 +12,7 @@ libksba_configure := ./configure \ --disable-static \ --with-gpg-error-prefix="$(INSTALL)" \ +libksba_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" libksba_target := $(MAKE_JOBS) \ DESTDIR="$(INSTALL)" \ $(CROSS_TOOLS) \ diff --git a/modules/libpng b/modules/libpng index d6d9e6503..c657a20e2 100644 --- a/modules/libpng +++ b/modules/libpng @@ -12,6 +12,7 @@ libpng_configure := \ --host i386-elf-linux \ --prefix="/" \ +libpng_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" libpng_target := \ $(MAKE_JOBS) \ $(CROSS_TOOLS) \ diff --git a/modules/libremkey-hotp-verification b/modules/libremkey-hotp-verification index 5ebb713b6..75bfc812f 100644 --- a/modules/libremkey-hotp-verification +++ b/modules/libremkey-hotp-verification @@ -8,6 +8,7 @@ libremkey-hotp-verification_tar := nitrokey-hotp-verification-$(libremkey-hotp-v libremkey-hotp-verification_url := https://github.com/Nitrokey/nitrokey-hotp-verification/archive/$(libremkey-hotp-verification_version).tar.gz libremkey-hotp-verification_hash := 251e5cef74e4e45eeddc49e4a1da1e22d1de774cd32cb0451a9030579ae958ba +libremkey-hotp-verification_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" libremkey-hotp-verification_target := \ $(MAKE_JOBS) \ $(CROSS_TOOLS) \ diff --git a/modules/libusb b/modules/libusb index b7fe959c4..5646a93e7 100644 --- a/modules/libusb +++ b/modules/libusb @@ -19,6 +19,7 @@ libusb_configure := ./configure\ # exec_prefix and datarootdir, then a second make to install the binaries # into our actual target location +libusb_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" libusb_target := $(MAKE_JOBS) \ DESTDIR="$(INSTALL)" \ $(CROSS_TOOLS) \ diff --git a/modules/libusb-compat b/modules/libusb-compat index f95854ee1..17fd7295e 100644 --- a/modules/libusb-compat +++ b/modules/libusb-compat @@ -22,6 +22,7 @@ libusb-compat_configure := ./configure \ # Run one build to generate the executables with the pre-defined # exec_prefix and datarootdir, then a second make to install the binaries # into our actual target location +libusb-compat_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" libusb-compat_target := $(MAKE_JOBS) \ DESTDIR="$(INSTALL)" \ $(CROSS_TOOLS) \ diff --git a/modules/lvm2 b/modules/lvm2 index e3005f1bd..091e862ea 100644 --- a/modules/lvm2 +++ b/modules/lvm2 @@ -34,6 +34,7 @@ lvm2_configure := \ --with-cluster=none \ # not sure why LIB_SUFFIX is not defined in the cross build +lvm2_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" lvm2_target := \ $(MAKE_JOBS) \ $(CROSS_TOOLS) \ diff --git a/modules/mbedtls b/modules/mbedtls index d844b16d0..77cf18f3b 100644 --- a/modules/mbedtls +++ b/modules/mbedtls @@ -10,6 +10,7 @@ mbedtls_libraries := library/libmbedcrypto.so.0 mbedtls_configure := +mbedtls_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" mbedtls_target := \ SHARED=1 \ DESTDIR=$(INSTALL) \ diff --git a/modules/msrtools b/modules/msrtools index 8a9b6b5b2..f21162f9b 100644 --- a/modules/msrtools +++ b/modules/msrtools @@ -12,6 +12,7 @@ msrtools_tar := msr-tools-$(msrtools_version).tar.gz msrtools_url := https://github.com/osresearch/msr-tools/archive/$(msrtools_version).tar.gz msrtools_hash := 80554790d0a404205fe215c9ae8d2de159e980ec23821d636f201f12550e6ac0 +msrtools_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" msrtools_target := \ $(CROSS_TOOLS) \ CFLAGS="-I$(INSTALL)/include" \ diff --git a/modules/newt b/modules/newt index cc6341df6..97077f66d 100644 --- a/modules/newt +++ b/modules/newt @@ -8,6 +8,7 @@ newt_tar := newt-$(newt_version).tar.gz newt_url := https://releases.pagure.org/newt/$(newt_tar) newt_hash := 8d66ba6beffc3f786d4ccfee9d2b43d93484680ef8db9397a4fb70b5adbb6dbc +newt_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" newt_target := \ $(MAKE_JOBS) \ $(CROSS_TOOLS) \ diff --git a/modules/npth b/modules/npth index 2128e1d4a..b2225e049 100644 --- a/modules/npth +++ b/modules/npth @@ -12,6 +12,7 @@ npth_configure := ./configure \ --disable-static \ --with-gpg-error-prefix="$(INSTALL)" \ +npth_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" npth_target := $(MAKE_JOBS) \ DESTDIR="$(INSTALL)" \ $(CROSS_TOOLS) \ diff --git a/modules/pciutils b/modules/pciutils index 2ea5b9b71..2bcd2aca1 100644 --- a/modules/pciutils +++ b/modules/pciutils @@ -16,6 +16,7 @@ pciutils_hash := 64293c6ab9318c40ef262b76d87bd9097531759752bac556e50979b1e63cfe6 # reproducible. Otherwise the build path will be embedded # in the library and executables. +pciutils_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" pciutils_target := \ $(MAKE_JOBS) \ $(CROSS_TOOLS) \ diff --git a/modules/pinentry b/modules/pinentry index 54d40e119..c83bf1446 100644 --- a/modules/pinentry +++ b/modules/pinentry @@ -34,6 +34,7 @@ pinentry_configure := ./configure \ # Run one build to generate the executables with the pre-defined # exec_prefix and datarootdir, then a second make to install the binaries # into our actual target location +pinentry_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" pinentry_target := $(MAKE_JOBS) \ && $(MAKE) -C $(build)/$(pinentry_dir) \ DESTDIR="$(INSTALL)" \ diff --git a/modules/pixman b/modules/pixman index 65a2e2008..452e6820a 100644 --- a/modules/pixman +++ b/modules/pixman @@ -13,6 +13,7 @@ pixman_configure := \ --prefix="/" \ --disable-gtk +pixman_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" pixman_target := \ $(MAKE_JOBS) \ $(CROSS_TOOLS) \ diff --git a/modules/popt b/modules/popt index b3b0b045e..aa2dd8633 100644 --- a/modules/popt +++ b/modules/popt @@ -11,6 +11,7 @@ popt_configure := ./configure \ --prefix "/" \ --host i386-elf-linux \ +popt_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" popt_target := \ $(MAKE_JOBS) \ $(CROSS_TOOLS) \ diff --git a/modules/qrencode b/modules/qrencode index fb73c7ba9..73c5a0095 100644 --- a/modules/qrencode +++ b/modules/qrencode @@ -14,6 +14,7 @@ qrencode_configure := ./configure \ --without-tools \ --host i386-elf-linux \ +qrencode_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" qrencode_target := \ $(MAKE_JOBS) \ $(CROSS_TOOLS) \ diff --git a/modules/slang b/modules/slang index a4ac84bca..e520aa84e 100644 --- a/modules/slang +++ b/modules/slang @@ -18,6 +18,7 @@ slang_configure := ./configure \ && mkdir -p src/elfobjs # Disable parallel make for the install target +slang_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" slang_target := \ $(MAKE_JOBS) \ $(CROSS_TOOLS) \ diff --git a/modules/tpmtotp b/modules/tpmtotp index 433df8ceb..853435a70 100644 --- a/modules/tpmtotp +++ b/modules/tpmtotp @@ -11,6 +11,7 @@ tpmtotp_tar := tpmtotp-$(tpmtotp_version).tar.gz tpmtotp_url := https://github.com/osresearch/tpmtotp/archive/$(tpmtotp_version).tar.gz tpmtotp_hash := 1082f2b0e4af833e04220dddedcc21a39eb39ee4dc5668bb010e7bcc795c606c +tpmtotp_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" tpmtotp_target := \ $(CROSS_TOOLS) \ CFLAGS="-I$(INSTALL)/include" \ diff --git a/modules/util-linux b/modules/util-linux index e3377f609..e5339a4ae 100644 --- a/modules/util-linux +++ b/modules/util-linux @@ -22,6 +22,7 @@ util-linux_configure := ./configure \ --enable-libblkid \ +util-linux_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" util-linux_target := \ $(MAKE_JOBS) \ $(CROSS_TOOLS) \ diff --git a/modules/zlib b/modules/zlib index dbdb44e3d..b9c4178d9 100644 --- a/modules/zlib +++ b/modules/zlib @@ -12,6 +12,7 @@ zlib_configure := \ ./configure \ --prefix="/" \ +zlib_make_environment := CPATH="$(TARGET_CPATH)" C_INCLUDE_PATH="$(TARGET_C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(TARGET_CPLUS_INCLUDE_PATH)" OBJC_INCLUDE_PATH="$(TARGET_OBJC_INCLUDE_PATH)" LIBRARY_PATH="$(TARGET_LIBRARY_PATH)" zlib_target := \ $(MAKE_JOBS) \ $(CROSS_TOOLS) \