From 5e4e634625b6384b285c3e20d18d5e81eede82d9 Mon Sep 17 00:00:00 2001 From: Johannes Schlatow Date: Fri, 23 Sep 2022 15:05:17 +0200 Subject: [PATCH] libs: use `select_from_ports` in eager assignments If `select_from_ports` is evaluated lazily, we might miss a port during the dependency check. A way to prevent this is to use the `:=` operator. Fixes genodelabs/genode#4618 --- repos/base-fiasco/lib/mk/kernel-fiasco.inc | 2 +- repos/base-fiasco/lib/mk/syscall-fiasco.inc | 2 +- repos/base-nova/src/kernel/nova/target.mk | 2 +- .../base-okl4/lib/import/import-syscall-okl4.mk | 2 +- repos/base-okl4/lib/mk/okl4_boot_info.mk | 10 +++++----- .../lib/mk/spec/x86/kernel-okl4-include.mk | 2 +- repos/base-okl4/lib/mk/spec/x86/kernel-okl4.mk | 2 +- repos/base-okl4/lib/mk/tools.mk | 2 +- repos/gems/lib/import/import-cbe.mk | 2 +- repos/gems/lib/import/import-cbe_common.mk | 2 +- repos/gems/lib/import/import-sha256_4k.mk | 2 +- repos/gems/lib/mk/aes_cbc_4k.mk | 2 +- repos/gems/lib/mk/sha256_4k.mk | 2 +- repos/gems/lib/mk/spec/x86_64/cbe.mk | 2 +- repos/gems/lib/mk/spec/x86_64/cbe_check.mk | 2 +- repos/gems/lib/mk/spec/x86_64/cbe_check_cxx.mk | 2 +- repos/gems/lib/mk/spec/x86_64/cbe_common.mk | 2 +- repos/gems/lib/mk/spec/x86_64/cbe_cxx.mk | 2 +- repos/gems/lib/mk/spec/x86_64/cbe_cxx_common.mk | 2 +- repos/gems/lib/mk/spec/x86_64/cbe_dump.mk | 2 +- repos/gems/lib/mk/spec/x86_64/cbe_dump_cxx.mk | 2 +- repos/gems/lib/mk/spec/x86_64/cbe_init.mk | 2 +- repos/gems/lib/mk/spec/x86_64/cbe_init_cxx.mk | 2 +- .../lib/mk/spec/x86_64/vfs_cbe_trust_anchor.mk | 2 +- repos/gems/src/test/tiled_wm/target.inc | 2 +- repos/libports/lib/import/import-acpica.mk | 3 ++- repos/libports/lib/import/import-curl.mk | 4 +++- repos/libports/lib/import/import-expat.mk | 4 +++- repos/libports/lib/import/import-fatfs_block.mk | 3 ++- repos/libports/lib/import/import-ffi.mk | 10 ++++++---- repos/libports/lib/import/import-freetype.mk | 3 ++- repos/libports/lib/import/import-jbig2dec.mk | 3 ++- .../libports/lib/import/import-jitterentropy.mk | 4 +++- repos/libports/lib/import/import-jpeg.mk | 3 ++- repos/libports/lib/import/import-libarchive.mk | 3 ++- repos/libports/lib/import/import-libbz2.mk | 3 ++- repos/libports/lib/import/import-libcrypto.mk | 4 +++- repos/libports/lib/import/import-libdrm.mk | 4 ++-- repos/libports/lib/import/import-libgcrypt.mk | 3 ++- repos/libports/lib/import/import-libiconv.mk | 3 ++- repos/libports/lib/import/import-liblzma.mk | 3 ++- .../libports/lib/import/import-libpcg_random.mk | 3 ++- repos/libports/lib/import/import-libpng.mk | 3 ++- repos/libports/lib/import/import-libssh.mk | 4 +++- repos/libports/lib/import/import-libssl.mk | 4 +++- repos/libports/lib/import/import-libusb.mk | 3 ++- repos/libports/lib/import/import-libuvc.mk | 3 ++- repos/libports/lib/import/import-libyuv.mk | 3 ++- repos/libports/lib/import/import-lwip.mk | 3 ++- repos/libports/lib/import/import-lz4.mk | 3 ++- repos/libports/lib/import/import-mupdf.mk | 3 ++- repos/libports/lib/import/import-ncurses.mk | 3 ++- repos/libports/lib/import/import-openjpeg.mk | 3 ++- repos/libports/lib/import/import-pcre.mk | 3 ++- repos/libports/lib/import/import-pcsc-lite.mk | 3 ++- repos/libports/lib/import/import-qoost.mk | 3 ++- repos/libports/lib/import/import-qt5_cmake.mk | 8 ++++---- repos/libports/lib/import/import-qt5_qmake.mk | 10 +++++----- repos/libports/lib/import/import-spark.mk | 10 +++++----- repos/libports/lib/import/import-x86emu.mk | 3 ++- repos/libports/lib/import/import-zlib.mk | 3 ++- repos/libports/lib/mk/gmp.inc | 2 +- repos/libports/lib/mk/icu.mk | 2 +- repos/libports/lib/mk/jbig2dec.mk | 6 +++--- repos/libports/lib/mk/jpeg.mk | 6 +++--- repos/libports/lib/mk/libarchive.mk | 6 +++--- repos/libports/lib/mk/libpcg_random.mk | 2 +- repos/libports/lib/mk/libyuv.inc | 4 ++-- repos/libports/lib/mk/openjpeg.mk | 8 ++++---- repos/libports/lib/mk/qemu-usb.inc | 4 ++-- repos/libports/lib/mk/spec/32bit/curl.mk | 3 ++- repos/libports/lib/mk/spec/64bit/curl.mk | 3 ++- repos/libports/lib/mk/spec/arm/ffi.mk | 2 +- repos/libports/lib/mk/spec/arm/libc-gen.mk | 2 +- repos/libports/lib/mk/spec/arm/libcrypto.mk | 4 +++- repos/libports/lib/mk/spec/arm_64/ffi.mk | 2 +- repos/libports/lib/mk/spec/arm_64/libc-gen.mk | 2 +- repos/libports/lib/mk/spec/arm_64/libcrypto.mk | 4 +++- repos/libports/lib/mk/spec/riscv/libc-gen.mk | 2 +- repos/libports/lib/mk/spec/x86_32/ffi.mk | 2 +- repos/libports/lib/mk/spec/x86_32/libcrypto.mk | 4 +++- repos/libports/lib/mk/spec/x86_64/ffi.mk | 2 +- repos/libports/lib/mk/spec/x86_64/libcrypto.mk | 4 +++- repos/libports/lib/mk/x86emu.mk | 2 +- repos/libports/lib/mk/zlib.mk | 16 ++++++++-------- repos/libports/src/test/fatfs_block_io/target.mk | 2 +- repos/libports/src/test/pcg32/target.mk | 2 +- repos/ports/lib/mk/gdbserver_platform.inc | 2 +- repos/ports/lib/mk/virtualbox5-common.inc | 4 ++-- repos/ports/lib/mk/virtualbox5-runtime.mk | 4 +++- repos/ports/lib/mk/virtualbox5-xml.mk | 4 +++- repos/ports/lib/mk/virtualbox6-runtime.mk | 4 +++- repos/ports/lib/mk/virtualbox6-xml.mk | 4 +++- repos/ports/src/app/gdb_monitor/target.mk | 2 +- repos/ports/src/noux-pkg/bash-minimal/target.mk | 2 +- repos/ports/src/noux-pkg/binutils/target.inc | 2 +- .../src/noux-pkg/coreutils-minimal/target.mk | 2 +- .../src/noux-pkg/e2fsprogs-minimal/target.mk | 2 +- repos/ports/src/noux-pkg/gcc/target.inc | 2 +- repos/ports/src/noux-pkg/gdb/target.inc | 2 +- repos/ports/src/noux-pkg/vim-minimal/target.mk | 2 +- 101 files changed, 196 insertions(+), 139 deletions(-) diff --git a/repos/base-fiasco/lib/mk/kernel-fiasco.inc b/repos/base-fiasco/lib/mk/kernel-fiasco.inc index 4502c6fe23..70eb7b21cb 100644 --- a/repos/base-fiasco/lib/mk/kernel-fiasco.inc +++ b/repos/base-fiasco/lib/mk/kernel-fiasco.inc @@ -1,4 +1,4 @@ -L4_SRC_DIR = $(call select_from_ports,fiasco)/src/kernel/fiasco/fiasco/snapshot +L4_SRC_DIR := $(call select_from_ports,fiasco)/src/kernel/fiasco/fiasco/snapshot FIASCO_BUILD_DIR = $(shell pwd)/build FIASCO = $(FIASCO_BUILD_DIR)/fiasco diff --git a/repos/base-fiasco/lib/mk/syscall-fiasco.inc b/repos/base-fiasco/lib/mk/syscall-fiasco.inc index c80cdf4e44..4722783810 100644 --- a/repos/base-fiasco/lib/mk/syscall-fiasco.inc +++ b/repos/base-fiasco/lib/mk/syscall-fiasco.inc @@ -6,7 +6,7 @@ # userland that comes with Fiasco. # -L4_SRC_DIR = $(call select_from_ports,fiasco)/src/kernel/fiasco/fiasco/snapshot +L4_SRC_DIR := $(call select_from_ports,fiasco)/src/kernel/fiasco/fiasco/snapshot L4_BUILD_DIR := $(shell pwd) # diff --git a/repos/base-nova/src/kernel/nova/target.mk b/repos/base-nova/src/kernel/nova/target.mk index bbaeb9b126..8f001c462f 100644 --- a/repos/base-nova/src/kernel/nova/target.mk +++ b/repos/base-nova/src/kernel/nova/target.mk @@ -3,7 +3,7 @@ include $(call select_from_repositories,mk/spec/nova.mk) TARGET = hypervisor REQUIRES = x86 nova NOVA_BUILD_DIR = $(BUILD_BASE_DIR)/kernel -NOVA_SRC_DIR = $(call select_from_ports,nova)/src/kernel/nova +NOVA_SRC_DIR := $(call select_from_ports,nova)/src/kernel/nova SRC_CC = $(sort $(notdir $(wildcard $(NOVA_SRC_DIR)/src/*.cpp))) SRC_S = $(sort $(notdir $(wildcard $(NOVA_SRC_DIR)/src/*.S))) INC_DIR = $(NOVA_SRC_DIR)/include diff --git a/repos/base-okl4/lib/import/import-syscall-okl4.mk b/repos/base-okl4/lib/import/import-syscall-okl4.mk index 030693d8b7..5eaa7633f0 100644 --- a/repos/base-okl4/lib/import/import-syscall-okl4.mk +++ b/repos/base-okl4/lib/import/import-syscall-okl4.mk @@ -1,4 +1,4 @@ -OKL4_DIR = $(call select_from_ports,okl4)/src/kernel/okl4 +OKL4_DIR := $(call select_from_ports,okl4)/src/kernel/okl4 # # Make sure that symlink modification times are handled correctly. diff --git a/repos/base-okl4/lib/mk/okl4_boot_info.mk b/repos/base-okl4/lib/mk/okl4_boot_info.mk index 74d9a4b07f..63e1bb0757 100644 --- a/repos/base-okl4/lib/mk/okl4_boot_info.mk +++ b/repos/base-okl4/lib/mk/okl4_boot_info.mk @@ -1,7 +1,7 @@ -SRC_C = bootinfo.c -LIBS += syscall-okl4 -INC_DIR += $(REP_DIR)/src/include/bootinfo/internal -CC_WARN = -Wall -Wno-attributes -OKL4_DIR = $(call select_from_ports,okl4)/src/kernel/okl4 +SRC_C = bootinfo.c +LIBS += syscall-okl4 +INC_DIR += $(REP_DIR)/src/include/bootinfo/internal +CC_WARN = -Wall -Wno-attributes +OKL4_DIR := $(call select_from_ports,okl4)/src/kernel/okl4 vpath bootinfo.c $(OKL4_DIR)/libs/bootinfo/src diff --git a/repos/base-okl4/lib/mk/spec/x86/kernel-okl4-include.mk b/repos/base-okl4/lib/mk/spec/x86/kernel-okl4-include.mk index 23796b206c..c5ee413151 100644 --- a/repos/base-okl4/lib/mk/spec/x86/kernel-okl4-include.mk +++ b/repos/base-okl4/lib/mk/spec/x86/kernel-okl4-include.mk @@ -1,4 +1,4 @@ -OKL4_SRC_DIR = $(call select_from_ports,okl4)/src/kernel/okl4 +OKL4_SRC_DIR := $(call select_from_ports,okl4)/src/kernel/okl4 ARCH_DIR = $(OKL4_SRC_DIR)/arch/ia32 PLAT_DIR = $(OKL4_SRC_DIR)/platform/pc99 INC_SYMLINKS = arch/apic.h \ diff --git a/repos/base-okl4/lib/mk/spec/x86/kernel-okl4.mk b/repos/base-okl4/lib/mk/spec/x86/kernel-okl4.mk index bafba103ca..dafeb8e11b 100644 --- a/repos/base-okl4/lib/mk/spec/x86/kernel-okl4.mk +++ b/repos/base-okl4/lib/mk/spec/x86/kernel-okl4.mk @@ -1,4 +1,4 @@ -OKL4_SRC_DIR = $(call select_from_ports,okl4)/src/kernel/okl4 +OKL4_SRC_DIR := $(call select_from_ports,okl4)/src/kernel/okl4 CONFIG = ARCH_IA32 \ CONFIG_ARCH_IA32=1 \ diff --git a/repos/base-okl4/lib/mk/tools.mk b/repos/base-okl4/lib/mk/tools.mk index 40d07e581c..399039581d 100644 --- a/repos/base-okl4/lib/mk/tools.mk +++ b/repos/base-okl4/lib/mk/tools.mk @@ -2,7 +2,7 @@ # Create symlink to elfweaver so that the run tool can use it from within the # build directory. # -OKL4_DIR = $(call select_from_ports,okl4)/src/kernel/okl4 +OKL4_DIR := $(call select_from_ports,okl4)/src/kernel/okl4 HOST_TOOLS += $(BUILD_BASE_DIR)/tool/okl4/elfweaver $(BUILD_BASE_DIR)/tool/okl4/elfweaver: diff --git a/repos/gems/lib/import/import-cbe.mk b/repos/gems/lib/import/import-cbe.mk index 51b1019e20..17cbac9eed 100644 --- a/repos/gems/lib/import/import-cbe.mk +++ b/repos/gems/lib/import/import-cbe.mk @@ -1,3 +1,3 @@ -CBE_DIR = $(call select_from_ports,cbe) +CBE_DIR := $(call select_from_ports,cbe) INC_DIR += $(CBE_DIR)/src/lib/cbe diff --git a/repos/gems/lib/import/import-cbe_common.mk b/repos/gems/lib/import/import-cbe_common.mk index 439996f1f3..9470566f9e 100644 --- a/repos/gems/lib/import/import-cbe_common.mk +++ b/repos/gems/lib/import/import-cbe_common.mk @@ -1,3 +1,3 @@ -CBE_DIR = $(call select_from_ports,cbe) +CBE_DIR := $(call select_from_ports,cbe) INC_DIR += $(CBE_DIR)/src/lib/cbe_common diff --git a/repos/gems/lib/import/import-sha256_4k.mk b/repos/gems/lib/import/import-sha256_4k.mk index 827297e31e..70ad128dc4 100644 --- a/repos/gems/lib/import/import-sha256_4k.mk +++ b/repos/gems/lib/import/import-sha256_4k.mk @@ -1,3 +1,3 @@ -CBE_DIR = $(call select_from_ports,cbe) +CBE_DIR := $(call select_from_ports,cbe) INC_DIR += $(CBE_DIR)/src/lib/sha256_4k diff --git a/repos/gems/lib/mk/aes_cbc_4k.mk b/repos/gems/lib/mk/aes_cbc_4k.mk index e608140e6b..25220db772 100644 --- a/repos/gems/lib/mk/aes_cbc_4k.mk +++ b/repos/gems/lib/mk/aes_cbc_4k.mk @@ -1,4 +1,4 @@ -LIBSSL_PORT_DIR = $(call select_from_ports,openssl) +LIBSSL_PORT_DIR := $(call select_from_ports,openssl) LIBS += libcrypto SRC_CC += aes_cbc_4k.cc diff --git a/repos/gems/lib/mk/sha256_4k.mk b/repos/gems/lib/mk/sha256_4k.mk index 9d84472103..51b8cb1fbc 100644 --- a/repos/gems/lib/mk/sha256_4k.mk +++ b/repos/gems/lib/mk/sha256_4k.mk @@ -1,4 +1,4 @@ -CBE_DIR = $(call select_from_ports,cbe) +CBE_DIR := $(call select_from_ports,cbe) SRC_ADB := sha256_4k.adb LIBS += spark libsparkcrypto diff --git a/repos/gems/lib/mk/spec/x86_64/cbe.mk b/repos/gems/lib/mk/spec/x86_64/cbe.mk index 9a3e6c1333..b4a6747079 100644 --- a/repos/gems/lib/mk/spec/x86_64/cbe.mk +++ b/repos/gems/lib/mk/spec/x86_64/cbe.mk @@ -1,4 +1,4 @@ -CBE_DIR = $(call select_from_ports,cbe) +CBE_DIR := $(call select_from_ports,cbe) LIBS += spark sha256_4k cbe_common diff --git a/repos/gems/lib/mk/spec/x86_64/cbe_check.mk b/repos/gems/lib/mk/spec/x86_64/cbe_check.mk index 3706843c2e..c0bbaaba0d 100644 --- a/repos/gems/lib/mk/spec/x86_64/cbe_check.mk +++ b/repos/gems/lib/mk/spec/x86_64/cbe_check.mk @@ -1,4 +1,4 @@ -CBE_DIR = $(call select_from_ports,cbe) +CBE_DIR := $(call select_from_ports,cbe) LIBS += spark sha256_4k cbe_common diff --git a/repos/gems/lib/mk/spec/x86_64/cbe_check_cxx.mk b/repos/gems/lib/mk/spec/x86_64/cbe_check_cxx.mk index a55143eec0..67b0d32f94 100644 --- a/repos/gems/lib/mk/spec/x86_64/cbe_check_cxx.mk +++ b/repos/gems/lib/mk/spec/x86_64/cbe_check_cxx.mk @@ -1,4 +1,4 @@ -CBE_DIR = $(call select_from_ports,cbe) +CBE_DIR := $(call select_from_ports,cbe) LIBS += spark libsparkcrypto sha256_4k cbe_common cbe_cxx_common LIBS += cbe_check diff --git a/repos/gems/lib/mk/spec/x86_64/cbe_common.mk b/repos/gems/lib/mk/spec/x86_64/cbe_common.mk index f18f46a92b..75720e7c51 100644 --- a/repos/gems/lib/mk/spec/x86_64/cbe_common.mk +++ b/repos/gems/lib/mk/spec/x86_64/cbe_common.mk @@ -1,4 +1,4 @@ -CBE_DIR = $(call select_from_ports,cbe) +CBE_DIR := $(call select_from_ports,cbe) LIBS += spark sha256_4k diff --git a/repos/gems/lib/mk/spec/x86_64/cbe_cxx.mk b/repos/gems/lib/mk/spec/x86_64/cbe_cxx.mk index 9e5cec3260..def599094c 100644 --- a/repos/gems/lib/mk/spec/x86_64/cbe_cxx.mk +++ b/repos/gems/lib/mk/spec/x86_64/cbe_cxx.mk @@ -1,4 +1,4 @@ -CBE_DIR = $(call select_from_ports,cbe) +CBE_DIR := $(call select_from_ports,cbe) LIBS += spark libsparkcrypto sha256_4k cbe cbe_common cbe_cxx_common diff --git a/repos/gems/lib/mk/spec/x86_64/cbe_cxx_common.mk b/repos/gems/lib/mk/spec/x86_64/cbe_cxx_common.mk index 2d5fce837b..42df4ec892 100644 --- a/repos/gems/lib/mk/spec/x86_64/cbe_cxx_common.mk +++ b/repos/gems/lib/mk/spec/x86_64/cbe_cxx_common.mk @@ -1,4 +1,4 @@ -CBE_DIR = $(call select_from_ports,cbe) +CBE_DIR := $(call select_from_ports,cbe) LIBS += spark cbe_common diff --git a/repos/gems/lib/mk/spec/x86_64/cbe_dump.mk b/repos/gems/lib/mk/spec/x86_64/cbe_dump.mk index bbf4ad78ec..43fbaa662f 100644 --- a/repos/gems/lib/mk/spec/x86_64/cbe_dump.mk +++ b/repos/gems/lib/mk/spec/x86_64/cbe_dump.mk @@ -1,4 +1,4 @@ -CBE_DIR = $(call select_from_ports,cbe) +CBE_DIR := $(call select_from_ports,cbe) LIBS += spark sha256_4k cbe_common diff --git a/repos/gems/lib/mk/spec/x86_64/cbe_dump_cxx.mk b/repos/gems/lib/mk/spec/x86_64/cbe_dump_cxx.mk index 8894f2fbb1..7af5498569 100644 --- a/repos/gems/lib/mk/spec/x86_64/cbe_dump_cxx.mk +++ b/repos/gems/lib/mk/spec/x86_64/cbe_dump_cxx.mk @@ -1,4 +1,4 @@ -CBE_DIR = $(call select_from_ports,cbe) +CBE_DIR := $(call select_from_ports,cbe) LIBS += spark libsparkcrypto sha256_4k cbe_common cbe_cxx_common LIBS += cbe_dump diff --git a/repos/gems/lib/mk/spec/x86_64/cbe_init.mk b/repos/gems/lib/mk/spec/x86_64/cbe_init.mk index be772abde3..6523133d25 100644 --- a/repos/gems/lib/mk/spec/x86_64/cbe_init.mk +++ b/repos/gems/lib/mk/spec/x86_64/cbe_init.mk @@ -1,4 +1,4 @@ -CBE_DIR = $(call select_from_ports,cbe) +CBE_DIR := $(call select_from_ports,cbe) LIBS += spark sha256_4k cbe_common cbe_cxx_common diff --git a/repos/gems/lib/mk/spec/x86_64/cbe_init_cxx.mk b/repos/gems/lib/mk/spec/x86_64/cbe_init_cxx.mk index c433466473..6940a693d1 100644 --- a/repos/gems/lib/mk/spec/x86_64/cbe_init_cxx.mk +++ b/repos/gems/lib/mk/spec/x86_64/cbe_init_cxx.mk @@ -1,4 +1,4 @@ -CBE_DIR = $(call select_from_ports,cbe) +CBE_DIR := $(call select_from_ports,cbe) LIBS += spark libsparkcrypto sha256_4k cbe_common cbe_cxx_common LIBS += cbe_init diff --git a/repos/gems/lib/mk/spec/x86_64/vfs_cbe_trust_anchor.mk b/repos/gems/lib/mk/spec/x86_64/vfs_cbe_trust_anchor.mk index 9ac5ac1d93..b3eacfa58a 100644 --- a/repos/gems/lib/mk/spec/x86_64/vfs_cbe_trust_anchor.mk +++ b/repos/gems/lib/mk/spec/x86_64/vfs_cbe_trust_anchor.mk @@ -1,4 +1,4 @@ -OPENSSL_DIR = $(call select_from_ports,openssl) +OPENSSL_DIR := $(call select_from_ports,openssl) SRC_CC += vfs.cc SRC_CC += aes_256.cc diff --git a/repos/gems/src/test/tiled_wm/target.inc b/repos/gems/src/test/tiled_wm/target.inc index 9f0fe2aebf..890a1b2d56 100644 --- a/repos/gems/src/test/tiled_wm/target.inc +++ b/repos/gems/src/test/tiled_wm/target.inc @@ -20,7 +20,7 @@ ICON_H = $(call select_from_repositories,include/qoost/icon.h) # fall-back to the qoost port directory if that fails ifeq ($(ICON_H),) -ICON_H = $(call select_from_ports,qoost)/include/qoost/icon.h +ICON_H := $(call select_from_ports,qoost)/include/qoost/icon.h endif icon.h: $(ICON_H) diff --git a/repos/libports/lib/import/import-acpica.mk b/repos/libports/lib/import/import-acpica.mk index fe90c1b962..30a0363244 100644 --- a/repos/libports/lib/import/import-acpica.mk +++ b/repos/libports/lib/import/import-acpica.mk @@ -1,2 +1,3 @@ -INC_DIR += $(call select_from_ports,acpica)/src/lib/acpica/source/include +ACPICA_DIR := $(call select_from_ports,acpica) +INC_DIR += $(ACPICA_DIR)/src/lib/acpica/source/include CC_OPT += -DACPI_INLINE=inline -Wno-builtin-declaration-mismatch diff --git a/repos/libports/lib/import/import-curl.mk b/repos/libports/lib/import/import-curl.mk index f200058b52..7bfe8f102b 100644 --- a/repos/libports/lib/import/import-curl.mk +++ b/repos/libports/lib/import/import-curl.mk @@ -1,4 +1,6 @@ ARCH = $(filter 32bit 64bit,$(SPECS)) +CURL_DIR := $(call select_from_ports,curl) + INC_DIR += $(call select_from_repositories,src/lib/curl)/spec/$(ARCH) -INC_DIR += $(call select_from_ports,curl)/include +INC_DIR += $(CURL_DIR)/include diff --git a/repos/libports/lib/import/import-expat.mk b/repos/libports/lib/import/import-expat.mk index df9ebc1579..882aed3a1e 100644 --- a/repos/libports/lib/import/import-expat.mk +++ b/repos/libports/lib/import/import-expat.mk @@ -1 +1,3 @@ -INC_DIR += $(call select_from_ports,expat)/include +EXPAT_DIR := $(call select_from_ports,expat) + +INC_DIR += $(EXPAT_DIR)/include diff --git a/repos/libports/lib/import/import-fatfs_block.mk b/repos/libports/lib/import/import-fatfs_block.mk index e331173e47..d50abef8a1 100644 --- a/repos/libports/lib/import/import-fatfs_block.mk +++ b/repos/libports/lib/import/import-fatfs_block.mk @@ -1 +1,2 @@ -INC_DIR += $(call select_from_ports,fatfs)/include +FATFS_DIR := $(call select_from_ports,fatfs) +INC_DIR += $(FATFS_DIR)/include diff --git a/repos/libports/lib/import/import-ffi.mk b/repos/libports/lib/import/import-ffi.mk index ffc076b48f..5f54616874 100644 --- a/repos/libports/lib/import/import-ffi.mk +++ b/repos/libports/lib/import/import-ffi.mk @@ -1,15 +1,17 @@ +FFI_DIR := $(call select_from_ports,ffi) + ifeq ($(filter-out $(SPECS),x86_32),) -INC_DIR += $(call select_from_ports,ffi)/include/ffi/spec/x86_32 +INC_DIR += $(FFI_DIR)/include/ffi/spec/x86_32 endif ifeq ($(filter-out $(SPECS),x86_64),) -INC_DIR += $(call select_from_ports,ffi)/include/ffi/spec/x86_64 +INC_DIR += $(FFI_DIR)/include/ffi/spec/x86_64 endif ifeq ($(filter-out $(SPECS),arm),) -INC_DIR += $(call select_from_ports,ffi)/include/ffi/spec/arm +INC_DIR += $(FFI_DIR)/include/ffi/spec/arm endif ifeq ($(filter-out $(SPECS),arm_64),) -INC_DIR += $(call select_from_ports,ffi)/include/ffi/spec/arm_64 +INC_DIR += $(FFI_DIR)/include/ffi/spec/arm_64 endif diff --git a/repos/libports/lib/import/import-freetype.mk b/repos/libports/lib/import/import-freetype.mk index 845fe1374e..32298ac450 100644 --- a/repos/libports/lib/import/import-freetype.mk +++ b/repos/libports/lib/import/import-freetype.mk @@ -1 +1,2 @@ -INC_DIR += $(call select_from_ports,freetype)/include +FREETYPE_DIR := $(call select_from_ports,freetype) +INC_DIR += $(FREETYPE_DIR)/include diff --git a/repos/libports/lib/import/import-jbig2dec.mk b/repos/libports/lib/import/import-jbig2dec.mk index 41fe1a6b0a..c62f819e59 100644 --- a/repos/libports/lib/import/import-jbig2dec.mk +++ b/repos/libports/lib/import/import-jbig2dec.mk @@ -1 +1,2 @@ -INC_DIR += $(call select_from_ports,jbig2dec)/include/jbig2dec +JBIG2DEC_DIR := $(call select_from_ports,jbig2dec) +INC_DIR += $(JBIG2DEC_DIR)/include/jbig2dec diff --git a/repos/libports/lib/import/import-jitterentropy.mk b/repos/libports/lib/import/import-jitterentropy.mk index 9fb6b5703b..4fc0283a63 100644 --- a/repos/libports/lib/import/import-jitterentropy.mk +++ b/repos/libports/lib/import/import-jitterentropy.mk @@ -10,10 +10,12 @@ else ifeq ($(filter-out $(SPECS),arm_v8),) TARGET_CPUARCH=arm_v8 endif +JITTERENTROPY_DIR := $(call select_from_ports,jitterentropy) + ifeq ($(CONTRIB_DIR),) REP_INC_DIR += include/jitterentropy else -INC_DIR += $(call select_from_ports,jitterentropy)/include/jitterentropy +INC_DIR += $(JITTERENTROPY_DIR)/include/jitterentropy endif INC_DIR += $(call select_from_repositories,src/lib/jitterentropy) diff --git a/repos/libports/lib/import/import-jpeg.mk b/repos/libports/lib/import/import-jpeg.mk index 06627b79fc..16ae90d3c4 100644 --- a/repos/libports/lib/import/import-jpeg.mk +++ b/repos/libports/lib/import/import-jpeg.mk @@ -1,2 +1,3 @@ -INC_DIR += $(call select_from_ports,jpeg)/include/jpeg +JPEG_DIR := $(call select_from_ports,jpeg) +INC_DIR += $(JPEG_DIR)/include/jpeg REP_INC_DIR += include/jpeg diff --git a/repos/libports/lib/import/import-libarchive.mk b/repos/libports/lib/import/import-libarchive.mk index 54638aa6cc..35349e3157 100644 --- a/repos/libports/lib/import/import-libarchive.mk +++ b/repos/libports/lib/import/import-libarchive.mk @@ -1 +1,2 @@ -INC_DIR += $(call select_from_ports,libarchive)/include/libarchive +LIBARCHIVE_DIR := $(call select_from_ports,libarchive) +INC_DIR += $(LIBARCHIVE_DIR)/include/libarchive diff --git a/repos/libports/lib/import/import-libbz2.mk b/repos/libports/lib/import/import-libbz2.mk index 77139ed660..44bfb1b55c 100644 --- a/repos/libports/lib/import/import-libbz2.mk +++ b/repos/libports/lib/import/import-libbz2.mk @@ -1 +1,2 @@ -INC_DIR += $(call select_from_ports,bzip2)/include/libbz2 +BZIP2_DIR := $(call select_from_ports,bzip2) +INC_DIR += $(BZIP2_DIR)/include/libbz2 diff --git a/repos/libports/lib/import/import-libcrypto.mk b/repos/libports/lib/import/import-libcrypto.mk index d9bc9207cd..3878ca4a8c 100644 --- a/repos/libports/lib/import/import-libcrypto.mk +++ b/repos/libports/lib/import/import-libcrypto.mk @@ -2,7 +2,9 @@ LIB_OPENSSL_DIR = $(call select_from_repositories,src/lib/openssl) ARCH = $(filter 32bit 64bit,$(SPECS)) -INC_DIR += $(call select_from_ports,openssl)/include +OPENSSL_DIR := $(call select_from_ports,openssl) + +INC_DIR += $(OPENSSL_DIR)/include INC_DIR += $(LIB_OPENSSL_DIR)/spec/$(ARCH) LIBS += libc diff --git a/repos/libports/lib/import/import-libdrm.mk b/repos/libports/lib/import/import-libdrm.mk index e9761840d1..b60f0b1735 100644 --- a/repos/libports/lib/import/import-libdrm.mk +++ b/repos/libports/lib/import/import-libdrm.mk @@ -1,7 +1,7 @@ ifeq ($(CONTRIB_DIR),) -DRM_SRC_DIR = $(realpath $(call select_from_repositories,include/drm)/../..) +DRM_SRC_DIR := $(realpath $(call select_from_repositories,include/drm)/../..) else -DRM_SRC_DIR = $(call select_from_ports,libdrm)/src/lib/libdrm +DRM_SRC_DIR := $(call select_from_ports,libdrm)/src/lib/libdrm endif INC_DIR += $(DRM_SRC_DIR) diff --git a/repos/libports/lib/import/import-libgcrypt.mk b/repos/libports/lib/import/import-libgcrypt.mk index 333fd8044e..22ac6669e0 100644 --- a/repos/libports/lib/import/import-libgcrypt.mk +++ b/repos/libports/lib/import/import-libgcrypt.mk @@ -1 +1,2 @@ -INC_DIR += $(call select_from_ports,libgcrypt)/include/libgcrypt +LIBGCRYPT_DIR := $(call select_from_ports,libgcrypt) +INC_DIR += $(LIBGCRYPT_DIR)/include/libgcrypt diff --git a/repos/libports/lib/import/import-libiconv.mk b/repos/libports/lib/import/import-libiconv.mk index 83db249fd1..40f7bb708b 100644 --- a/repos/libports/lib/import/import-libiconv.mk +++ b/repos/libports/lib/import/import-libiconv.mk @@ -1 +1,2 @@ -INC_DIR += $(call select_from_ports,libiconv)/include/iconv +LIBICONV_DIR := $(call select_from_ports,libiconv) +INC_DIR += $(LIBICONV_DIR)/include/iconv diff --git a/repos/libports/lib/import/import-liblzma.mk b/repos/libports/lib/import/import-liblzma.mk index 03fec5629f..24301daa02 100644 --- a/repos/libports/lib/import/import-liblzma.mk +++ b/repos/libports/lib/import/import-liblzma.mk @@ -1 +1,2 @@ -INC_DIR += $(call select_from_ports,xz)/include/liblzma +XZ_DIR := $(call select_from_ports,xz) +INC_DIR += $(XZ_DIR)/include/liblzma diff --git a/repos/libports/lib/import/import-libpcg_random.mk b/repos/libports/lib/import/import-libpcg_random.mk index 96356e689f..eff8b19bd8 100644 --- a/repos/libports/lib/import/import-libpcg_random.mk +++ b/repos/libports/lib/import/import-libpcg_random.mk @@ -1,3 +1,4 @@ +PCGC_DIR := $(call select_from_ports,pcg-c) INC_DIR += \ - $(call select_from_ports,pcg-c)/include/pcg-c \ + $(PCGC_DIR)/include/pcg-c \ $(call select_from_repositories,include/pcg-c) diff --git a/repos/libports/lib/import/import-libpng.mk b/repos/libports/lib/import/import-libpng.mk index 7df959a37e..8ae56db82f 100644 --- a/repos/libports/lib/import/import-libpng.mk +++ b/repos/libports/lib/import/import-libpng.mk @@ -1,2 +1,3 @@ +LIBPNG_DIR := $(call select_from_ports,libpng) INC_DIR += $(call select_from_repositories,include/libpng) -INC_DIR += $(call select_from_ports,libpng)/include/libpng +INC_DIR += $(LIBPNG_DIR)/include/libpng diff --git a/repos/libports/lib/import/import-libssh.mk b/repos/libports/lib/import/import-libssh.mk index d90f035c4e..8191348d38 100644 --- a/repos/libports/lib/import/import-libssh.mk +++ b/repos/libports/lib/import/import-libssh.mk @@ -1,2 +1,4 @@ +LIBSSH_DIR := $(call select_from_ports,libssh) + REP_INC_DIR += include/libssh -INC_DIR += $(call select_from_ports,libssh)/include +INC_DIR += $(LIBSSH_DIR)/include diff --git a/repos/libports/lib/import/import-libssl.mk b/repos/libports/lib/import/import-libssl.mk index 26ba0f89e8..54ea68acce 100644 --- a/repos/libports/lib/import/import-libssl.mk +++ b/repos/libports/lib/import/import-libssl.mk @@ -1,8 +1,10 @@ LIB_OPENSSL_DIR = $(call select_from_repositories,src/lib/openssl) +OPENSSL_DIR := $(call select_from_ports,openssl) + LIBS += libcrypto ARCH = $(filter 32bit 64bit,$(SPECS)) -INC_DIR += $(call select_from_ports,openssl)/include +INC_DIR += $(OPENSSL_DIR)/include INC_DIR += $(LIB_OPENSSL_DIR)/spec/$(ARCH) diff --git a/repos/libports/lib/import/import-libusb.mk b/repos/libports/lib/import/import-libusb.mk index fbba7ffa39..5caa0a1cf3 100644 --- a/repos/libports/lib/import/import-libusb.mk +++ b/repos/libports/lib/import/import-libusb.mk @@ -1 +1,2 @@ -INC_DIR += $(call select_from_ports,libusb)/include/libusb +LIBUSB_DIR := $(call select_from_ports,libusb) +INC_DIR += $(LIBUSB_DIR)/include/libusb diff --git a/repos/libports/lib/import/import-libuvc.mk b/repos/libports/lib/import/import-libuvc.mk index cedd152945..bdcb584fa1 100644 --- a/repos/libports/lib/import/import-libuvc.mk +++ b/repos/libports/lib/import/import-libuvc.mk @@ -1 +1,2 @@ -INC_DIR += $(call select_from_ports,libuvc)/include +LIBUVC_PORT_DIR := $(call select_from_ports,libuvc) +INC_DIR += $(LIBUVC_PORT_DIR)/include diff --git a/repos/libports/lib/import/import-libyuv.mk b/repos/libports/lib/import/import-libyuv.mk index 30442d8f52..8cc4b79621 100644 --- a/repos/libports/lib/import/import-libyuv.mk +++ b/repos/libports/lib/import/import-libyuv.mk @@ -1 +1,2 @@ -INC_DIR += $(call select_from_ports,libyuv)/include +LIBYUV_DIR := $(call select_from_ports,libyuv) +INC_DIR += $(LIBYUV_DIR)/include diff --git a/repos/libports/lib/import/import-lwip.mk b/repos/libports/lib/import/import-lwip.mk index e212bb85d1..5c4643ffff 100644 --- a/repos/libports/lib/import/import-lwip.mk +++ b/repos/libports/lib/import/import-lwip.mk @@ -1,2 +1,3 @@ -INC_DIR += $(call select_from_ports,lwip)/include/lwip +LWIP_DIR := $(call select_from_ports,lwip) +INC_DIR += $(LWIP_DIR)/include/lwip INC_DIR += $(call select_from_repositories,include/lwip) diff --git a/repos/libports/lib/import/import-lz4.mk b/repos/libports/lib/import/import-lz4.mk index cc2e006fc2..8659d2d1c5 100644 --- a/repos/libports/lib/import/import-lz4.mk +++ b/repos/libports/lib/import/import-lz4.mk @@ -1 +1,2 @@ -INC_DIR += $(call select_from_ports,lz4)/include/lz4 +LZ4_DIR := $(call select_from_ports,lz4) +INC_DIR += $(LZ4_DIR)/include/lz4 diff --git a/repos/libports/lib/import/import-mupdf.mk b/repos/libports/lib/import/import-mupdf.mk index 37e42a5d84..658399afbd 100644 --- a/repos/libports/lib/import/import-mupdf.mk +++ b/repos/libports/lib/import/import-mupdf.mk @@ -1,2 +1,3 @@ -INC_DIR += $(call select_from_ports,mupdf)/include/mupdf +MUPDF_PORT_DIR := $(call select_from_ports,mupdf) +INC_DIR += $(MUPDF_PORT_DIR)/include/mupdf diff --git a/repos/libports/lib/import/import-ncurses.mk b/repos/libports/lib/import/import-ncurses.mk index 21192ff316..e6889eb1a5 100644 --- a/repos/libports/lib/import/import-ncurses.mk +++ b/repos/libports/lib/import/import-ncurses.mk @@ -1,2 +1,3 @@ +NCURSES_DIR := $(call select_from_ports,ncurses) REP_INC_DIR += include/ncurses -INC_DIR += $(call select_from_ports,ncurses)/include/ncurses +INC_DIR += $(NCURSES_DIR)/include/ncurses diff --git a/repos/libports/lib/import/import-openjpeg.mk b/repos/libports/lib/import/import-openjpeg.mk index ba772fdfc6..b145f3b69e 100644 --- a/repos/libports/lib/import/import-openjpeg.mk +++ b/repos/libports/lib/import/import-openjpeg.mk @@ -1 +1,2 @@ -INC_DIR += $(call select_from_ports,openjpeg)/include/openjpeg +OPENJPEG_DIR := $(call select_from_ports,openjpeg) +INC_DIR += $(OPENJPEG_DIR)/include/openjpeg diff --git a/repos/libports/lib/import/import-pcre.mk b/repos/libports/lib/import/import-pcre.mk index 752c6a1ca6..780e9c90a7 100644 --- a/repos/libports/lib/import/import-pcre.mk +++ b/repos/libports/lib/import/import-pcre.mk @@ -1 +1,2 @@ -INC_DIR += $(call select_from_ports,pcre)/include/pcre +PCRE_DIR := $(call select_from_ports,pcre) +INC_DIR += $(PCRE_DIR)/include/pcre diff --git a/repos/libports/lib/import/import-pcsc-lite.mk b/repos/libports/lib/import/import-pcsc-lite.mk index eeda106512..606fa8b53d 100644 --- a/repos/libports/lib/import/import-pcsc-lite.mk +++ b/repos/libports/lib/import/import-pcsc-lite.mk @@ -1,5 +1,6 @@ +PCSCLITE_DIR := $(call select_from_ports,pcsc-lite) ifeq ($(CONTRIB_DIR),) REP_INC_DIR += include/PCSC else -INC_DIR += $(call select_from_ports,pcsc-lite)/include/PCSC +INC_DIR += $(PCSCLITE_DIR)/include/PCSC endif diff --git a/repos/libports/lib/import/import-qoost.mk b/repos/libports/lib/import/import-qoost.mk index 1203d20317..e5b2315117 100644 --- a/repos/libports/lib/import/import-qoost.mk +++ b/repos/libports/lib/import/import-qoost.mk @@ -1 +1,2 @@ -INC_DIR += $(call select_from_ports,qoost)/include +QOOST_DIR := $(call select_from_ports,qoost) +INC_DIR += $(QOOST_DIR)/include diff --git a/repos/libports/lib/import/import-qt5_cmake.mk b/repos/libports/lib/import/import-qt5_cmake.mk index 8f727b7ff6..8a9e3bd800 100644 --- a/repos/libports/lib/import/import-qt5_cmake.mk +++ b/repos/libports/lib/import/import-qt5_cmake.mk @@ -24,9 +24,9 @@ ifeq ($(CONTRIB_DIR),) QT_DIR = $(call select_from_repositories,src/lib/qt5) QT_API_DIR = $(call select_from_repositories,mkspecs)/.. else -QT_PORT_DIR = $(call select_from_ports,qt5) -QT_DIR = $(QT_PORT_DIR)/src/lib/qt5 -QT_API_DIR = $(QT_DIR)/genode/api +QT_PORT_DIR := $(call select_from_ports,qt5) +QT_DIR = $(QT_PORT_DIR)/src/lib/qt5 +QT_API_DIR = $(QT_DIR)/genode/api endif ifneq ($(VERBOSE),) @@ -96,7 +96,7 @@ GENODE_CMAKE_LFLAGS_SHLIB = \ ifeq ($(CONTRIB_DIR),) GENODE_CMAKE_GL_INCDIRS = $(call select_from_repositories,include/GL)/.. else -GENODE_CMAKE_GL_INCDIRS = $(call select_from_ports,mesa)/include +GENODE_CMAKE_GL_INCDIRS := $(call select_from_ports,mesa)/include endif GENODE_CMAKE_OPENGL_LIBS = $(CURDIR)/cmake_root/lib/mesa.lib.so diff --git a/repos/libports/lib/import/import-qt5_qmake.mk b/repos/libports/lib/import/import-qt5_qmake.mk index 271cfcbd6c..a4e853123e 100644 --- a/repos/libports/lib/import/import-qt5_qmake.mk +++ b/repos/libports/lib/import/import-qt5_qmake.mk @@ -25,9 +25,9 @@ ifeq ($(CONTRIB_DIR),) QT_DIR = $(call select_from_repositories,src/lib/qt5) QT_API_DIR = $(call select_from_repositories,mkspecs)/.. else -QT_PORT_DIR = $(call select_from_ports,qt5) -QT_DIR = $(QT_PORT_DIR)/src/lib/qt5 -QT_API_DIR = $(QT_DIR)/genode/api +QT_PORT_DIR := $(call select_from_ports,qt5) +QT_DIR = $(QT_PORT_DIR)/src/lib/qt5 +QT_API_DIR = $(QT_DIR)/genode/api endif ifneq ($(VERBOSE),) @@ -104,8 +104,8 @@ ifeq ($(CONTRIB_DIR),) GENODE_QMAKE_INCDIR_OPENGL = $(call select_from_repositories,include/GL)/.. GENODE_QMAKE_INCDIR_EGL = $(call select_from_repositories,include/EGL)/.. else -GENODE_QMAKE_INCDIR_OPENGL = $(call select_from_ports,mesa)/include -GENODE_QMAKE_INCDIR_EGL = $(call select_from_ports,mesa)/include +GENODE_QMAKE_INCDIR_OPENGL := $(call select_from_ports,mesa)/include +GENODE_QMAKE_INCDIR_EGL := $(call select_from_ports,mesa)/include endif GENODE_QMAKE_LIBS_OPENGL = $(CURDIR)/qmake_root/lib/mesa.lib.so diff --git a/repos/libports/lib/import/import-spark.mk b/repos/libports/lib/import/import-spark.mk index 67c2a20108..387effb3b9 100644 --- a/repos/libports/lib/import/import-spark.mk +++ b/repos/libports/lib/import/import-spark.mk @@ -1,10 +1,10 @@ ADA_RTS = $(BUILD_BASE_DIR)/var/libcache/spark -ADA_RTS_SOURCE = $(call select_from_ports,ada-runtime)/ada-runtime/contrib/gcc-8.3.0 -ADA_RUNTIME_DIR = $(call select_from_ports,ada-runtime)/ada-runtime/src/minimal -ADA_RUNTIME_LIB_DIR = $(call select_from_ports,ada-runtime)/ada-runtime/src/lib -ADA_RUNTIME_COMMON_DIR = $(call select_from_ports,ada-runtime)/ada-runtime/src/common -ADA_RUNTIME_PLATFORM_DIR = $(call select_from_ports,ada-runtime)/ada-runtime/platform +ADA_RTS_SOURCE := $(call select_from_ports,ada-runtime)/ada-runtime/contrib/gcc-8.3.0 +ADA_RUNTIME_DIR := $(call select_from_ports,ada-runtime)/ada-runtime/src/minimal +ADA_RUNTIME_LIB_DIR := $(call select_from_ports,ada-runtime)/ada-runtime/src/lib +ADA_RUNTIME_COMMON_DIR := $(call select_from_ports,ada-runtime)/ada-runtime/src/common +ADA_RUNTIME_PLATFORM_DIR := $(call select_from_ports,ada-runtime)/ada-runtime/platform INC_DIR += $(ADA_RUNTIME_DIR) \ $(ADA_RUNTIME_LIB_DIR) \ diff --git a/repos/libports/lib/import/import-x86emu.mk b/repos/libports/lib/import/import-x86emu.mk index e9a6582358..9354e7cf98 100644 --- a/repos/libports/lib/import/import-x86emu.mk +++ b/repos/libports/lib/import/import-x86emu.mk @@ -1 +1,2 @@ -INC_DIR += $(call select_from_ports,x86emu)/include +X86EMU_DIR := $(call select_from_ports,x86emu) +INC_DIR += $(X86EMU_DIR)/include diff --git a/repos/libports/lib/import/import-zlib.mk b/repos/libports/lib/import/import-zlib.mk index 532f54b00c..6c00173a4e 100644 --- a/repos/libports/lib/import/import-zlib.mk +++ b/repos/libports/lib/import/import-zlib.mk @@ -1 +1,2 @@ -INC_DIR += $(call select_from_ports,zlib)/include/zlib +ZLIB_DIR := $(call select_from_ports,zlib) +INC_DIR += $(ZLIB_DIR)/include/zlib diff --git a/repos/libports/lib/mk/gmp.inc b/repos/libports/lib/mk/gmp.inc index 9d5c7e7d37..5b00a65cfa 100644 --- a/repos/libports/lib/mk/gmp.inc +++ b/repos/libports/lib/mk/gmp.inc @@ -1,4 +1,4 @@ -GMP_DIR = $(call select_from_ports,gmp)/src/lib/gmp +GMP_DIR := $(call select_from_ports,gmp)/src/lib/gmp include $(REP_DIR)/lib/import/import-gmp.mk diff --git a/repos/libports/lib/mk/icu.mk b/repos/libports/lib/mk/icu.mk index 7e63d31698..1cea94a1c5 100644 --- a/repos/libports/lib/mk/icu.mk +++ b/repos/libports/lib/mk/icu.mk @@ -1,6 +1,6 @@ include $(call select_from_repositories,lib/import/import-icu.mk) -ICU_DIR = $(call select_from_ports,icu)/src/lib/icu +ICU_DIR := $(call select_from_ports,icu)/src/lib/icu # copy-pasted from $(ICU_DIR)/source/common/Makefile.in and renamed OBJECTS to ICU_COMMON_OBJECTS diff --git a/repos/libports/lib/mk/jbig2dec.mk b/repos/libports/lib/mk/jbig2dec.mk index 0ff2d82880..e711bf1d02 100644 --- a/repos/libports/lib/mk/jbig2dec.mk +++ b/repos/libports/lib/mk/jbig2dec.mk @@ -1,6 +1,6 @@ -JBIG2DEC_DIR = $(call select_from_ports,jbig2dec)/src/lib/jbig2dec -LIBS += libc libpng zlib -INC_DIR += $(JBIG2DEC_DIR) $(REP_DIR)/include/jbig2dec +JBIG2DEC_DIR := $(call select_from_ports,jbig2dec)/src/lib/jbig2dec +LIBS += libc libpng zlib +INC_DIR += $(JBIG2DEC_DIR) $(REP_DIR)/include/jbig2dec # incorporate all '*.c' files except those that are not part of the library FILTER_OUT = jbig2dec.c snprintf.c pbm2png.c diff --git a/repos/libports/lib/mk/jpeg.mk b/repos/libports/lib/mk/jpeg.mk index c7faa3e3e4..b061fe5c89 100644 --- a/repos/libports/lib/mk/jpeg.mk +++ b/repos/libports/lib/mk/jpeg.mk @@ -1,6 +1,6 @@ -JPEG = jpeg-7 -JPEG_DIR = $(call select_from_ports,jpeg)/src/lib/jpeg -LIBS += libc +JPEG = jpeg-7 +JPEG_DIR := $(call select_from_ports,jpeg)/src/lib/jpeg +LIBS += libc # use our customized 'jconfig.h' file INC_DIR += $(REP_DIR)/include/jpeg diff --git a/repos/libports/lib/mk/libarchive.mk b/repos/libports/lib/mk/libarchive.mk index 5eb95129d5..e2a1943268 100644 --- a/repos/libports/lib/mk/libarchive.mk +++ b/repos/libports/lib/mk/libarchive.mk @@ -1,6 +1,6 @@ -LIBARCHIVE_DIR = $(call select_from_ports,libarchive)/src/lib/libarchive -LIBS += libc zlib liblzma -INC_DIR += $(REP_DIR)/src/lib/libarchive $(LIBARCHIVE_DIR) +LIBARCHIVE_DIR := $(call select_from_ports,libarchive)/src/lib/libarchive +LIBS += libc zlib liblzma +INC_DIR += $(REP_DIR)/src/lib/libarchive $(LIBARCHIVE_DIR) ALL_SRC_C := $(notdir $(wildcard $(LIBARCHIVE_DIR)/libarchive/*.c)) diff --git a/repos/libports/lib/mk/libpcg_random.mk b/repos/libports/lib/mk/libpcg_random.mk index 44d46a442c..855cd0acec 100644 --- a/repos/libports/lib/mk/libpcg_random.mk +++ b/repos/libports/lib/mk/libpcg_random.mk @@ -1,5 +1,5 @@ include $(REP_DIR)/lib/import/import-libpcg_random.mk -PCG_SRC_DIR = $(call select_from_ports,pcg-c)/src/lib/pcg-c/src +PCG_SRC_DIR := $(call select_from_ports,pcg-c)/src/lib/pcg-c/src CC_OPT += -std=c99 diff --git a/repos/libports/lib/mk/libyuv.inc b/repos/libports/lib/mk/libyuv.inc index 03853c8ad4..813769a194 100644 --- a/repos/libports/lib/mk/libyuv.inc +++ b/repos/libports/lib/mk/libyuv.inc @@ -1,7 +1,7 @@ SHARED_LIB = yes -YUV_PORT = $(call select_from_ports,libyuv) -YUV_DIR = $(YUV_PORT)/src/lib/libyuv +YUV_PORT := $(call select_from_ports,libyuv) +YUV_DIR = $(YUV_PORT)/src/lib/libyuv LIBS = libc stdcxx jpeg diff --git a/repos/libports/lib/mk/openjpeg.mk b/repos/libports/lib/mk/openjpeg.mk index 36a43d3299..3dfab6592a 100644 --- a/repos/libports/lib/mk/openjpeg.mk +++ b/repos/libports/lib/mk/openjpeg.mk @@ -1,7 +1,7 @@ -OPENJPEG = openjpeg-1.4 -OPENJPEG_DIR = $(call select_from_ports,openjpeg)/src/lib/openjpeg/libopenjpeg -LIBS += libc libm -INC_DIR += $(OPENJPEG_DIR) $(REP_DIR)/include/openjpeg +OPENJPEG = openjpeg-1.4 +OPENJPEG_DIR := $(call select_from_ports,openjpeg)/src/lib/openjpeg/libopenjpeg +LIBS += libc libm +INC_DIR += $(OPENJPEG_DIR) $(REP_DIR)/include/openjpeg # incorporate all '*.c' files except those that are not part of the library FILTER_OUT = t1_generate_luts.c diff --git a/repos/libports/lib/mk/qemu-usb.inc b/repos/libports/lib/mk/qemu-usb.inc index cc5b6fbc7a..433b515c6d 100644 --- a/repos/libports/lib/mk/qemu-usb.inc +++ b/repos/libports/lib/mk/qemu-usb.inc @@ -1,5 +1,5 @@ -LIB_DIR = $(REP_DIR)/src/lib/qemu-usb -QEMU_USB_DIR = $(call select_from_ports,qemu-usb)/src/lib/qemu/hw/usb +LIB_DIR = $(REP_DIR)/src/lib/qemu-usb +QEMU_USB_DIR := $(call select_from_ports,qemu-usb)/src/lib/qemu/hw/usb CC_WARN= diff --git a/repos/libports/lib/mk/spec/32bit/curl.mk b/repos/libports/lib/mk/spec/32bit/curl.mk index 400af0d37c..5e756657dd 100644 --- a/repos/libports/lib/mk/spec/32bit/curl.mk +++ b/repos/libports/lib/mk/spec/32bit/curl.mk @@ -1,4 +1,5 @@ -INC_DIR += $(call select_from_ports,curl)/include +CURL_DIR := $(call select_from_ports,curl) +INC_DIR += $(CURL_DIR)/include INC_DIR += $(REP_DIR)/src/lib/curl/spec/32bit INC_DIR += $(REP_DIR)/src/lib/curl/spec/32bit/curl diff --git a/repos/libports/lib/mk/spec/64bit/curl.mk b/repos/libports/lib/mk/spec/64bit/curl.mk index 1ed26a02df..3027bce2fb 100644 --- a/repos/libports/lib/mk/spec/64bit/curl.mk +++ b/repos/libports/lib/mk/spec/64bit/curl.mk @@ -1,4 +1,5 @@ -INC_DIR += $(call select_from_ports,curl)/include +CURL_DIR := $(call select_from_ports,curl) +INC_DIR += $(CURL_DIR)/include INC_DIR += $(REP_DIR)/src/lib/curl/spec/64bit INC_DIR += $(REP_DIR)/src/lib/curl/spec/64bit/curl diff --git a/repos/libports/lib/mk/spec/arm/ffi.mk b/repos/libports/lib/mk/spec/arm/ffi.mk index 9f664fe11c..e0970ee6fa 100644 --- a/repos/libports/lib/mk/spec/arm/ffi.mk +++ b/repos/libports/lib/mk/spec/arm/ffi.mk @@ -2,7 +2,7 @@ SHARED_LIB = yes LIBS = libc -FFI_PORT = $(call select_from_ports,ffi)/src/lib/ffi +FFI_PORT := $(call select_from_ports,ffi)/src/lib/ffi INC_DIR = $(FFI_PORT)/include diff --git a/repos/libports/lib/mk/spec/arm/libc-gen.mk b/repos/libports/lib/mk/spec/arm/libc-gen.mk index 5890d9804e..9df7812365 100644 --- a/repos/libports/lib/mk/spec/arm/libc-gen.mk +++ b/repos/libports/lib/mk/spec/arm/libc-gen.mk @@ -19,7 +19,7 @@ SRC_C += $(filter-out $(FILTER_OUT_C),$(notdir $(wildcard $(LIBC_GEN_ARM_DIR)/* # path is in effect when building the libc from a source archive (where the # ucontext.h header is taken from the libc API archive). # -CC_OPT_makecontext = -I$(call select_from_ports,libc)/include/libc/sys \ +CC_OPT_makecontext = -I$(LIBC_PORT_DIR)/include/libc/sys \ $(addprefix -I,$(call select_from_repositories,include/libc/sys)) vpath % $(LIBC_GEN_ARM_DIR) diff --git a/repos/libports/lib/mk/spec/arm/libcrypto.mk b/repos/libports/lib/mk/spec/arm/libcrypto.mk index 12ad5fe259..81d6412831 100644 --- a/repos/libports/lib/mk/spec/arm/libcrypto.mk +++ b/repos/libports/lib/mk/spec/arm/libcrypto.mk @@ -31,7 +31,9 @@ SRC_S = \ sha/asm/sha512-armv4.S \ # end of SRC_S -vpath %.S $(call select_from_ports,openssl)/src/lib/openssl/crypto +OPENSSL_DIR := $(call select_from_ports,openssl) + +vpath %.S $(OPENSSL_DIR)/src/lib/openssl/crypto ifeq ($(filter-out $(SPECS),neon),) vpath armcap_genode.c $(REP_DIR)/src/lib/openssl/crypto/spec/neon diff --git a/repos/libports/lib/mk/spec/arm_64/ffi.mk b/repos/libports/lib/mk/spec/arm_64/ffi.mk index c27567b9bd..21c075834c 100644 --- a/repos/libports/lib/mk/spec/arm_64/ffi.mk +++ b/repos/libports/lib/mk/spec/arm_64/ffi.mk @@ -2,7 +2,7 @@ SHARED_LIB = yes LIBS = libc -FFI_PORT = $(call select_from_ports,ffi)/src/lib/ffi +FFI_PORT := $(call select_from_ports,ffi)/src/lib/ffi INC_DIR = $(FFI_PORT)/include diff --git a/repos/libports/lib/mk/spec/arm_64/libc-gen.mk b/repos/libports/lib/mk/spec/arm_64/libc-gen.mk index 11ea992549..b471c42a61 100644 --- a/repos/libports/lib/mk/spec/arm_64/libc-gen.mk +++ b/repos/libports/lib/mk/spec/arm_64/libc-gen.mk @@ -14,7 +14,7 @@ SRC_C += flt_rounds.c fpgetmask.c fpsetmask.c infinity.c makecontext.c # path is in effect when building the libc from a source archive (where the # ucontext.h header is taken from the libc API archive). # -CC_OPT_makecontext = -I$(call select_from_ports,libc)/include/libc/sys \ +CC_OPT_makecontext = -I$(LIBC_PORT_DIR)/include/libc/sys \ $(addprefix -I,$(call select_from_repositories,include/libc/sys)) vpath %.c $(LIBC_GEN_ARM64_DIR) diff --git a/repos/libports/lib/mk/spec/arm_64/libcrypto.mk b/repos/libports/lib/mk/spec/arm_64/libcrypto.mk index a82c6de822..1fd9e1c3a6 100644 --- a/repos/libports/lib/mk/spec/arm_64/libcrypto.mk +++ b/repos/libports/lib/mk/spec/arm_64/libcrypto.mk @@ -30,7 +30,9 @@ SRC_S = \ sha/asm/sha512-armv8.S \ # end of SRC_S -vpath %.S $(call select_from_ports,openssl)/src/lib/openssl/crypto +OPENSSL_DIR := $(call select_from_ports,openssl) + +vpath %.S $(OPENSSL_DIR)/src/lib/openssl/crypto ifeq ($(filter-out $(SPECS),neon),) vpath armcap_genode.c $(REP_DIR)/src/lib/openssl/crypto/spec/neon diff --git a/repos/libports/lib/mk/spec/riscv/libc-gen.mk b/repos/libports/lib/mk/spec/riscv/libc-gen.mk index 36b37cfc01..28261c00cd 100644 --- a/repos/libports/lib/mk/spec/riscv/libc-gen.mk +++ b/repos/libports/lib/mk/spec/riscv/libc-gen.mk @@ -12,7 +12,7 @@ SRC_C += flt_rounds.c fpgetmask.c fpsetmask.c infinity.c makecontext.c # path is in effect when building the libc from a source archive (where the # ucontext.h header is taken from the libc API archive). # -CC_OPT_makecontext = -I$(call select_from_ports,libc)/include/libc/sys \ +CC_OPT_makecontext = -I$(LIBC_PORT_DIR)/include/libc/sys \ $(addprefix -I,$(call select_from_repositories,/include/libc/sys)) CC_OPT += -DSOFTFLOAT_FOR_GCC diff --git a/repos/libports/lib/mk/spec/x86_32/ffi.mk b/repos/libports/lib/mk/spec/x86_32/ffi.mk index b0ffbf4a0e..f2c2b1c36f 100644 --- a/repos/libports/lib/mk/spec/x86_32/ffi.mk +++ b/repos/libports/lib/mk/spec/x86_32/ffi.mk @@ -2,7 +2,7 @@ SHARED_LIB = yes LIBS = libc -FFI_PORT = $(call select_from_ports,ffi)/src/lib/ffi +FFI_PORT := $(call select_from_ports,ffi)/src/lib/ffi INC_DIR = $(FFI_PORT)/include diff --git a/repos/libports/lib/mk/spec/x86_32/libcrypto.mk b/repos/libports/lib/mk/spec/x86_32/libcrypto.mk index 249c5bb1f0..18f5456006 100644 --- a/repos/libports/lib/mk/spec/x86_32/libcrypto.mk +++ b/repos/libports/lib/mk/spec/x86_32/libcrypto.mk @@ -34,7 +34,9 @@ SRC_S = \ x86cpuid.s \ # end of SRC_S -vpath %.s $(call select_from_ports,openssl)/src/lib/openssl/crypto +OPENSSL_DIR := $(call select_from_ports,openssl) + +vpath %.s $(OPENSSL_DIR)/src/lib/openssl/crypto include $(REP_DIR)/lib/mk/libcrypto.inc diff --git a/repos/libports/lib/mk/spec/x86_64/ffi.mk b/repos/libports/lib/mk/spec/x86_64/ffi.mk index fc2749ca1e..c194f958e6 100644 --- a/repos/libports/lib/mk/spec/x86_64/ffi.mk +++ b/repos/libports/lib/mk/spec/x86_64/ffi.mk @@ -2,7 +2,7 @@ SHARED_LIB = yes LIBS = libc -FFI_PORT = $(call select_from_ports,ffi)/src/lib/ffi +FFI_PORT := $(call select_from_ports,ffi)/src/lib/ffi INC_DIR = $(FFI_PORT)/include diff --git a/repos/libports/lib/mk/spec/x86_64/libcrypto.mk b/repos/libports/lib/mk/spec/x86_64/libcrypto.mk index b07dc709f5..edb1698065 100644 --- a/repos/libports/lib/mk/spec/x86_64/libcrypto.mk +++ b/repos/libports/lib/mk/spec/x86_64/libcrypto.mk @@ -45,7 +45,9 @@ SRC_S = \ x86_64cpuid.s \ # end of SRC_S -vpath %.s $(call select_from_ports,openssl)/src/lib/openssl/crypto +OPENSSL_DIR := $(call select_from_ports,openssl) + +vpath %.s $(OPENSSL_DIR)/src/lib/openssl/crypto include $(REP_DIR)/lib/mk/libcrypto.inc diff --git a/repos/libports/lib/mk/x86emu.mk b/repos/libports/lib/mk/x86emu.mk index 71cfb9a228..27de24f25f 100644 --- a/repos/libports/lib/mk/x86emu.mk +++ b/repos/libports/lib/mk/x86emu.mk @@ -2,7 +2,7 @@ # x86 real-mode emulation library # -X86EMU_DIR = $(call select_from_ports,x86emu)/src/lib/x86emu/contrib +X86EMU_DIR := $(call select_from_ports,x86emu)/src/lib/x86emu/contrib INC_DIR += $(X86EMU_DIR) $(REP_DIR)/include/x86emu CC_OPT += -fomit-frame-pointer -Wno-maybe-uninitialized diff --git a/repos/libports/lib/mk/zlib.mk b/repos/libports/lib/mk/zlib.mk index a73b9bf962..7691a984d4 100644 --- a/repos/libports/lib/mk/zlib.mk +++ b/repos/libports/lib/mk/zlib.mk @@ -1,11 +1,11 @@ -ZLIB_DIR = $(call select_from_ports,zlib)/src/lib/zlib -LIBS += libc -INC_DIR += $(ZLIB_DIR) -SRC_C = adler32.c compress.c crc32.c deflate.c gzclose.c \ - gzlib.c gzread.c gzwrite.c infback.c inffast.c inflate.c \ - inftrees.c trees.c uncompr.c zutil.c -CC_WARN = -CC_OPT += -DZ_HAVE_UNISTD_H +ZLIB_DIR := $(call select_from_ports,zlib)/src/lib/zlib +LIBS += libc +INC_DIR += $(ZLIB_DIR) +SRC_C = adler32.c compress.c crc32.c deflate.c gzclose.c \ + gzlib.c gzread.c gzwrite.c infback.c inffast.c inflate.c \ + inftrees.c trees.c uncompr.c zutil.c +CC_WARN = +CC_OPT += -DZ_HAVE_UNISTD_H vpath %.c $(ZLIB_DIR) diff --git a/repos/libports/src/test/fatfs_block_io/target.mk b/repos/libports/src/test/fatfs_block_io/target.mk index 94a07f4401..dcb5d0f9c5 100644 --- a/repos/libports/src/test/fatfs_block_io/target.mk +++ b/repos/libports/src/test/fatfs_block_io/target.mk @@ -6,7 +6,7 @@ SRC_CC = component.cc CC_DEF += -D_MAX_SS=FF_MAX_SS CC_WARN += -Wno-pointer-to-int-cast -FATFS_PORT_DIR = $(call select_from_ports,fatfs) +FATFS_PORT_DIR := $(call select_from_ports,fatfs) INC_DIR += $(FATFS_PORT_DIR)/include/fatfs diff --git a/repos/libports/src/test/pcg32/target.mk b/repos/libports/src/test/pcg32/target.mk index aea82a9452..dcef4aec19 100644 --- a/repos/libports/src/test/pcg32/target.mk +++ b/repos/libports/src/test/pcg32/target.mk @@ -1,7 +1,7 @@ TARGET = test-pcg32 LIBS = libpcg_random posix -PCG_SRC_DIR = $(call select_from_ports,pcg-c)/src/lib/pcg-c +PCG_SRC_DIR := $(call select_from_ports,pcg-c)/src/lib/pcg-c INC_DIR += $(PCG_SRC_DIR)/extras SRC_C = check-pcg32-global.c entropy.c diff --git a/repos/ports/lib/mk/gdbserver_platform.inc b/repos/ports/lib/mk/gdbserver_platform.inc index 479b9ef7d9..1adb5bcbfb 100644 --- a/repos/ports/lib/mk/gdbserver_platform.inc +++ b/repos/ports/lib/mk/gdbserver_platform.inc @@ -1,4 +1,4 @@ -GDB_CONTRIB_DIR = $(call select_from_ports,gdb)/src/noux-pkg/gdb +GDB_CONTRIB_DIR := $(call select_from_ports,gdb)/src/noux-pkg/gdb INC_DIR += $(REP_DIR)/src/lib/gdbserver_libc_support \ $(REP_DIR)/src/lib/gdbserver_platform \ diff --git a/repos/ports/lib/mk/virtualbox5-common.inc b/repos/ports/lib/mk/virtualbox5-common.inc index 24e523a326..da4c04b7e5 100644 --- a/repos/ports/lib/mk/virtualbox5-common.inc +++ b/repos/ports/lib/mk/virtualbox5-common.inc @@ -12,8 +12,8 @@ REQUIRES += installation_of_yasm REQUIRES += installation_of_iasl endif -VIRTUALBOX_DIR = $(call select_from_ports,virtualbox5)/src/app/virtualbox -VIRTUALBOX_SDK_DIR = $(call select_from_ports,virtualbox5)/src/app/virtualbox_sdk +VIRTUALBOX_DIR := $(call select_from_ports,virtualbox5)/src/app/virtualbox +VIRTUALBOX_SDK_DIR := $(call select_from_ports,virtualbox5)/src/app/virtualbox_sdk VBOX_DIR = $(VIRTUALBOX_DIR)/src/VBox diff --git a/repos/ports/lib/mk/virtualbox5-runtime.mk b/repos/ports/lib/mk/virtualbox5-runtime.mk index ae8b5ed087..88aff635c2 100644 --- a/repos/ports/lib/mk/virtualbox5-runtime.mk +++ b/repos/ports/lib/mk/virtualbox5-runtime.mk @@ -1,10 +1,12 @@ include $(REP_DIR)/lib/mk/virtualbox5-common.inc +LIBICONV_DIR := $(call select_from_ports,libiconv) + INC_DIR += $(VBOX_DIR)/Runtime/include INC_DIR += $(VIRTUALBOX_DIR)/src/libs/liblzf-3.4 INC_DIR += $(VIRTUALBOX_DIR)/src/libs/zlib-1.2.8 -INC_DIR += $(call select_from_ports,libiconv)/include/iconv +INC_DIR += $(LIBICONV_DIR)/include/iconv GENERIC_SRC_CC = $(notdir $(wildcard $(VBOX_DIR)/Runtime/generic/*.cpp)) diff --git a/repos/ports/lib/mk/virtualbox5-xml.mk b/repos/ports/lib/mk/virtualbox5-xml.mk index 09b7f50c35..bf2b4cc21e 100644 --- a/repos/ports/lib/mk/virtualbox5-xml.mk +++ b/repos/ports/lib/mk/virtualbox5-xml.mk @@ -3,9 +3,11 @@ include $(REP_DIR)/lib/mk/virtualbox5-common.inc ZLIB_DIR = $(VIRTUALBOX_DIR)/src/libs/zlib-1.2.8 LIBXML_DIR = $(VIRTUALBOX_DIR)/src/libs/libxml2-2.9.4 +LIBICONV_DIR := $(call select_from_ports,libiconv) + INC_DIR += $(ZLIB_DIR) INC_DIR += $(LIBXML_DIR)/include -INC_DIR += $(call select_from_ports,libiconv)/include/iconv +INC_DIR += $(LIBICONV_DIR)/include/iconv LIBS += stdcxx diff --git a/repos/ports/lib/mk/virtualbox6-runtime.mk b/repos/ports/lib/mk/virtualbox6-runtime.mk index 92b7c937ac..b4a6203ac0 100644 --- a/repos/ports/lib/mk/virtualbox6-runtime.mk +++ b/repos/ports/lib/mk/virtualbox6-runtime.mk @@ -1,10 +1,12 @@ include $(REP_DIR)/lib/mk/virtualbox6-common.inc +LIBICONV_DIR := $(call select_from_ports,libiconv) + INC_DIR += $(VBOX_DIR)/Runtime/include INC_DIR += $(VIRTUALBOX_DIR)/src/libs/liblzf-3.4 INC_DIR += $(VIRTUALBOX_DIR)/src/libs/zlib-1.2.11 -INC_DIR += $(call select_from_ports,libiconv)/include/iconv +INC_DIR += $(LIBICONV_DIR)/include/iconv INC_DIR += $(REP_DIR)/src/virtualbox6/include/libc LIBS += stdcxx diff --git a/repos/ports/lib/mk/virtualbox6-xml.mk b/repos/ports/lib/mk/virtualbox6-xml.mk index 635e693720..cade8b289c 100644 --- a/repos/ports/lib/mk/virtualbox6-xml.mk +++ b/repos/ports/lib/mk/virtualbox6-xml.mk @@ -1,11 +1,13 @@ include $(REP_DIR)/lib/mk/virtualbox6-common.inc +LIBICONV_DIR := $(call select_from_ports,libiconv) + ZLIB_DIR = $(VIRTUALBOX_DIR)/src/libs/zlib-1.2.11 LIBXML_DIR = $(VIRTUALBOX_DIR)/src/libs/libxml2-2.9.4 INC_DIR += $(ZLIB_DIR) INC_DIR += $(LIBXML_DIR)/include -INC_DIR += $(call select_from_ports,libiconv)/include/iconv +INC_DIR += $(LIBICONV_DIR)/include/iconv INC_DIR += $(VBOX_DIR)/Runtime/include LIBS += stdcxx diff --git a/repos/ports/src/app/gdb_monitor/target.mk b/repos/ports/src/app/gdb_monitor/target.mk index 9b0986f3c4..cae42e9cc1 100644 --- a/repos/ports/src/app/gdb_monitor/target.mk +++ b/repos/ports/src/app/gdb_monitor/target.mk @@ -1,6 +1,6 @@ TARGET = gdb_monitor -GDB_CONTRIB_DIR = $(call select_from_ports,gdb)/src/noux-pkg/gdb +GDB_CONTRIB_DIR := $(call select_from_ports,gdb)/src/noux-pkg/gdb INC_DIR += $(GDB_CONTRIB_DIR)/include \ $(GDB_CONTRIB_DIR) \ diff --git a/repos/ports/src/noux-pkg/bash-minimal/target.mk b/repos/ports/src/noux-pkg/bash-minimal/target.mk index d3f7d4912b..dcb4ce44e6 100644 --- a/repos/ports/src/noux-pkg/bash-minimal/target.mk +++ b/repos/ports/src/noux-pkg/bash-minimal/target.mk @@ -2,6 +2,6 @@ BINARIES := bash INSTALL_TAR_CONTENT := $(addprefix bin/,$(BINARIES)) -PKG_DIR = $(call select_from_ports,bash)/src/noux-pkg/bash +PKG_DIR := $(call select_from_ports,bash)/src/noux-pkg/bash include $(REP_DIR)/src/noux-pkg/bash/target.inc diff --git a/repos/ports/src/noux-pkg/binutils/target.inc b/repos/ports/src/noux-pkg/binutils/target.inc index 57780ea5a6..fce2ecb3d4 100644 --- a/repos/ports/src/noux-pkg/binutils/target.inc +++ b/repos/ports/src/noux-pkg/binutils/target.inc @@ -11,6 +11,6 @@ CONFIGURE_ARGS = --disable-werror \ # MAKE_ENV = $(MKENV) -PKG_DIR = $(call select_from_ports,binutils)/src/noux-pkg/binutils +PKG_DIR := $(call select_from_ports,binutils)/src/noux-pkg/binutils include $(call select_from_repositories,mk/noux.mk) diff --git a/repos/ports/src/noux-pkg/coreutils-minimal/target.mk b/repos/ports/src/noux-pkg/coreutils-minimal/target.mk index d0b4eb36e5..a2fb037b29 100644 --- a/repos/ports/src/noux-pkg/coreutils-minimal/target.mk +++ b/repos/ports/src/noux-pkg/coreutils-minimal/target.mk @@ -2,6 +2,6 @@ BINARIES := cat cp ls mkdir mv rm rmdir sort tail md5sum INSTALL_TAR_CONTENT := $(addprefix bin/,$(BINARIES)) -PKG_DIR = $(call select_from_ports,coreutils)/src/noux-pkg/coreutils +PKG_DIR := $(call select_from_ports,coreutils)/src/noux-pkg/coreutils include $(REP_DIR)/src/noux-pkg/coreutils/target.inc diff --git a/repos/ports/src/noux-pkg/e2fsprogs-minimal/target.mk b/repos/ports/src/noux-pkg/e2fsprogs-minimal/target.mk index 856854a5e7..770fa97db3 100644 --- a/repos/ports/src/noux-pkg/e2fsprogs-minimal/target.mk +++ b/repos/ports/src/noux-pkg/e2fsprogs-minimal/target.mk @@ -2,6 +2,6 @@ BINARIES := fsck.ext2 mkfs.ext2 resize2fs INSTALL_TAR_CONTENT := $(addprefix bin/,$(BINARIES)) -PKG_DIR = $(call select_from_ports,e2fsprogs)/src/noux-pkg/e2fsprogs +PKG_DIR := $(call select_from_ports,e2fsprogs)/src/noux-pkg/e2fsprogs include $(REP_DIR)/src/noux-pkg/e2fsprogs/target.inc diff --git a/repos/ports/src/noux-pkg/gcc/target.inc b/repos/ports/src/noux-pkg/gcc/target.inc index ed17520d0e..97b166f013 100644 --- a/repos/ports/src/noux-pkg/gcc/target.inc +++ b/repos/ports/src/noux-pkg/gcc/target.inc @@ -1,6 +1,6 @@ PWD = $(shell pwd) -PKG_DIR = $(call select_from_ports,gcc)/src/noux-pkg/gcc +PKG_DIR := $(call select_from_ports,gcc)/src/noux-pkg/gcc CONFIGURE_ARGS = --program-prefix=$(PROGRAM_PREFIX) \ --target=$(GCC_TARGET) \ diff --git a/repos/ports/src/noux-pkg/gdb/target.inc b/repos/ports/src/noux-pkg/gdb/target.inc index cd8e64724e..2839f436f8 100644 --- a/repos/ports/src/noux-pkg/gdb/target.inc +++ b/repos/ports/src/noux-pkg/gdb/target.inc @@ -1,4 +1,4 @@ -PKG_DIR = $(call select_from_ports,gdb)/src/noux-pkg/gdb +PKG_DIR := $(call select_from_ports,gdb)/src/noux-pkg/gdb CONFIGURE_ARGS += --program-prefix=$(PROGRAM_PREFIX) \ --target=$(GDB_TARGET) \ diff --git a/repos/ports/src/noux-pkg/vim-minimal/target.mk b/repos/ports/src/noux-pkg/vim-minimal/target.mk index bde63f0284..f78fc7ea59 100644 --- a/repos/ports/src/noux-pkg/vim-minimal/target.mk +++ b/repos/ports/src/noux-pkg/vim-minimal/target.mk @@ -1,5 +1,5 @@ INSTALL_TAR_CONTENT := bin/vim -PKG_DIR = $(call select_from_ports,vim)/src/noux-pkg/vim +PKG_DIR := $(call select_from_ports,vim)/src/noux-pkg/vim include $(REP_DIR)/src/noux-pkg/vim/target.inc