Remove pseudo targets for building shared libs

Thanks to the change "build: support library builds via lib/<libname>",
shared libraries can now be built directly by the build system.

Issue #4599
This commit is contained in:
Norman Feske 2022-09-01 13:12:13 +02:00
parent c560285d88
commit dd9e12601e
137 changed files with 94 additions and 369 deletions

View File

@ -21,6 +21,5 @@ content:
for spec in x86_32; do \ for spec in x86_32; do \
mv lib/mk/spec/$$spec/ld-fiasco.mk lib/mk/spec/$$spec/ld.mk; \ mv lib/mk/spec/$$spec/ld-fiasco.mk lib/mk/spec/$$spec/ld.mk; \
done; done;
sed -i "s/ld-fiasco/ld/" src/lib/ld/fiasco/target.mk
sed -i "s/fiasco_timer_drv/timer/" src/timer/fiasco/target.mk sed -i "s/fiasco_timer_drv/timer/" src/timer/fiasco/target.mk

View File

@ -1,2 +0,0 @@
TARGET = ld-fiasco
LIBS = ld-fiasco

View File

@ -39,5 +39,4 @@ content:
for spec in x86_32 x86_64 arm arm_64; do \ for spec in x86_32 x86_64 arm arm_64; do \
mv lib/mk/spec/$$spec/ld-foc.mk lib/mk/spec/$$spec/ld.mk; \ mv lib/mk/spec/$$spec/ld-foc.mk lib/mk/spec/$$spec/ld.mk; \
done; done;
sed -i "s/ld-foc/ld/" src/lib/ld/foc/target.mk
sed -i "s/foc_timer_drv/timer/" src/timer/foc/target.mk sed -i "s/foc_timer_drv/timer/" src/timer/foc/target.mk

View File

@ -1,2 +0,0 @@
TARGET = ld-foc
LIBS = ld-foc

View File

@ -180,7 +180,6 @@ generalize_target_names: $(CONTENT)
# apply kernel-agnostic convention of naming the timer and ld.lib.so # apply kernel-agnostic convention of naming the timer and ld.lib.so
for subdir in ${call selected_content,LD_MK_DIRS}; do \ for subdir in ${call selected_content,LD_MK_DIRS}; do \
mv $$subdir/ld-hw.mk $$subdir/ld.mk; done mv $$subdir/ld-hw.mk $$subdir/ld.mk; done
sed -i "s/ld-hw/ld/" src/lib/ld/hw/target.mk
sed -i "s/hw_timer_drv/timer/" src/timer/hw/target.mk sed -i "s/hw_timer_drv/timer/" src/timer/hw/target.mk
# supplement BOARD definition that normally comes form the build dir # supplement BOARD definition that normally comes form the build dir
sed -i "s/\?= unknown/:= $(BOARD)/" src/core/hw/target.mk sed -i "s/\?= unknown/:= $(BOARD)/" src/core/hw/target.mk
@ -189,5 +188,4 @@ generalize_target_names: $(CONTENT)
sed -i "1aREQUIRES := $(ARCH)" src/core/hw/target.mk sed -i "1aREQUIRES := $(ARCH)" src/core/hw/target.mk
sed -i "1aREQUIRES := $(ARCH)" src/bootstrap/hw/target.mk sed -i "1aREQUIRES := $(ARCH)" src/bootstrap/hw/target.mk
sed -i "/REQUIRES/s/hw/hw $(ARCH)/" src/timer/hw/target.mk sed -i "/REQUIRES/s/hw/hw $(ARCH)/" src/timer/hw/target.mk
sed -i "1aREQUIRES := $(ARCH)" src/lib/ld/hw/target.mk

View File

@ -1,2 +0,0 @@
TARGET = ld-hw
LIBS = ld-hw

View File

@ -10,7 +10,6 @@ content:
mv lib/mk/spec/$$spec/ld-linux.mk lib/mk/spec/$$spec/ld.mk; done; mv lib/mk/spec/$$spec/ld-linux.mk lib/mk/spec/$$spec/ld.mk; done;
sed -i "/TARGET/s/core-linux/core/" src/core/linux/target.mk sed -i "/TARGET/s/core-linux/core/" src/core/linux/target.mk
sed -i "s/BOARD.*unknown/BOARD := linux/" lib/mk/core-linux.inc sed -i "s/BOARD.*unknown/BOARD := linux/" lib/mk/core-linux.inc
sed -i "s/ld-linux/ld/" src/lib/ld/linux/target.mk
sed -i "s/linux_timer_drv/timer/" src/timer/linux/target.mk sed -i "s/linux_timer_drv/timer/" src/timer/linux/target.mk
rm -rf src/initramfs rm -rf src/initramfs

View File

@ -1,4 +0,0 @@
TARGET = ld-linux.lib
LIBS = ld-linux
BUILD_ARTIFACTS := ld-linux.lib.so

View File

@ -15,8 +15,7 @@ src/kernel/nova: src/kernel
content: content:
for spec in x86_32 x86_64; do \ for spec in x86_32 x86_64; do \
mv lib/mk/spec/$$spec/ld-nova.mk lib/mk/spec/$$spec/ld.mk; \ mv lib/mk/spec/$$spec/ld-nova.mk lib/mk/spec/$$spec/ld.mk; \
done; done;
sed -i "s/ld-nova/ld/" src/lib/ld/nova/target.mk
sed -i "s/nova_timer_drv/timer/" src/timer/nova/target.mk sed -i "s/nova_timer_drv/timer/" src/timer/nova/target.mk

View File

@ -1,2 +0,0 @@
TARGET = ld-nova
LIBS = ld-nova

View File

@ -19,8 +19,7 @@ src/kernel/okl4: src/kernel
content: content:
for spec in x86_32; do \ for spec in x86_32; do \
mv lib/mk/spec/$$spec/ld-okl4.mk lib/mk/spec/$$spec/ld.mk; \ mv lib/mk/spec/$$spec/ld-okl4.mk lib/mk/spec/$$spec/ld.mk; \
done; done;
sed -i "s/ld-okl4/ld/" src/lib/ld/okl4/target.mk
sed -i "s/pit_timer_drv/timer/" src/timer/pit/target.inc sed -i "s/pit_timer_drv/timer/" src/timer/pit/target.inc

