ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-02 03:56:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libs: use select_from_ports in eager assignments

Browse Source 
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
This commit is contained in:
Johannes Schlatow 2022-09-23 15:05:17 +02:00 committed by Christian Helmuth
parent c086eb088d
commit 5e4e634625
101 changed files with 196 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/base-fiasco/lib/mk/kernel-fiasco.inc
View File

@ -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_BUILD_DIR = $(shell pwd)/build
FIASCO = $(FIASCO_BUILD_DIR)/fiasco FIASCO = $(FIASCO_BUILD_DIR)/fiasco

2
repos/base-fiasco/lib/mk/syscall-fiasco.inc
View File

@ -6,7 +6,7 @@
# userland that comes with Fiasco. # 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) L4_BUILD_DIR := $(shell pwd)
# #

2
repos/base-nova/src/kernel/nova/target.mk
View File

@ -3,7 +3,7 @@ include $(call select_from_repositories,mk/spec/nova.mk)
TARGET = hypervisor TARGET = hypervisor
REQUIRES = x86 nova REQUIRES = x86 nova
NOVA_BUILD_DIR = $(BUILD_BASE_DIR)/kernel 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_CC = $(sort $(notdir $(wildcard $(NOVA_SRC_DIR)/src/*.cpp)))
SRC_S = $(sort $(notdir $(wildcard $(NOVA_SRC_DIR)/src/*.S))) SRC_S = $(sort $(notdir $(wildcard $(NOVA_SRC_DIR)/src/*.S)))
INC_DIR = $(NOVA_SRC_DIR)/include INC_DIR = $(NOVA_SRC_DIR)/include

2
repos/base-okl4/lib/import/import-syscall-okl4.mk
View File

@ -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. # Make sure that symlink modification times are handled correctly.

2
repos/base-okl4/lib/mk/okl4_boot_info.mk
View File

@ -2,6 +2,6 @@ SRC_C = bootinfo.c
LIBS += syscall-okl4 LIBS += syscall-okl4
INC_DIR += $(REP_DIR)/src/include/bootinfo/internal INC_DIR += $(REP_DIR)/src/include/bootinfo/internal
CC_WARN = -Wall -Wno-attributes CC_WARN = -Wall -Wno-attributes
OKL4_DIR = $(call select_from_ports,okl4)/src/kernel/okl4 OKL4_DIR := $(call select_from_ports,okl4)/src/kernel/okl4
vpath bootinfo.c $(OKL4_DIR)/libs/bootinfo/src vpath bootinfo.c $(OKL4_DIR)/libs/bootinfo/src

2
repos/base-okl4/lib/mk/spec/x86/kernel-okl4-include.mk
View File

@ -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 ARCH_DIR = $(OKL4_SRC_DIR)/arch/ia32
PLAT_DIR = $(OKL4_SRC_DIR)/platform/pc99 PLAT_DIR = $(OKL4_SRC_DIR)/platform/pc99
INC_SYMLINKS = arch/apic.h \ INC_SYMLINKS = arch/apic.h \

2
repos/base-okl4/lib/mk/spec/x86/kernel-okl4.mk
View File

@ -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 \
CONFIG_ARCH_IA32=1 \ CONFIG_ARCH_IA32=1 \

2
repos/base-okl4/lib/mk/tools.mk
View File

@ -2,7 +2,7 @@
# Create symlink to elfweaver so that the run tool can use it from within the # Create symlink to elfweaver so that the run tool can use it from within the
# build directory. # 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 HOST_TOOLS += $(BUILD_BASE_DIR)/tool/okl4/elfweaver
$(BUILD_BASE_DIR)/tool/okl4/elfweaver: $(BUILD_BASE_DIR)/tool/okl4/elfweaver:

2
repos/gems/lib/import/import-cbe.mk
View File

@ -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 INC_DIR += $(CBE_DIR)/src/lib/cbe

2
repos/gems/lib/import/import-cbe_common.mk
View File

@ -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 INC_DIR += $(CBE_DIR)/src/lib/cbe_common

2
repos/gems/lib/import/import-sha256_4k.mk
View File

@ -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 INC_DIR += $(CBE_DIR)/src/lib/sha256_4k

2
repos/gems/lib/mk/aes_cbc_4k.mk
View File

@ -1,4 +1,4 @@
LIBSSL_PORT_DIR = $(call select_from_ports,openssl) LIBSSL_PORT_DIR := $(call select_from_ports,openssl)
LIBS += libcrypto LIBS += libcrypto
SRC_CC += aes_cbc_4k.cc SRC_CC += aes_cbc_4k.cc

2
repos/gems/lib/mk/sha256_4k.mk
View File

@ -1,4 +1,4 @@
CBE_DIR = $(call select_from_ports,cbe) CBE_DIR := $(call select_from_ports,cbe)
SRC_ADB := sha256_4k.adb SRC_ADB := sha256_4k.adb
LIBS += spark libsparkcrypto LIBS += spark libsparkcrypto

2
repos/gems/lib/mk/spec/x86_64/cbe.mk
View File

@ -1,4 +1,4 @@
CBE_DIR = $(call select_from_ports,cbe) CBE_DIR := $(call select_from_ports,cbe)
LIBS += spark sha256_4k cbe_common LIBS += spark sha256_4k cbe_common

2
repos/gems/lib/mk/spec/x86_64/cbe_check.mk
View File

@ -1,4 +1,4 @@
CBE_DIR = $(call select_from_ports,cbe) CBE_DIR := $(call select_from_ports,cbe)
LIBS += spark sha256_4k cbe_common LIBS += spark sha256_4k cbe_common

2
repos/gems/lib/mk/spec/x86_64/cbe_check_cxx.mk
View File

@ -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 += spark libsparkcrypto sha256_4k cbe_common cbe_cxx_common
LIBS += cbe_check LIBS += cbe_check

2
repos/gems/lib/mk/spec/x86_64/cbe_common.mk
View File

@ -1,4 +1,4 @@
CBE_DIR = $(call select_from_ports,cbe) CBE_DIR := $(call select_from_ports,cbe)
LIBS += spark sha256_4k LIBS += spark sha256_4k

2
repos/gems/lib/mk/spec/x86_64/cbe_cxx.mk
View File

@ -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 LIBS += spark libsparkcrypto sha256_4k cbe cbe_common cbe_cxx_common

2
repos/gems/lib/mk/spec/x86_64/cbe_cxx_common.mk
View File

@ -1,4 +1,4 @@
CBE_DIR = $(call select_from_ports,cbe) CBE_DIR := $(call select_from_ports,cbe)
LIBS += spark cbe_common LIBS += spark cbe_common

2
repos/gems/lib/mk/spec/x86_64/cbe_dump.mk
View File

@ -1,4 +1,4 @@
CBE_DIR = $(call select_from_ports,cbe) CBE_DIR := $(call select_from_ports,cbe)
LIBS += spark sha256_4k cbe_common LIBS += spark sha256_4k cbe_common

2
repos/gems/lib/mk/spec/x86_64/cbe_dump_cxx.mk
View File

@ -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 += spark libsparkcrypto sha256_4k cbe_common cbe_cxx_common
LIBS += cbe_dump LIBS += cbe_dump

2
repos/gems/lib/mk/spec/x86_64/cbe_init.mk
View File

@ -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 LIBS += spark sha256_4k cbe_common cbe_cxx_common

2
repos/gems/lib/mk/spec/x86_64/cbe_init_cxx.mk
View File

@ -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 += spark libsparkcrypto sha256_4k cbe_common cbe_cxx_common
LIBS += cbe_init LIBS += cbe_init

2
repos/gems/lib/mk/spec/x86_64/vfs_cbe_trust_anchor.mk
View File

@ -1,4 +1,4 @@
OPENSSL_DIR = $(call select_from_ports,openssl) OPENSSL_DIR := $(call select_from_ports,openssl)
SRC_CC += vfs.cc SRC_CC += vfs.cc
SRC_CC += aes_256.cc SRC_CC += aes_256.cc

2
repos/gems/src/test/tiled_wm/target.inc
View File

@ -20,7 +20,7 @@ ICON_H = $(call select_from_repositories,include/qoost/icon.h)
# fall-back to the qoost port directory if that fails # fall-back to the qoost port directory if that fails
ifeq ($(ICON_H),) 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 endif
icon.h: $(ICON_H) icon.h: $(ICON_H)

3
repos/libports/lib/import/import-acpica.mk
View File

@ -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 CC_OPT += -DACPI_INLINE=inline -Wno-builtin-declaration-mismatch

4
repos/libports/lib/import/import-curl.mk
View File

@ -1,4 +1,6 @@
ARCH = $(filter 32bit 64bit,$(SPECS)) 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_repositories,src/lib/curl)/spec/$(ARCH)
INC_DIR += $(call select_from_ports,curl)/include INC_DIR += $(CURL_DIR)/include

4
repos/libports/lib/import/import-expat.mk
View File

@ -1 +1,3 @@
INC_DIR += $(call select_from_ports,expat)/include EXPAT_DIR := $(call select_from_ports,expat)
INC_DIR += $(EXPAT_DIR)/include

3
repos/libports/lib/import/import-fatfs_block.mk
View File

@ -1 +1,2 @@
INC_DIR += $(call select_from_ports,fatfs)/include FATFS_DIR := $(call select_from_ports,fatfs)
INC_DIR += $(FATFS_DIR)/include

10
repos/libports/lib/import/import-ffi.mk
View File

@ -1,15 +1,17 @@
FFI_DIR := $(call select_from_ports,ffi)
ifeq ($(filter-out $(SPECS),x86_32),) 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 endif
ifeq ($(filter-out $(SPECS),x86_64),) 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 endif
ifeq ($(filter-out $(SPECS),arm),) 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 endif
ifeq ($(filter-out $(SPECS),arm_64),) 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 endif

3
repos/libports/lib/import/import-freetype.mk
View File

@ -1 +1,2 @@
INC_DIR += $(call select_from_ports,freetype)/include FREETYPE_DIR := $(call select_from_ports,freetype)
INC_DIR += $(FREETYPE_DIR)/include

3
repos/libports/lib/import/import-jbig2dec.mk
View File

@ -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

4
repos/libports/lib/import/import-jitterentropy.mk
View File

@ -10,10 +10,12 @@ else ifeq ($(filter-out $(SPECS),arm_v8),)
TARGET_CPUARCH=arm_v8 TARGET_CPUARCH=arm_v8
endif endif
JITTERENTROPY_DIR := $(call select_from_ports,jitterentropy)
ifeq ($(CONTRIB_DIR),) ifeq ($(CONTRIB_DIR),)
REP_INC_DIR += include/jitterentropy REP_INC_DIR += include/jitterentropy
else else
INC_DIR += $(call select_from_ports,jitterentropy)/include/jitterentropy INC_DIR += $(JITTERENTROPY_DIR)/include/jitterentropy
endif endif
INC_DIR += $(call select_from_repositories,src/lib/jitterentropy) INC_DIR += $(call select_from_repositories,src/lib/jitterentropy)

3
repos/libports/lib/import/import-jpeg.mk
View File

@ -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 REP_INC_DIR += include/jpeg

3
repos/libports/lib/import/import-libarchive.mk
View File

@ -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

3
repos/libports/lib/import/import-libbz2.mk
View File

@ -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

4
repos/libports/lib/import/import-libcrypto.mk
View File

@ -2,7 +2,9 @@ LIB_OPENSSL_DIR = $(call select_from_repositories,src/lib/openssl)
ARCH = $(filter 32bit 64bit,$(SPECS)) 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) INC_DIR += $(LIB_OPENSSL_DIR)/spec/$(ARCH)
LIBS += libc LIBS += libc

4
repos/libports/lib/import/import-libdrm.mk
View File

@ -1,7 +1,7 @@
ifeq ($(CONTRIB_DIR),) ifeq ($(CONTRIB_DIR),)
DRM_SRC_DIR = $(realpath $(call select_from_repositories,include/drm)/../..) DRM_SRC_DIR := $(realpath $(call select_from_repositories,include/drm)/../..)
else else
DRM_SRC_DIR = $(call select_from_ports,libdrm)/src/lib/libdrm DRM_SRC_DIR := $(call select_from_ports,libdrm)/src/lib/libdrm
endif endif
INC_DIR += $(DRM_SRC_DIR) INC_DIR += $(DRM_SRC_DIR)

3
repos/libports/lib/import/import-libgcrypt.mk
View File

@ -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

3
repos/libports/lib/import/import-libiconv.mk
View File

@ -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

3
repos/libports/lib/import/import-liblzma.mk
View File

@ -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

3
repos/libports/lib/import/import-libpcg_random.mk
View File

@ -1,3 +1,4 @@
PCGC_DIR := $(call select_from_ports,pcg-c)
INC_DIR += \ INC_DIR += \
$(call select_from_ports,pcg-c)/include/pcg-c \ $(PCGC_DIR)/include/pcg-c \
$(call select_from_repositories,include/pcg-c) $(call select_from_repositories,include/pcg-c)

3
repos/libports/lib/import/import-libpng.mk
View File

@ -1,2 +1,3 @@
LIBPNG_DIR := $(call select_from_ports,libpng)
INC_DIR += $(call select_from_repositories,include/libpng) INC_DIR += $(call select_from_repositories,include/libpng)
INC_DIR += $(call select_from_ports,libpng)/include/libpng INC_DIR += $(LIBPNG_DIR)/include/libpng

4
repos/libports/lib/import/import-libssh.mk
View File

@ -1,2 +1,4 @@
LIBSSH_DIR := $(call select_from_ports,libssh)
REP_INC_DIR += include/libssh REP_INC_DIR += include/libssh
INC_DIR += $(call select_from_ports,libssh)/include INC_DIR += $(LIBSSH_DIR)/include

4
repos/libports/lib/import/import-libssl.mk
View File

@ -1,8 +1,10 @@
LIB_OPENSSL_DIR = $(call select_from_repositories,src/lib/openssl) LIB_OPENSSL_DIR = $(call select_from_repositories,src/lib/openssl)
OPENSSL_DIR := $(call select_from_ports,openssl)
LIBS += libcrypto LIBS += libcrypto
ARCH = $(filter 32bit 64bit,$(SPECS)) 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) INC_DIR += $(LIB_OPENSSL_DIR)/spec/$(ARCH)

3
repos/libports/lib/import/import-libusb.mk
View File

@ -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

3
repos/libports/lib/import/import-libuvc.mk
View File

@ -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

3
repos/libports/lib/import/import-libyuv.mk
View File

@ -1 +1,2 @@
INC_DIR += $(call select_from_ports,libyuv)/include LIBYUV_DIR := $(call select_from_ports,libyuv)
INC_DIR += $(LIBYUV_DIR)/include

3
repos/libports/lib/import/import-lwip.mk
View File

@ -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) INC_DIR += $(call select_from_repositories,include/lwip)

3
repos/libports/lib/import/import-lz4.mk
View File

@ -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

3
repos/libports/lib/import/import-mupdf.mk
View File

@ -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

3
repos/libports/lib/import/import-ncurses.mk
View File

@ -1,2 +1,3 @@
NCURSES_DIR := $(call select_from_ports,ncurses)
REP_INC_DIR += include/ncurses REP_INC_DIR += include/ncurses
INC_DIR += $(call select_from_ports,ncurses)/include/ncurses INC_DIR += $(NCURSES_DIR)/include/ncurses

3
repos/libports/lib/import/import-openjpeg.mk
View File

@ -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

3
repos/libports/lib/import/import-pcre.mk
View File

@ -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

3
repos/libports/lib/import/import-pcsc-lite.mk
View File

@ -1,5 +1,6 @@
PCSCLITE_DIR := $(call select_from_ports,pcsc-lite)
ifeq ($(CONTRIB_DIR),) ifeq ($(CONTRIB_DIR),)
REP_INC_DIR += include/PCSC REP_INC_DIR += include/PCSC
else else
INC_DIR += $(call select_from_ports,pcsc-lite)/include/PCSC INC_DIR += $(PCSCLITE_DIR)/include/PCSC
endif endif

3
repos/libports/lib/import/import-qoost.mk
View File

@ -1 +1,2 @@
INC_DIR += $(call select_from_ports,qoost)/include QOOST_DIR := $(call select_from_ports,qoost)
INC_DIR += $(QOOST_DIR)/include

4
repos/libports/lib/import/import-qt5_cmake.mk
View File

@ -24,7 +24,7 @@ ifeq ($(CONTRIB_DIR),)
QT_DIR = $(call select_from_repositories,src/lib/qt5) QT_DIR = $(call select_from_repositories,src/lib/qt5)
QT_API_DIR = $(call select_from_repositories,mkspecs)/.. QT_API_DIR = $(call select_from_repositories,mkspecs)/..
else else
QT_PORT_DIR = $(call select_from_ports,qt5) QT_PORT_DIR := $(call select_from_ports,qt5)
QT_DIR = $(QT_PORT_DIR)/src/lib/qt5 QT_DIR = $(QT_PORT_DIR)/src/lib/qt5
QT_API_DIR = $(QT_DIR)/genode/api QT_API_DIR = $(QT_DIR)/genode/api
endif endif
@ -96,7 +96,7 @@ GENODE_CMAKE_LFLAGS_SHLIB = \
ifeq ($(CONTRIB_DIR),) ifeq ($(CONTRIB_DIR),)
GENODE_CMAKE_GL_INCDIRS = $(call select_from_repositories,include/GL)/.. GENODE_CMAKE_GL_INCDIRS = $(call select_from_repositories,include/GL)/..
else else
GENODE_CMAKE_GL_INCDIRS = $(call select_from_ports,mesa)/include GENODE_CMAKE_GL_INCDIRS := $(call select_from_ports,mesa)/include
endif endif
GENODE_CMAKE_OPENGL_LIBS = $(CURDIR)/cmake_root/lib/mesa.lib.so GENODE_CMAKE_OPENGL_LIBS = $(CURDIR)/cmake_root/lib/mesa.lib.so

6
repos/libports/lib/import/import-qt5_qmake.mk
View File

@ -25,7 +25,7 @@ ifeq ($(CONTRIB_DIR),)
QT_DIR = $(call select_from_repositories,src/lib/qt5) QT_DIR = $(call select_from_repositories,src/lib/qt5)
QT_API_DIR = $(call select_from_repositories,mkspecs)/.. QT_API_DIR = $(call select_from_repositories,mkspecs)/..
else else
QT_PORT_DIR = $(call select_from_ports,qt5) QT_PORT_DIR := $(call select_from_ports,qt5)
QT_DIR = $(QT_PORT_DIR)/src/lib/qt5 QT_DIR = $(QT_PORT_DIR)/src/lib/qt5
QT_API_DIR = $(QT_DIR)/genode/api QT_API_DIR = $(QT_DIR)/genode/api
endif endif
@ -104,8 +104,8 @@ ifeq ($(CONTRIB_DIR),)
GENODE_QMAKE_INCDIR_OPENGL = $(call select_from_repositories,include/GL)/.. GENODE_QMAKE_INCDIR_OPENGL = $(call select_from_repositories,include/GL)/..
GENODE_QMAKE_INCDIR_EGL = $(call select_from_repositories,include/EGL)/.. GENODE_QMAKE_INCDIR_EGL = $(call select_from_repositories,include/EGL)/..
else else
GENODE_QMAKE_INCDIR_OPENGL = $(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 GENODE_QMAKE_INCDIR_EGL := $(call select_from_ports,mesa)/include
endif endif
GENODE_QMAKE_LIBS_OPENGL = $(CURDIR)/qmake_root/lib/mesa.lib.so GENODE_QMAKE_LIBS_OPENGL = $(CURDIR)/qmake_root/lib/mesa.lib.so

10
repos/libports/lib/import/import-spark.mk
View File

@ -1,10 +1,10 @@
ADA_RTS = $(BUILD_BASE_DIR)/var/libcache/spark 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_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_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_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_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_RUNTIME_PLATFORM_DIR := $(call select_from_ports,ada-runtime)/ada-runtime/platform
INC_DIR += $(ADA_RUNTIME_DIR) \ INC_DIR += $(ADA_RUNTIME_DIR) \
$(ADA_RUNTIME_LIB_DIR) \ $(ADA_RUNTIME_LIB_DIR) \

3
repos/libports/lib/import/import-x86emu.mk
View File

@ -1 +1,2 @@
INC_DIR += $(call select_from_ports,x86emu)/include X86EMU_DIR := $(call select_from_ports,x86emu)
INC_DIR += $(X86EMU_DIR)/include

3
repos/libports/lib/import/import-zlib.mk
View File

@ -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

2
repos/libports/lib/mk/gmp.inc
View File

@ -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 include $(REP_DIR)/lib/import/import-gmp.mk

2
repos/libports/lib/mk/icu.mk
View File

@ -1,6 +1,6 @@
include $(call select_from_repositories,lib/import/import-icu.mk) 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 # copy-pasted from $(ICU_DIR)/source/common/Makefile.in and renamed OBJECTS to ICU_COMMON_OBJECTS

2
repos/libports/lib/mk/jbig2dec.mk
View File

@ -1,4 +1,4 @@
JBIG2DEC_DIR = $(call select_from_ports,jbig2dec)/src/lib/jbig2dec JBIG2DEC_DIR := $(call select_from_ports,jbig2dec)/src/lib/jbig2dec
LIBS += libc libpng zlib LIBS += libc libpng zlib
INC_DIR += $(JBIG2DEC_DIR) $(REP_DIR)/include/jbig2dec INC_DIR += $(JBIG2DEC_DIR) $(REP_DIR)/include/jbig2dec

2
repos/libports/lib/mk/jpeg.mk
View File

@ -1,5 +1,5 @@
JPEG = jpeg-7 JPEG = jpeg-7
JPEG_DIR = $(call select_from_ports,jpeg)/src/lib/jpeg JPEG_DIR := $(call select_from_ports,jpeg)/src/lib/jpeg
LIBS += libc LIBS += libc
# use our customized 'jconfig.h' file # use our customized 'jconfig.h' file

2
repos/libports/lib/mk/libarchive.mk
View File

@ -1,4 +1,4 @@
LIBARCHIVE_DIR = $(call select_from_ports,libarchive)/src/lib/libarchive LIBARCHIVE_DIR := $(call select_from_ports,libarchive)/src/lib/libarchive
LIBS += libc zlib liblzma LIBS += libc zlib liblzma
INC_DIR += $(REP_DIR)/src/lib/libarchive $(LIBARCHIVE_DIR) INC_DIR += $(REP_DIR)/src/lib/libarchive $(LIBARCHIVE_DIR)

2
repos/libports/lib/mk/libpcg_random.mk
View File

@ -1,5 +1,5 @@
include $(REP_DIR)/lib/import/import-libpcg_random.mk 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 CC_OPT += -std=c99

2
repos/libports/lib/mk/libyuv.inc
View File

@ -1,6 +1,6 @@
SHARED_LIB = yes SHARED_LIB = yes
YUV_PORT = $(call select_from_ports,libyuv) YUV_PORT := $(call select_from_ports,libyuv)
YUV_DIR = $(YUV_PORT)/src/lib/libyuv YUV_DIR = $(YUV_PORT)/src/lib/libyuv
LIBS = libc stdcxx jpeg LIBS = libc stdcxx jpeg

2
repos/libports/lib/mk/openjpeg.mk
View File

@ -1,5 +1,5 @@
OPENJPEG = openjpeg-1.4 OPENJPEG = openjpeg-1.4
OPENJPEG_DIR = $(call select_from_ports,openjpeg)/src/lib/openjpeg/libopenjpeg OPENJPEG_DIR := $(call select_from_ports,openjpeg)/src/lib/openjpeg/libopenjpeg
LIBS += libc libm LIBS += libc libm
INC_DIR += $(OPENJPEG_DIR) $(REP_DIR)/include/openjpeg INC_DIR += $(OPENJPEG_DIR) $(REP_DIR)/include/openjpeg

2
repos/libports/lib/mk/qemu-usb.inc
View File

@ -1,5 +1,5 @@
LIB_DIR = $(REP_DIR)/src/lib/qemu-usb LIB_DIR = $(REP_DIR)/src/lib/qemu-usb
QEMU_USB_DIR = $(call select_from_ports,qemu-usb)/src/lib/qemu/hw/usb QEMU_USB_DIR := $(call select_from_ports,qemu-usb)/src/lib/qemu/hw/usb
CC_WARN= CC_WARN=

3
repos/libports/lib/mk/spec/32bit/curl.mk
View File

@ -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
INC_DIR += $(REP_DIR)/src/lib/curl/spec/32bit/curl INC_DIR += $(REP_DIR)/src/lib/curl/spec/32bit/curl

3
repos/libports/lib/mk/spec/64bit/curl.mk
View File

@ -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
INC_DIR += $(REP_DIR)/src/lib/curl/spec/64bit/curl INC_DIR += $(REP_DIR)/src/lib/curl/spec/64bit/curl

2
repos/libports/lib/mk/spec/arm/ffi.mk
View File

@ -2,7 +2,7 @@ SHARED_LIB = yes
LIBS = libc 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 INC_DIR = $(FFI_PORT)/include

2
repos/libports/lib/mk/spec/arm/libc-gen.mk
View File

@ -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 # path is in effect when building the libc from a source archive (where the
# ucontext.h header is taken from the libc API archive). # 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)) $(addprefix -I,$(call select_from_repositories,include/libc/sys))
vpath % $(LIBC_GEN_ARM_DIR) vpath % $(LIBC_GEN_ARM_DIR)

4
repos/libports/lib/mk/spec/arm/libcrypto.mk
View File

@ -31,7 +31,9 @@ SRC_S = \
sha/asm/sha512-armv4.S \ sha/asm/sha512-armv4.S \
# end of SRC_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),) ifeq ($(filter-out $(SPECS),neon),)
vpath armcap_genode.c $(REP_DIR)/src/lib/openssl/crypto/spec/neon vpath armcap_genode.c $(REP_DIR)/src/lib/openssl/crypto/spec/neon

2
repos/libports/lib/mk/spec/arm_64/ffi.mk
View File

@ -2,7 +2,7 @@ SHARED_LIB = yes
LIBS = libc 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 INC_DIR = $(FFI_PORT)/include

2
repos/libports/lib/mk/spec/arm_64/libc-gen.mk
View File

@ -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 # path is in effect when building the libc from a source archive (where the
# ucontext.h header is taken from the libc API archive). # 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)) $(addprefix -I,$(call select_from_repositories,include/libc/sys))
vpath %.c $(LIBC_GEN_ARM64_DIR) vpath %.c $(LIBC_GEN_ARM64_DIR)

4
repos/libports/lib/mk/spec/arm_64/libcrypto.mk
View File

@ -30,7 +30,9 @@ SRC_S = \
sha/asm/sha512-armv8.S \ sha/asm/sha512-armv8.S \
# end of SRC_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),) ifeq ($(filter-out $(SPECS),neon),)
vpath armcap_genode.c $(REP_DIR)/src/lib/openssl/crypto/spec/neon vpath armcap_genode.c $(REP_DIR)/src/lib/openssl/crypto/spec/neon

2
repos/libports/lib/mk/spec/riscv/libc-gen.mk
View File

@ -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 # path is in effect when building the libc from a source archive (where the
# ucontext.h header is taken from the libc API archive). # 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)) $(addprefix -I,$(call select_from_repositories,/include/libc/sys))
CC_OPT += -DSOFTFLOAT_FOR_GCC CC_OPT += -DSOFTFLOAT_FOR_GCC

2
repos/libports/lib/mk/spec/x86_32/ffi.mk
View File

@ -2,7 +2,7 @@ SHARED_LIB = yes
LIBS = libc 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 INC_DIR = $(FFI_PORT)/include

4
repos/libports/lib/mk/spec/x86_32/libcrypto.mk
View File

@ -34,7 +34,9 @@ SRC_S = \
x86cpuid.s \ x86cpuid.s \
# end of SRC_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 include $(REP_DIR)/lib/mk/libcrypto.inc

2
repos/libports/lib/mk/spec/x86_64/ffi.mk
View File

@ -2,7 +2,7 @@ SHARED_LIB = yes
LIBS = libc 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 INC_DIR = $(FFI_PORT)/include

4
repos/libports/lib/mk/spec/x86_64/libcrypto.mk
View File

@ -45,7 +45,9 @@ SRC_S = \
x86_64cpuid.s \ x86_64cpuid.s \
# end of SRC_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 include $(REP_DIR)/lib/mk/libcrypto.inc

2
repos/libports/lib/mk/x86emu.mk
View File

@ -2,7 +2,7 @@
# x86 real-mode emulation library # 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 INC_DIR += $(X86EMU_DIR) $(REP_DIR)/include/x86emu
CC_OPT += -fomit-frame-pointer -Wno-maybe-uninitialized CC_OPT += -fomit-frame-pointer -Wno-maybe-uninitialized

2
repos/libports/lib/mk/zlib.mk
View File

@ -1,4 +1,4 @@
ZLIB_DIR = $(call select_from_ports,zlib)/src/lib/zlib ZLIB_DIR := $(call select_from_ports,zlib)/src/lib/zlib
LIBS += libc LIBS += libc
INC_DIR += $(ZLIB_DIR) INC_DIR += $(ZLIB_DIR)
SRC_C = adler32.c compress.c crc32.c deflate.c gzclose.c \ SRC_C = adler32.c compress.c crc32.c deflate.c gzclose.c \

2
repos/libports/src/test/fatfs_block_io/target.mk
View File

@ -6,7 +6,7 @@ SRC_CC = component.cc
CC_DEF += -D_MAX_SS=FF_MAX_SS CC_DEF += -D_MAX_SS=FF_MAX_SS
CC_WARN += -Wno-pointer-to-int-cast 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 INC_DIR += $(FATFS_PORT_DIR)/include/fatfs

2
repos/libports/src/test/pcg32/target.mk
View File

@ -1,7 +1,7 @@
TARGET = test-pcg32 TARGET = test-pcg32
LIBS = libpcg_random posix 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 INC_DIR += $(PCG_SRC_DIR)/extras
SRC_C = check-pcg32-global.c entropy.c SRC_C = check-pcg32-global.c entropy.c

2
repos/ports/lib/mk/gdbserver_platform.inc
View File

@ -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 \ INC_DIR += $(REP_DIR)/src/lib/gdbserver_libc_support \
$(REP_DIR)/src/lib/gdbserver_platform \ $(REP_DIR)/src/lib/gdbserver_platform \

4
repos/ports/lib/mk/virtualbox5-common.inc
View File

@ -12,8 +12,8 @@ REQUIRES += installation_of_yasm
REQUIRES += installation_of_iasl REQUIRES += installation_of_iasl
endif endif
VIRTUALBOX_DIR = $(call select_from_ports,virtualbox5)/src/app/virtualbox VIRTUALBOX_DIR := $(call select_from_ports,virtualbox5)/src/app/virtualbox
VIRTUALBOX_SDK_DIR = $(call select_from_ports,virtualbox5)/src/app/virtualbox_sdk VIRTUALBOX_SDK_DIR := $(call select_from_ports,virtualbox5)/src/app/virtualbox_sdk
VBOX_DIR = $(VIRTUALBOX_DIR)/src/VBox VBOX_DIR = $(VIRTUALBOX_DIR)/src/VBox

4
repos/ports/lib/mk/virtualbox5-runtime.mk
View File

@ -1,10 +1,12 @@
include $(REP_DIR)/lib/mk/virtualbox5-common.inc include $(REP_DIR)/lib/mk/virtualbox5-common.inc
LIBICONV_DIR := $(call select_from_ports,libiconv)
INC_DIR += $(VBOX_DIR)/Runtime/include INC_DIR += $(VBOX_DIR)/Runtime/include
INC_DIR += $(VIRTUALBOX_DIR)/src/libs/liblzf-3.4 INC_DIR += $(VIRTUALBOX_DIR)/src/libs/liblzf-3.4
INC_DIR += $(VIRTUALBOX_DIR)/src/libs/zlib-1.2.8 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)) GENERIC_SRC_CC = $(notdir $(wildcard $(VBOX_DIR)/Runtime/generic/*.cpp))

4
repos/ports/lib/mk/virtualbox5-xml.mk
View File

@ -3,9 +3,11 @@ include $(REP_DIR)/lib/mk/virtualbox5-common.inc
ZLIB_DIR = $(VIRTUALBOX_DIR)/src/libs/zlib-1.2.8 ZLIB_DIR = $(VIRTUALBOX_DIR)/src/libs/zlib-1.2.8
LIBXML_DIR = $(VIRTUALBOX_DIR)/src/libs/libxml2-2.9.4 LIBXML_DIR = $(VIRTUALBOX_DIR)/src/libs/libxml2-2.9.4
LIBICONV_DIR := $(call select_from_ports,libiconv)
INC_DIR += $(ZLIB_DIR) INC_DIR += $(ZLIB_DIR)
INC_DIR += $(LIBXML_DIR)/include INC_DIR += $(LIBXML_DIR)/include
INC_DIR += $(call select_from_ports,libiconv)/include/iconv INC_DIR += $(LIBICONV_DIR)/include/iconv
LIBS += stdcxx LIBS += stdcxx

4
repos/ports/lib/mk/virtualbox6-runtime.mk
View File

@ -1,10 +1,12 @@
include $(REP_DIR)/lib/mk/virtualbox6-common.inc include $(REP_DIR)/lib/mk/virtualbox6-common.inc
LIBICONV_DIR := $(call select_from_ports,libiconv)
INC_DIR += $(VBOX_DIR)/Runtime/include INC_DIR += $(VBOX_DIR)/Runtime/include
INC_DIR += $(VIRTUALBOX_DIR)/src/libs/liblzf-3.4 INC_DIR += $(VIRTUALBOX_DIR)/src/libs/liblzf-3.4
INC_DIR += $(VIRTUALBOX_DIR)/src/libs/zlib-1.2.11 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 INC_DIR += $(REP_DIR)/src/virtualbox6/include/libc
LIBS += stdcxx LIBS += stdcxx

4
repos/ports/lib/mk/virtualbox6-xml.mk
View File

@ -1,11 +1,13 @@
include $(REP_DIR)/lib/mk/virtualbox6-common.inc 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 ZLIB_DIR = $(VIRTUALBOX_DIR)/src/libs/zlib-1.2.11
LIBXML_DIR = $(VIRTUALBOX_DIR)/src/libs/libxml2-2.9.4 LIBXML_DIR = $(VIRTUALBOX_DIR)/src/libs/libxml2-2.9.4
INC_DIR += $(ZLIB_DIR) INC_DIR += $(ZLIB_DIR)
INC_DIR += $(LIBXML_DIR)/include 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 INC_DIR += $(VBOX_DIR)/Runtime/include
LIBS += stdcxx LIBS += stdcxx

2
repos/ports/src/app/gdb_monitor/target.mk
View File

@ -1,6 +1,6 @@
TARGET = gdb_monitor 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 \ INC_DIR += $(GDB_CONTRIB_DIR)/include \
$(GDB_CONTRIB_DIR) \ $(GDB_CONTRIB_DIR) \

2
repos/ports/src/noux-pkg/bash-minimal/target.mk
View File

@ -2,6 +2,6 @@ BINARIES := bash
INSTALL_TAR_CONTENT := $(addprefix bin/,$(BINARIES)) 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 include $(REP_DIR)/src/noux-pkg/bash/target.inc

2
repos/ports/src/noux-pkg/binutils/target.inc
View File

@ -11,6 +11,6 @@ CONFIGURE_ARGS = --disable-werror \
# #
MAKE_ENV = $(MKENV) 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) include $(call select_from_repositories,mk/noux.mk)

2
repos/ports/src/noux-pkg/coreutils-minimal/target.mk
View File

@ -2,6 +2,6 @@ BINARIES := cat cp ls mkdir mv rm rmdir sort tail md5sum
INSTALL_TAR_CONTENT := $(addprefix bin/,$(BINARIES)) 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 include $(REP_DIR)/src/noux-pkg/coreutils/target.inc

2
repos/ports/src/noux-pkg/e2fsprogs-minimal/target.mk
View File

@ -2,6 +2,6 @@ BINARIES := fsck.ext2 mkfs.ext2 resize2fs
INSTALL_TAR_CONTENT := $(addprefix bin/,$(BINARIES)) 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 include $(REP_DIR)/src/noux-pkg/e2fsprogs/target.inc

2
repos/ports/src/noux-pkg/gcc/target.inc
View File

@ -1,6 +1,6 @@
PWD = $(shell pwd) 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) \ CONFIGURE_ARGS = --program-prefix=$(PROGRAM_PREFIX) \
--target=$(GCC_TARGET) \ --target=$(GCC_TARGET) \

2
repos/ports/src/noux-pkg/gdb/target.inc
View File

@ -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) \ CONFIGURE_ARGS += --program-prefix=$(PROGRAM_PREFIX) \
--target=$(GDB_TARGET) \ --target=$(GDB_TARGET) \

Some files were not shown because too many files have changed in this diff Show More