View File

@ -1,2 +0,0 @@
TARGET = ld-okl4
LIBS = ld-okl4

View File

@ -21,6 +21,5 @@ content:
for spec in x86_32; do \ for spec in x86_32; do \
mv lib/mk/spec/$$spec/ld-pistachio.mk lib/mk/spec/$$spec/ld.mk; \ mv lib/mk/spec/$$spec/ld-pistachio.mk lib/mk/spec/$$spec/ld.mk; \
done; done;
sed -i "s/ld-pistachio/ld/" src/lib/ld/pistachio/target.mk
sed -i "s/pit_timer_drv/timer/" src/timer/pit/target.inc sed -i "s/pit_timer_drv/timer/" src/timer/pit/target.inc

View File

@ -1,2 +0,0 @@
TARGET = ld-pistachio
LIBS = ld-pistachio

View File

@ -35,7 +35,6 @@ etc/board.conf:
content: content:
mv lib/mk/spec/arm/ld-sel4.mk lib/mk/spec/arm/ld.mk; mv lib/mk/spec/arm/ld-sel4.mk lib/mk/spec/arm/ld.mk;
sed -i "s/ld-sel4/ld/" src/lib/ld/sel4/target.mk
sed -i "s/imx6_timer_drv/timer/" src/timer/epit/imx6/target.inc sed -i "s/imx6_timer_drv/timer/" src/timer/epit/imx6/target.inc
find lib/mk/spec -name kernel-sel4-*.mk -o -name syscall-sel4-*.mk |\ find lib/mk/spec -name kernel-sel4-*.mk -o -name syscall-sel4-*.mk |\
grep -v "sel4-imx6q_sabrelite.mk" | xargs rm -rf grep -v "sel4-imx6q_sabrelite.mk" | xargs rm -rf

View File

@ -35,7 +35,6 @@ etc/board.conf:
content: content:
mv lib/mk/spec/arm/ld-sel4.mk lib/mk/spec/arm/ld.mk; mv lib/mk/spec/arm/ld-sel4.mk lib/mk/spec/arm/ld.mk;
sed -i "s/ld-sel4/ld/" src/lib/ld/sel4/target.mk
sed -i "s/imx7_timer_drv/timer/" src/timer/gpt/imx7/target.inc sed -i "s/imx7_timer_drv/timer/" src/timer/gpt/imx7/target.inc
find lib/mk/spec -name kernel-sel4-*.mk -o -name syscall-sel4-*.mk |\ find lib/mk/spec -name kernel-sel4-*.mk -o -name syscall-sel4-*.mk |\
grep -v "sel4-imx7d_sabre.mk" | xargs rm -rf grep -v "sel4-imx7d_sabre.mk" | xargs rm -rf

View File

@ -26,7 +26,6 @@ content:
for spec in x86_32 x86_64 arm; do \ for spec in x86_32 x86_64 arm; do \
mv lib/mk/spec/$$spec/ld-sel4.mk lib/mk/spec/$$spec/ld.mk; \ mv lib/mk/spec/$$spec/ld-sel4.mk lib/mk/spec/$$spec/ld.mk; \
done; done;
sed -i "s/ld-sel4/ld/" src/lib/ld/sel4/target.mk
sed -i "s/pit_timer_drv/timer/" src/timer/pit/target.inc sed -i "s/pit_timer_drv/timer/" src/timer/pit/target.inc
find lib/mk/spec -name kernel-sel4-*.mk -o -name syscall-sel4-*.mk |\ find lib/mk/spec -name kernel-sel4-*.mk -o -name syscall-sel4-*.mk |\
grep -v "sel4-pc.mk" | xargs rm -rf grep -v "sel4-pc.mk" | xargs rm -rf

View File

@ -1,2 +0,0 @@
TARGET = ld-sel4
LIBS = ld-sel4

View File

@ -30,8 +30,8 @@ append build_components { server/nic_router }
append build_components { server/dynamic_rom } append build_components { server/dynamic_rom }
append build_components { server/report_rom } append build_components { server/report_rom }
append build_components { drivers/wifi/pc } append build_components { drivers/wifi/pc }
append build_components { lib/vfs/wifi } append build_components { lib/vfs_wifi }
append build_components { lib/vfs/jitterentropy } append build_components { lib/vfs_jitterentropy }
append build_components { drivers/rtc } append build_components { drivers/rtc }
append build_components { drivers/nic } append build_components { drivers/nic }
append build_components { app/ping } append build_components { app/ping }

View File

@ -5,7 +5,7 @@ if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
set build_components { set build_components {
core init timer core init timer
lib/vfs/lxip lib/vfs_lxip
server/vfs server/vfs
server/dynamic_rom server/dynamic_rom
server/nic_router server/nic_router

View File

@ -1,6 +1,6 @@
proc append_socket_fs_build_components { } { proc append_socket_fs_build_components { } {
global build_components global build_components
append build_components { lib/vfs/lxip } append build_components { lib/vfs_lxip }
} }
proc socket_fs_plugin {} { return lxip } proc socket_fs_plugin {} { return lxip }

View File

@ -1,6 +0,0 @@
TARGET = dummy-vfs_lxip
LIBS = vfs_lxip
BUILD_ARTIFACTS :=
CC_CXX_WARN_STRICT =

View File

@ -5,8 +5,8 @@ set build_components {
core init timer core init timer
app/rom_logger app/rom_logger
app/rom_to_file app/rom_to_file
lib/vfs/rump lib/vfs_rump
lib/vfs/import lib/vfs_import
server/dynamic_rom server/dynamic_rom
server/fs_rom server/fs_rom
server/vfs_block server/vfs_block

View File

@ -1,7 +1,7 @@
set mkfs_cmd [installed_command mke2fs] set mkfs_cmd [installed_command mke2fs]
set mkfs_opts "-F" set mkfs_opts "-F"
set test_build_components "lib/vfs/rump" set test_build_components "lib/vfs_rump"
set test_vfs_config "<rump fs=\"ext2fs\" ram=\"7M\" writeable=\"yes\"/>" set test_vfs_config "<rump fs=\"ext2fs\" ram=\"7M\" writeable=\"yes\"/>"

View File

@ -6,7 +6,7 @@ if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
set mkfs_cmd [installed_command mke2fs] set mkfs_cmd [installed_command mke2fs]
set mkfs_opts "-F" set mkfs_opts "-F"
set test_build_components "lib/vfs/rump" set test_build_components "lib/vfs_rump"
set test_vfs_config "<rump fs=\"ext2fs\" ram=\"7M\" writeable=\"yes\"/>" set test_vfs_config "<rump fs=\"ext2fs\" ram=\"7M\" writeable=\"yes\"/>"

View File

@ -20,8 +20,8 @@ set build_components {
core init timer core init timer
server/vfs_block server/vfs_block
server/vfs server/vfs
lib/vfs/rump lib/vfs_rump
lib/vfs/import lib/vfs_import
test/libc_vfs test/libc_vfs
} }

View File

@ -15,8 +15,8 @@ set build_components {
core init timer core init timer
server/vfs_block server/vfs_block
server/vfs server/vfs
lib/vfs/rump lib/vfs_rump
lib/vfs/import lib/vfs_import
test/libc_vfs test/libc_vfs
} }

View File

@ -15,7 +15,7 @@ set build_components {
server/fs_rom server/fs_rom
server/vfs_block server/vfs_block
server/vfs server/vfs
lib/vfs/rump lib/vfs_rump
test/iso test/iso
} }

View File

@ -14,8 +14,8 @@ set build_components {
core init timer core init timer
test/vfs_stress test/vfs_stress
server/vfs_block server/vfs_block
lib/vfs/rump lib/vfs_rump
lib/vfs/import lib/vfs_import
} }
build $build_components build $build_components

View File

@ -15,8 +15,8 @@ set build_components {
test/vfs_stress test/vfs_stress
server/vfs server/vfs
server/vfs_block server/vfs_block
lib/vfs/rump lib/vfs_rump
lib/vfs/import lib/vfs_import
} }
build $build_components build $build_components

View File

@ -1,4 +0,0 @@
TARGET = rump_plugin
LIBS = vfs_rump
BUILD_ARTIFACTS :=

View File

@ -1,7 +0,0 @@
TARGET = test-libpng_static
SRC_CC = main.cc
INC_DIR = $(REP_DIR)/include/libpng \
$(REP_DIR)/include/mini_c \
$(REP_DIR)/include/libz
CC_OPT += -DPNG_USER_CONFIG
LIBS = base libpng_static libz_static mini_c

View File

@ -57,7 +57,7 @@ MIRROR_FROM_REP_DIR := \
CBE_DIR := $(call port_dir,$(REP_DIR)/ports/cbe) CBE_DIR := $(call port_dir,$(REP_DIR)/ports/cbe)
content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_CBE_DIR) LICENSE src/lib/cbe/target.mk content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_CBE_DIR) LICENSE
$(MIRROR_FROM_REP_DIR): $(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir) $(mirror_from_rep_dir)
@ -66,10 +66,5 @@ $(MIRROR_FROM_CBE_DIR):
mkdir -p $(dir $@) mkdir -p $(dir $@)
cp -r $(CBE_DIR)/$@ $(dir $@) cp -r $(CBE_DIR)/$@ $(dir $@)
src/lib/cbe/target.mk:
mkdir -p $(dir $@)
echo "REQUIRES += x86_64" > $@
echo "LIBS += $(BUILD_LIBS)" >> $@
LICENSE: LICENSE:
cp $(GENODE_DIR)/LICENSE $@ cp $(GENODE_DIR)/LICENSE $@

View File

@ -55,10 +55,10 @@ append build_components {
server/report_rom server/report_rom
server/lx_fs server/lx_fs
server/lx_block server/lx_block
lib/vfs/cbe_crypto/aes_cbc lib/vfs_cbe_crypto_aes_cbc
lib/vfs/cbe_trust_anchor lib/vfs_cbe_trust_anchor
lib/vfs/import lib/vfs_import
lib/vfs/jitterentropy lib/vfs_jitterentropy
} }
build $build_components build $build_components

View File

@ -93,7 +93,7 @@ install_config {
</config>} </config>}
build { server/vfs test/text_painter lib/vfs/ttf } build { server/vfs test/text_painter lib/vfs_ttf }
set fd [open [run_dir]/genode/focus w] set fd [open [run_dir]/genode/focus w]
puts $fd "<focus label=\"gui_fb -> \" domain=\"default\"/>" puts $fd "<focus label=\"gui_fb -> \" domain=\"default\"/>"

View File

@ -34,12 +34,12 @@ build {
timer timer
init init
server/lx_fs server/lx_fs
lib/vfs/cbe lib/vfs_cbe
lib/vfs/cbe_crypto/aes_cbc lib/vfs_cbe_crypto_aes_cbc
lib/vfs/cbe_crypto/memcopy lib/vfs_cbe_crypto_memcopy
lib/vfs/cbe_trust_anchor lib/vfs_cbe_trust_anchor
lib/vfs/import lib/vfs_import
lib/vfs/pipe lib/vfs_pipe
test/vfs_stress test/vfs_stress
test/libc test/libc
server/log_terminal server/log_terminal

View File

@ -33,7 +33,7 @@ append build_components {
app/cbe_init_trust_anchor app/cbe_init_trust_anchor
app/cbe_init app/cbe_init
lib/vfs/cbe_trust_anchor lib/vfs_cbe_trust_anchor
} }
build $build_components build $build_components

View File

@ -3,7 +3,7 @@ if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
exit 0 exit 0
} }
build { app/sequence server/vfs lib/vfs/import test/libc } build { app/sequence server/vfs lib/vfs_import test/libc }
create_boot_directory create_boot_directory

View File

@ -1,4 +0,0 @@
TARGET = cpu_sampler_platform-foc
LIBS = cpu_sampler_platform-foc
CC_CXX_WARN_STRICT =

View File

@ -1,4 +0,0 @@
TARGET = cpu_sampler_platform-generic
LIBS = cpu_sampler_platform-generic
CC_CXX_WARN_STRICT =

View File

@ -1,4 +0,0 @@
TARGET = cpu_sampler_platform-nova
LIBS = cpu_sampler_platform-nova
CC_CXX_WARN_STRICT =

View File

@ -1,4 +0,0 @@
TARGET = dummy-vfs_audit
LIBS = vfs_audit
BUILD_ARTIFACTS :=

View File

@ -1,5 +0,0 @@
TARGET := lib-vfs-cbe
REQUIRES = x86_64
LIBS = vfs_cbe
BUILD_ARTIFACTS :=

View File

@ -1,3 +0,0 @@
TARGET := lib-vfs-cbe_crypto-aes_cbc
REQUIRES = x86_64
LIBS = vfs_cbe_crypto_aes_cbc

View File

@ -1,3 +0,0 @@
TARGET := lib-vfs-cbe_crypto-memcopy
REQUIRES = x86_64
LIBS = vfs_cbe_crypto_memcopy

View File

@ -1,5 +0,0 @@
TARGET := lib-vfs-cbe_trust_anchor
REQUIRES = x86_64
LIBS = vfs_cbe_trust_anchor
BUILD_ARTIFACTS :=

View File

@ -1,3 +0,0 @@
LIBS = vfs_gpu
BUILD_ARTIFACTS :=

View File

@ -1,4 +0,0 @@
TARGET = dummy-vfs_import
LIBS = vfs_import
BUILD_ARTIFACTS :=

View File

@ -1,4 +0,0 @@
TARGET = dummy-vfs_pipe
LIBS = vfs_pipe base
BUILD_ARTIFACTS :=

View File

@ -1,3 +0,0 @@
LIBS = vfs_trace
BUILD_ARTIFACTS :=

View File

@ -1,4 +0,0 @@
TARGET = dummy-vfs_ttf
LIBS = vfs_ttf
BUILD_ARTIFACTS :=

View File

@ -22,7 +22,6 @@ src/gcov:
src/lib/gcov: src/lib/gcov:
$(mirror_from_rep_dir) $(mirror_from_rep_dir)
echo "LIBS = libgcov" > $@/target.mk
LICENSE: LICENSE:
cp $(PORT_DIR)/src/gcov/COPYING $@ cp $(PORT_DIR)/src/gcov/COPYING $@

View File

@ -8,11 +8,6 @@ content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR): $(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir) $(mirror_from_rep_dir)
content: src/lib/curl/target.mk
src/lib/curl/target.mk: src/lib/curl
echo "LIBS += curl" > $@
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/curl) PORT_DIR := $(call port_dir,$(REP_DIR)/ports/curl)
content: src/lib/curl content: src/lib/curl

View File

@ -1,14 +1,10 @@
MIRROR_FROM_REP_DIR := lib/mk/expat.mk MIRROR_FROM_REP_DIR := lib/mk/expat.mk
content: $(MIRROR_FROM_REP_DIR) src/lib/expat/target.mk content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR): $(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir) $(mirror_from_rep_dir)
src/lib/expat/target.mk:
mkdir -p $(dir $@)
echo "LIBS = expat" > $@
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/expat) PORT_DIR := $(call port_dir,$(REP_DIR)/ports/expat)
MIRROR_FROM_PORT_DIR := src/lib/expat/contrib \ MIRROR_FROM_PORT_DIR := src/lib/expat/contrib \

View File

@ -10,7 +10,6 @@ src/lib/ffi:
mkdir -p $@ mkdir -p $@
cp -r $(PORT_DIR)/src/lib/ffi/* $@ cp -r $(PORT_DIR)/src/lib/ffi/* $@
cp -r $(REP_DIR)/src/lib/ffi/* $@ cp -r $(REP_DIR)/src/lib/ffi/* $@
echo "LIBS = ffi" > $@/target.mk
$(MIRROR_FROM_REP_DIR): $(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir) $(mirror_from_rep_dir)

View File

@ -5,7 +5,6 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/freetype)
src/lib/freetype: src/lib/freetype:
mkdir -p $(dir $@) mkdir -p $(dir $@)
cp -r $(PORT_DIR)/src/lib/freetype $@ cp -r $(PORT_DIR)/src/lib/freetype $@
echo "LIBS = freetype" > $@/target.mk
include/freetype-genode: include/freetype-genode:
$(mirror_from_rep_dir) $(mirror_from_rep_dir)

View File

@ -59,7 +59,6 @@ src/lib/gmp:
mkdir -p $@ mkdir -p $@
cp -r $(PORT_SRC_DIR)/* $@ cp -r $(PORT_SRC_DIR)/* $@
cp -r $(REP_DIR)/src/lib/gmp/* $@ cp -r $(REP_DIR)/src/lib/gmp/* $@
echo "LIBS = gmp" > $@/target.mk
LICENSE: LICENSE:
cp $(PORT_SRC_DIR)/COPYING $@ cp $(PORT_SRC_DIR)/COPYING $@

View File

@ -5,7 +5,6 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/icu)
src/lib/icu: src/lib/icu:
mkdir -p $@ mkdir -p $@
cp -a $(PORT_DIR)/src/lib/icu/* $@/ cp -a $(PORT_DIR)/src/lib/icu/* $@/
echo "LIBS = icu" > $@/target.mk
lib/mk/icu.mk: lib/mk/icu.mk:
$(mirror_from_rep_dir) $(mirror_from_rep_dir)

View File

@ -5,7 +5,6 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/jbig2dec)
src/lib/jbig2dec: src/lib/jbig2dec:
mkdir -p $@ mkdir -p $@
cp -a $(PORT_DIR)/src/lib/jbig2dec/* $@/ cp -a $(PORT_DIR)/src/lib/jbig2dec/* $@/
echo "LIBS = jbig2dec" > $@/target.mk
lib/mk/%.mk: lib/mk/%.mk:
$(mirror_from_rep_dir) $(mirror_from_rep_dir)

View File

@ -5,7 +5,6 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/jpeg)
src/lib/jpeg: src/lib/jpeg:
mkdir -p $(dir $@) mkdir -p $(dir $@)
cp -r $(PORT_DIR)/src/lib/jpeg $@ cp -r $(PORT_DIR)/src/lib/jpeg $@
echo "LIBS = jpeg" > $@/target.mk
lib/mk/%.mk: lib/mk/%.mk:
$(mirror_from_rep_dir) $(mirror_from_rep_dir)

View File

@ -9,7 +9,6 @@ src/lib/libarchive:
mkdir -p $@ mkdir -p $@
cp -r $(PORT_DIR)/src/lib/libarchive/* $@ cp -r $(PORT_DIR)/src/lib/libarchive/* $@
cp $(REP_DIR)/src/lib/libarchive/* $@ cp $(REP_DIR)/src/lib/libarchive/* $@
echo "LIBS = libarchive" > $@/target.mk
lib/mk/libarchive.mk: lib/mk/libarchive.mk:
$(mirror_from_rep_dir) $(mirror_from_rep_dir)

View File

@ -1,4 +1,4 @@
content: include/libc-plugin src/lib/libc/target.mk lib/mk LICENSE content: include/libc-plugin src/lib/libc lib/mk LICENSE
LIBC_PORT_DIR := $(call port_dir,$(REP_DIR)/ports/libc) LIBC_PORT_DIR := $(call port_dir,$(REP_DIR)/ports/libc)
LIBM_PORT_DIR := $(LIBC_PORT_DIR) LIBM_PORT_DIR := $(LIBC_PORT_DIR)
@ -8,10 +8,6 @@ src/lib/libc:
cp -r $(LIBC_PORT_DIR)/src/lib/libc/* $@ cp -r $(LIBC_PORT_DIR)/src/lib/libc/* $@
cp -r $(REP_DIR)/src/lib/libc/* $@ cp -r $(REP_DIR)/src/lib/libc/* $@
# target.mk for triggering the build of both libraries libc and libm
src/lib/libc/target.mk: src/lib/libc
echo "LIBS += libc libm" > $@
include/libc-plugin include/libc/sys/ucontext.h: include/libc-plugin include/libc/sys/ucontext.h:
$(mirror_from_rep_dir) $(mirror_from_rep_dir)

View File

@ -11,15 +11,11 @@ MIRROR_FROM_REP_DIR := lib/mk/libdrm.mk \
src/lib/libdrm/ioctl_dispatch.cc \ src/lib/libdrm/ioctl_dispatch.cc \
src/lib/libdrm/ioctl_lima.cc src/lib/libdrm/ioctl_lima.cc
content: $(MIRROR_FROM_REP_DIR) src/lib/libdrm/target.mk content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR): $(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir) $(mirror_from_rep_dir)
src/lib/libdrm/target.mk:
mkdir -p $(dir $@)
echo "LIBS = libdrm" > $@
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/libdrm) PORT_DIR := $(call port_dir,$(REP_DIR)/ports/libdrm)
MIRROR_FROM_PORT_DIR := $(addprefix src/lib/libdrm/,\ MIRROR_FROM_PORT_DIR := $(addprefix src/lib/libdrm/,\

View File

@ -17,7 +17,6 @@ src/lib/libiconv:
mkdir -p $@ mkdir -p $@
cp -r $(PORT_DIR)/src/lib/libiconv/* $@ cp -r $(PORT_DIR)/src/lib/libiconv/* $@
cp -r $(REP_DIR)/src/lib/libiconv/private $@ cp -r $(REP_DIR)/src/lib/libiconv/private $@
echo "LIBS = libiconv" > $@/target.mk
content: LICENSE content: LICENSE

View File

@ -8,7 +8,6 @@ include:
src/lib/liblzma: src/lib/liblzma:
mkdir -p $@ mkdir -p $@
cp $(REP_DIR)/src/lib/liblzma/config.h $@ cp $(REP_DIR)/src/lib/liblzma/config.h $@
echo "LIBS = liblzma" > $@/target.mk
src/xz: src/xz:
mkdir -p $@ mkdir -p $@

View File

@ -5,7 +5,6 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/libpng)
src/lib/libpng: src/lib/libpng:
$(mirror_from_rep_dir) $(mirror_from_rep_dir)
cp -r $(PORT_DIR)/src/lib/libpng/* $@ cp -r $(PORT_DIR)/src/lib/libpng/* $@
echo "LIBS = libpng" > $@/target.mk
lib/mk/libpng.mk lib/mk/libpng.inc lib/mk/spec/arm_v8/libpng.mk: lib/mk/libpng.mk lib/mk/libpng.inc lib/mk/spec/arm_v8/libpng.mk:
$(mirror_from_rep_dir) $(mirror_from_rep_dir)

View File

@ -1,14 +1,10 @@
MIRROR_FROM_REP_DIR := lib/mk/libqgenodeviewwidget.mk \ MIRROR_FROM_REP_DIR := lib/mk/libqgenodeviewwidget.mk \
src/lib/qgenodeviewwidget src/lib/qgenodeviewwidget
content: $(MIRROR_FROM_REP_DIR) LICENSE src/lib/qgenodeviewwidget/target.mk content: $(MIRROR_FROM_REP_DIR) LICENSE
$(MIRROR_FROM_REP_DIR): $(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir) $(mirror_from_rep_dir)
src/lib/qgenodeviewwidget/target.mk:
mkdir -p $(dir $@)
echo "LIBS = libqgenodeviewwidget" > $@
LICENSE: LICENSE:
cp $(GENODE_DIR)/LICENSE $@ cp $(GENODE_DIR)/LICENSE $@

View File

@ -1,14 +1,10 @@
MIRROR_FROM_REP_DIR := lib/mk/libqpluginwidget.mk \ MIRROR_FROM_REP_DIR := lib/mk/libqpluginwidget.mk \
src/lib/qpluginwidget src/lib/qpluginwidget
content: $(MIRROR_FROM_REP_DIR) LICENSE src/lib/qpluginwidget/target.mk content: $(MIRROR_FROM_REP_DIR) LICENSE
$(MIRROR_FROM_REP_DIR): $(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir) $(mirror_from_rep_dir)
src/lib/qpluginwidget/target.mk:
mkdir -p $(dir $@)
echo "LIBS = libqpluginwidget" > $@
LICENSE: LICENSE:
cp $(GENODE_DIR)/LICENSE $@ cp $(GENODE_DIR)/LICENSE $@

View File

@ -79,9 +79,3 @@ content: LICENSE
LICENSE: LICENSE:
echo "BSD-3-Clause-Attribution, see libsparkcrypto/README.rst" > $@ echo "BSD-3-Clause-Attribution, see libsparkcrypto/README.rst" > $@
content: src/lib/libsparkcrypto/target.mk
src/lib/libsparkcrypto/target.mk:
mkdir -p $(dir $@)
echo "LIBS = libsparkcrypto" > $@

View File

@ -1,4 +1,4 @@
content: src/lib/libssh/target.mk lib/mk LICENSE content: src/lib/libssh lib/mk LICENSE
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/libssh) PORT_DIR := $(call port_dir,$(REP_DIR)/ports/libssh)
@ -7,9 +7,6 @@ src/lib/libssh:
cp -r $(PORT_DIR)/src/lib/libssh/* $@ cp -r $(PORT_DIR)/src/lib/libssh/* $@
cp -r $(REP_DIR)/src/lib/libssh/config.h $@ cp -r $(REP_DIR)/src/lib/libssh/config.h $@
src/lib/libssh/target.mk: src/lib/libssh
echo "LIBS += libssh" > $@
lib/mk: lib/mk:
mkdir -p $@ mkdir -p $@
cp $(REP_DIR)/lib/mk/libssh.mk $@ cp $(REP_DIR)/lib/mk/libssh.mk $@

View File

@ -10,7 +10,6 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/libusb)
src/lib/libusb: src/lib/libusb:
mkdir -p $(dir $@) mkdir -p $(dir $@)
cp -r $(PORT_DIR)/src/lib/libusb $@ cp -r $(PORT_DIR)/src/lib/libusb $@
echo "LIBS = libusb" > $@/target.mk
$(mirror_from_rep_dir) $(mirror_from_rep_dir)
$(MIRROR_FROM_REP_DIR): $(MIRROR_FROM_REP_DIR):

View File

@ -8,7 +8,6 @@ src/lib/libuvc:
mkdir -p $(dir $@) mkdir -p $(dir $@)
cp -r $(PORT_DIR)/src/lib/libuvc $@ cp -r $(PORT_DIR)/src/lib/libuvc $@
rm -rf $@/.git rm -rf $@/.git
echo "LIBS = libuvc" > $@/target.mk
include: include:
mkdir -p $@ mkdir -p $@

View File

@ -11,13 +11,11 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/libyuv)
src/lib/libyuv: src/lib/libyuv:
mkdir -p $@ mkdir -p $@
cp -r $(PORT_DIR)/src/lib/libyuv/source $@ cp -r $(PORT_DIR)/src/lib/libyuv/source $@
echo "LIBS = libyuv" > $@/target.mk
include: include:
mkdir -p $@ mkdir -p $@
cp -a $(PORT_DIR)/include/* $@ cp -a $(PORT_DIR)/include/* $@
$(MIRROR_FROM_REP_DIR): $(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir) $(mirror_from_rep_dir)

View File

@ -31,15 +31,11 @@ MIRROR_FROM_REP_DIR := \
lib/mk/spec/x86_64/mesa.mk \ lib/mk/spec/x86_64/mesa.mk \
src/lib/mesa src/lib/mesa
content: $(MIRROR_FROM_REP_DIR) src/lib/mesa/target.mk content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR): $(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir) $(mirror_from_rep_dir)
src/lib/mesa/target.mk:
mkdir -p $(dir $@)
echo "LIBS = mesa" > $@
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/mesa) PORT_DIR := $(call port_dir,$(REP_DIR)/ports/mesa)
MIRROR_FROM_PORT_DIR := src/lib/mesa/src generated MIRROR_FROM_PORT_DIR := src/lib/mesa/src generated

View File

@ -5,7 +5,6 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/mupdf)
src/lib/mupdf: src/lib/mupdf:
mkdir -p $(dir $@) mkdir -p $(dir $@)
cp -r $(PORT_DIR)/src/lib/mupdf $@ cp -r $(PORT_DIR)/src/lib/mupdf $@
echo "LIBS = mupdf" > $@/target.mk
lib/mk/%.mk: lib/mk/%.mk:
$(mirror_from_rep_dir) $(mirror_from_rep_dir)

View File

@ -5,7 +5,6 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/ncurses)
src/lib/ncurses: src/lib/ncurses:
mkdir -p $@ mkdir -p $@
cp -r $(PORT_DIR)/src/lib/ncurses/* $@ cp -r $(PORT_DIR)/src/lib/ncurses/* $@
echo "LIBS = ncurses" > $@/target.mk
lib/mk/ncurses.mk: lib/mk/ncurses.mk:
$(mirror_from_rep_dir) $(mirror_from_rep_dir)

View File

@ -5,7 +5,6 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/openjpeg)
src/lib/openjpeg: src/lib/openjpeg:
mkdir -p $(dir $@) mkdir -p $(dir $@)
cp -r $(PORT_DIR)/src/lib/openjpeg $@ cp -r $(PORT_DIR)/src/lib/openjpeg $@
echo "LIBS = openjpeg" > $@/target.mk
lib/mk/%.mk: lib/mk/%.mk:
$(mirror_from_rep_dir) $(mirror_from_rep_dir)

View File

@ -11,12 +11,6 @@ content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR): $(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir) $(mirror_from_rep_dir)
content: src/lib/openssl/target.mk
src/lib/openssl/target.mk: src/lib/openssl
mkdir -p $(dir $@)
echo "LIBS += libcrypto libssl" > $@
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/openssl) PORT_DIR := $(call port_dir,$(REP_DIR)/ports/openssl)
content: src/lib/openssl content: src/lib/openssl

View File

@ -6,7 +6,6 @@ src/lib/pcre:
mkdir -p $@ mkdir -p $@
cp -a $(PORT_DIR)/src/lib/pcre/* $@ cp -a $(PORT_DIR)/src/lib/pcre/* $@
cp -a $(REP_DIR)/src/lib/pcre/* $@ cp -a $(REP_DIR)/src/lib/pcre/* $@
echo "LIBS = pcre" > $@/target.mk
lib/mk/pcre.mk: lib/mk/pcre.mk:
$(mirror_from_rep_dir) $(mirror_from_rep_dir)

View File

@ -6,7 +6,6 @@ src/lib/pcre:
mkdir -p $@ mkdir -p $@
cp -a $(PORT_DIR)/src/lib/pcre/* $@ cp -a $(PORT_DIR)/src/lib/pcre/* $@
cp -a $(REP_DIR)/src/lib/pcre/* $@ cp -a $(REP_DIR)/src/lib/pcre/* $@
echo "LIBS = pcre16" > $@/target.mk
lib/mk/pcre16.mk: lib/mk/pcre16.mk:
$(mirror_from_rep_dir) $(mirror_from_rep_dir)

View File

@ -43,18 +43,6 @@ content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR): $(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir) $(mirror_from_rep_dir)
content: src/lib/pcsc-lite/target.mk
src/lib/pcsc-lite/target.mk:
mkdir -p $(dir $@)
echo "LIBS = pcsc-lite" > $@
content: src/lib/ccid/target.mk
src/lib/ccid/target.mk:
mkdir -p $(dir $@)
echo "LIBS = ccid" > $@
content: LICENSE content: LICENSE
LICENSE: LICENSE:

View File

@ -1,14 +1,10 @@
MIRROR_FROM_REP_DIR := lib/mk/posix.mk src/lib/posix MIRROR_FROM_REP_DIR := lib/mk/posix.mk src/lib/posix
content: $(MIRROR_FROM_REP_DIR) LICENSE src/lib/posix/target.mk content: $(MIRROR_FROM_REP_DIR) LICENSE
$(MIRROR_FROM_REP_DIR): $(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir) $(mirror_from_rep_dir)
src/lib/posix/target.mk:
mkdir -p $(dir $@)
echo "LIBS = posix" > $@
LICENSE: LICENSE:
cp $(GENODE_DIR)/LICENSE $@ cp $(GENODE_DIR)/LICENSE $@

View File

@ -1,14 +1,10 @@
MIRROR_FROM_REP_DIR := lib/mk/qt5_base.mk MIRROR_FROM_REP_DIR := lib/mk/qt5_base.mk
content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_base/target.mk content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR): $(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir) $(mirror_from_rep_dir)
src/lib/qt5_base/target.mk:
mkdir -p $(dir $@)
echo "LIBS = qt5_base" > $@
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
MIRROR_FROM_PORT_DIR := src/lib/qt5/qtbase MIRROR_FROM_PORT_DIR := src/lib/qt5/qtbase

View File

@ -1,15 +1,10 @@
MIRROR_FROM_REP_DIR := lib/mk/qt5_component.mk \ MIRROR_FROM_REP_DIR := lib/mk/qt5_component.mk \
src/lib/qt5_component/qt_component.cc src/lib/qt5_component/qt_component.cc
content: $(MIRROR_FROM_REP_DIR) LICENSE src/lib/qt5_component/target.mk content: $(MIRROR_FROM_REP_DIR) LICENSE
$(MIRROR_FROM_REP_DIR): $(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir) $(mirror_from_rep_dir)
src/lib/qt5_component/target.mk:
mkdir -p $(dir $@)
echo "LIBS = qt5_component" > $@
LICENSE: LICENSE:
cp $(GENODE_DIR)/LICENSE $@ cp $(GENODE_DIR)/LICENSE $@

View File

@ -1,14 +1,10 @@
MIRROR_FROM_REP_DIR := lib/mk/qt5_declarative.mk MIRROR_FROM_REP_DIR := lib/mk/qt5_declarative.mk
content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_declarative/target.mk content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR): $(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir) $(mirror_from_rep_dir)
src/lib/qt5_declarative/target.mk:
mkdir -p $(dir $@)
echo "LIBS = qt5_declarative" > $@
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
MIRROR_FROM_PORT_DIR := src/lib/qt5/qtdeclarative MIRROR_FROM_PORT_DIR := src/lib/qt5/qtdeclarative

View File

@ -1,14 +1,10 @@
MIRROR_FROM_REP_DIR := lib/mk/qt5_graphicaleffects.mk MIRROR_FROM_REP_DIR := lib/mk/qt5_graphicaleffects.mk
content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_graphicaleffects/target.mk content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR): $(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir) $(mirror_from_rep_dir)
src/lib/qt5_graphicaleffects/target.mk:
mkdir -p $(dir $@)
echo "LIBS = qt5_graphicaleffects" > $@
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
MIRROR_FROM_PORT_DIR := src/lib/qt5/qtgraphicaleffects MIRROR_FROM_PORT_DIR := src/lib/qt5/qtgraphicaleffects

View File

@ -1,14 +1,10 @@
MIRROR_FROM_REP_DIR := lib/mk/qt5_quickcontrols.mk MIRROR_FROM_REP_DIR := lib/mk/qt5_quickcontrols.mk
content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_quickcontrols/target.mk content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR): $(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir) $(mirror_from_rep_dir)
src/lib/qt5_quickcontrols/target.mk:
mkdir -p $(dir $@)
echo "LIBS = qt5_quickcontrols" > $@
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
MIRROR_FROM_PORT_DIR := src/lib/qt5/qtquickcontrols MIRROR_FROM_PORT_DIR := src/lib/qt5/qtquickcontrols

View File

@ -1,14 +1,10 @@
MIRROR_FROM_REP_DIR := lib/mk/qt5_quickcontrols2.mk MIRROR_FROM_REP_DIR := lib/mk/qt5_quickcontrols2.mk
content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_quickcontrols2/target.mk content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR): $(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir) $(mirror_from_rep_dir)
src/lib/qt5_quickcontrols2/target.mk:
mkdir -p $(dir $@)
echo "LIBS = qt5_quickcontrols2" > $@
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
MIRROR_FROM_PORT_DIR := src/lib/qt5/qtquickcontrols2 MIRROR_FROM_PORT_DIR := src/lib/qt5/qtquickcontrols2

View File

@ -1,14 +1,10 @@
MIRROR_FROM_REP_DIR := lib/mk/qt5_svg.mk MIRROR_FROM_REP_DIR := lib/mk/qt5_svg.mk
content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_svg/target.mk content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR): $(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir) $(mirror_from_rep_dir)
src/lib/qt5_svg/target.mk:
mkdir -p $(dir $@)
echo "LIBS = qt5_svg" > $@
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
MIRROR_FROM_PORT_DIR := src/lib/qt5/qtsvg MIRROR_FROM_PORT_DIR := src/lib/qt5/qtsvg

View File

@ -1,14 +1,10 @@
MIRROR_FROM_REP_DIR := lib/mk/qt5_virtualkeyboard.mk MIRROR_FROM_REP_DIR := lib/mk/qt5_virtualkeyboard.mk
content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_virtualkeyboard/target.mk content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR): $(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir) $(mirror_from_rep_dir)
src/lib/qt5_virtualkeyboard/target.mk:
mkdir -p $(dir $@)
echo "LIBS = qt5_virtualkeyboard" > $@
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
MIRROR_FROM_PORT_DIR := src/lib/qt5/qtvirtualkeyboard MIRROR_FROM_PORT_DIR := src/lib/qt5/qtvirtualkeyboard

View File

@ -13,7 +13,6 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/sanitizer)
src/lib/sanitizer: src/lib/sanitizer:
mkdir -p $@ mkdir -p $@
cp -r $(PORT_DIR)/src/lib/sanitizer/* $@ cp -r $(PORT_DIR)/src/lib/sanitizer/* $@
echo "LIBS = libsanitizer_common libubsan" > $@/target.mk
content: LICENSE content: LICENSE

View File

@ -71,9 +71,3 @@ content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR): $(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir) $(mirror_from_rep_dir)
content: src/lib/spark/target.mk
src/lib/spark/target.mk:
mkdir -p $(dir $@)
echo "LIBS = spark" > $@

View File

@ -4,14 +4,11 @@ MIRROR_FROM_REP_DIR := lib/mk/stdcxx-c++98.mk \
MIRROR_FROM_PORT_DIR := src/lib/stdcxx MIRROR_FROM_PORT_DIR := src/lib/stdcxx
content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_PORT_DIR) src/lib/stdcxx/target.mk content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_PORT_DIR)
$(MIRROR_FROM_REP_DIR): $(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir) $(mirror_from_rep_dir)
src/lib/stdcxx/target.mk: $(MIRROR_FROM_PORT_DIR)
echo "LIBS = stdcxx" > $@
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/stdcxx) PORT_DIR := $(call port_dir,$(REP_DIR)/ports/stdcxx)
$(MIRROR_FROM_PORT_DIR): $(MIRROR_FROM_PORT_DIR):

View File

@ -5,7 +5,6 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/zlib)
src/lib/zlib: src/lib/zlib:
mkdir -p $@ mkdir -p $@
cp -r $(PORT_DIR)/src/lib/zlib/* $@ cp -r $(PORT_DIR)/src/lib/zlib/* $@
echo "LIBS = zlib" > $@/target.mk
lib/mk/zlib.mk: lib/mk/zlib.mk:
$(mirror_from_rep_dir) $(mirror_from_rep_dir)

View File

@ -5,8 +5,8 @@ set build_components {
core init timer core init timer
app/rom_logger app/rom_logger
app/rom_to_file app/rom_to_file
lib/vfs/fatfs lib/vfs_fatfs
lib/vfs/import lib/vfs_import
server/dynamic_rom server/dynamic_rom
server/fs_rom server/fs_rom
server/vfs_block server/vfs_block

View File

@ -8,7 +8,7 @@ create_boot_directory
build { build {
core init timer core init timer
server/vfs_block server/vfs_block
lib/vfs/import lib/vfs_import
test/libc_block test/libc_block
} }

View File

@ -1,7 +1,7 @@
set build_components { set build_components {
core init timer server/terminal_crosslink core init timer server/terminal_crosslink
test/libc_select test/libc_counter test/libc_select test/libc_counter
lib/vfs/pipe lib/vfs_pipe
} }
build $build_components build $build_components

View File

@ -1,7 +1,7 @@
set mkfs_cmd [installed_command mkfs.vfat] set mkfs_cmd [installed_command mkfs.vfat]
set mkfs_opts "-F32 -nlibc_vfs" set mkfs_opts "-F32 -nlibc_vfs"
set test_build_components lib/vfs/fatfs set test_build_components lib/vfs_fatfs
set test_vfs_config "<fatfs/>" set test_vfs_config "<fatfs/>"
set test_boot_modules vfs_fatfs.lib.so set test_boot_modules vfs_fatfs.lib.so

View File

@ -6,7 +6,7 @@ if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
set mkfs_cmd [installed_command mkfs.vfat] set mkfs_cmd [installed_command mkfs.vfat]
set mkfs_opts "-F32 -nlibc_vfs" set mkfs_opts "-F32 -nlibc_vfs"
set test_build_components lib/vfs/fatfs set test_build_components lib/vfs_fatfs
set test_vfs_config "<fatfs/>" set test_vfs_config "<fatfs/>"
set test_boot_modules vfs_fatfs.lib.so set test_boot_modules vfs_fatfs.lib.so

View File

@ -1,7 +1,7 @@
set build_components { set build_components {
core init timer server/terminal_crosslink server/vfs core init timer server/terminal_crosslink server/vfs
test/libc_select test/libc_counter test/libc_select test/libc_counter
lib/vfs/pipe lib/vfs_pipe
} }
build $build_components build $build_components

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