From 520742cf3e0cb53bf49661981ccd64ec53173560 Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Mon, 23 May 2022 13:10:21 +0200 Subject: [PATCH] wireguard: generic target.mk Introduce an arch-specific wireguard lib that contains all code from the former arch-specific target.mk files. This allows us to create a generic target.mk that merely depends on the library and a dummy.cc file. The latter ensures that building/linking of the target isn't skipped by the build system. Ref #4519 --- .../dde_linux/lib/mk/spec/arm_64/wireguard.mk | 3 +++ .../dde_linux/lib/mk/spec/x86_64/wireguard.mk | 3 +++ repos/dde_linux/lib/mk/wireguard.inc | 22 +++++++++++++++++++ .../lib/mk/wireguard_lx_inc_dirs.inc | 6 ++--- repos/dde_linux/src/app/wireguard/dummy.cc | 0 .../src/app/wireguard/spec/arm_64/target.mk | 5 ----- .../src/app/wireguard/spec/x86_64/target.mk | 5 ----- repos/dde_linux/src/app/wireguard/target.inc | 22 ------------------- repos/dde_linux/src/app/wireguard/target.mk | 5 +++++ 9 files changed, 36 insertions(+), 35 deletions(-) create mode 100644 repos/dde_linux/lib/mk/spec/arm_64/wireguard.mk create mode 100644 repos/dde_linux/lib/mk/spec/x86_64/wireguard.mk create mode 100644 repos/dde_linux/lib/mk/wireguard.inc create mode 100644 repos/dde_linux/src/app/wireguard/dummy.cc delete mode 100644 repos/dde_linux/src/app/wireguard/spec/arm_64/target.mk delete mode 100644 repos/dde_linux/src/app/wireguard/spec/x86_64/target.mk delete mode 100644 repos/dde_linux/src/app/wireguard/target.inc create mode 100644 repos/dde_linux/src/app/wireguard/target.mk diff --git a/repos/dde_linux/lib/mk/spec/arm_64/wireguard.mk b/repos/dde_linux/lib/mk/spec/arm_64/wireguard.mk new file mode 100644 index 0000000000..d9210bb994 --- /dev/null +++ b/repos/dde_linux/lib/mk/spec/arm_64/wireguard.mk @@ -0,0 +1,3 @@ +INC_DIR += $(REP_DIR)/src/include/spec/arm_64 + +include $(REP_DIR)/lib/mk/wireguard.inc diff --git a/repos/dde_linux/lib/mk/spec/x86_64/wireguard.mk b/repos/dde_linux/lib/mk/spec/x86_64/wireguard.mk new file mode 100644 index 0000000000..dc08e92cca --- /dev/null +++ b/repos/dde_linux/lib/mk/spec/x86_64/wireguard.mk @@ -0,0 +1,3 @@ +INC_DIR += $(REP_DIR)/src/include/spec/x86_64 + +include $(REP_DIR)/lib/mk/wireguard.inc diff --git a/repos/dde_linux/lib/mk/wireguard.inc b/repos/dde_linux/lib/mk/wireguard.inc new file mode 100644 index 0000000000..179d45759c --- /dev/null +++ b/repos/dde_linux/lib/mk/wireguard.inc @@ -0,0 +1,22 @@ +LIBS += base net jitterentropy wireguard_lx_inc_dirs + +INC_DIR += $(REP_DIR)/src/app/wireguard +INC_DIR += $(REP_DIR)/src/include + +SRC_CC += arp_cache.cc +SRC_CC += arp_waiter.cc +SRC_CC += base64.cc +SRC_CC += config_model.cc +SRC_CC += dhcp_client.cc +SRC_CC += ipv4_address_prefix.cc +SRC_CC += ipv4_config.cc +SRC_CC += irq.cc +SRC_CC += main.cc +SRC_CC += nic_connection.cc +SRC_CC += lx_emul/random.cc +SRC_CC += uplink_connection.cc + +vpath %.cc $(REP_DIR)/src/app/wireguard +vpath %.cc $(REP_DIR)/src/lib + +CC_CXX_WARN_STRICT_CONVERSION = diff --git a/repos/dde_linux/lib/mk/wireguard_lx_inc_dirs.inc b/repos/dde_linux/lib/mk/wireguard_lx_inc_dirs.inc index be0821dfc1..38944ef7fa 100644 --- a/repos/dde_linux/lib/mk/wireguard_lx_inc_dirs.inc +++ b/repos/dde_linux/lib/mk/wireguard_lx_inc_dirs.inc @@ -1,12 +1,12 @@ # # This library is for avoiding clashes between Linux and Genode includes. # If we were to compile all the *.c files of this library directly with the -# WireGuard target there would be only one INC_DIR applied to *.cc files as -# well as to *.c files. Some Genode headers, however (e.g. 'net/udp.h' or +# WireGuard library, there would be only one INC_DIR applied to *.cc files as +# well as to *.c files. Some Genode headers, however, (e.g. 'net/udp.h' or # 'net/dhcp.h') exist with the same include identifier in both Linux and # Genode, and we would have the problem that we want the Linux variant in *.c # files and the Genode variant in *.cc files. Therefore, we create two -# dedicated INC_DIR settings (that of the library and that of the target). +# dedicated INC_DIR settings through separate libraries. # GEN_PRG_DIR := $(PRG_DIR)/../.. diff --git a/repos/dde_linux/src/app/wireguard/dummy.cc b/repos/dde_linux/src/app/wireguard/dummy.cc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/repos/dde_linux/src/app/wireguard/spec/arm_64/target.mk b/repos/dde_linux/src/app/wireguard/spec/arm_64/target.mk deleted file mode 100644 index b14582fb21..0000000000 --- a/repos/dde_linux/src/app/wireguard/spec/arm_64/target.mk +++ /dev/null @@ -1,5 +0,0 @@ -REQUIRES = arm_64 - -INC_DIR += $(REP_DIR)/src/include/spec/arm_64 - -include $(PRG_DIR)/../../target.inc diff --git a/repos/dde_linux/src/app/wireguard/spec/x86_64/target.mk b/repos/dde_linux/src/app/wireguard/spec/x86_64/target.mk deleted file mode 100644 index cb62c6eeb2..0000000000 --- a/repos/dde_linux/src/app/wireguard/spec/x86_64/target.mk +++ /dev/null @@ -1,5 +0,0 @@ -REQUIRES = x86_64 - -INC_DIR += $(REP_DIR)/src/include/spec/x86_64 - -include $(PRG_DIR)/../../target.inc diff --git a/repos/dde_linux/src/app/wireguard/target.inc b/repos/dde_linux/src/app/wireguard/target.inc deleted file mode 100644 index 58b25190d4..0000000000 --- a/repos/dde_linux/src/app/wireguard/target.inc +++ /dev/null @@ -1,22 +0,0 @@ -TARGET = wireguard -LIBS += base net jitterentropy wireguard_lx_inc_dirs -GEN_DIR := $(PRG_DIR)/../.. -INC_DIR += $(GEN_DIR) -INC_DIR += $(REP_DIR)/src/include -SRC_CC += arp_cache.cc -SRC_CC += arp_waiter.cc -SRC_CC += base64.cc -SRC_CC += config_model.cc -SRC_CC += dhcp_client.cc -SRC_CC += ipv4_address_prefix.cc -SRC_CC += ipv4_config.cc -SRC_CC += irq.cc -SRC_CC += main.cc -SRC_CC += nic_connection.cc -SRC_CC += lx_emul/random.cc -SRC_CC += uplink_connection.cc - -vpath %.cc $(GEN_DIR) -vpath %.cc $(REP_DIR)/src/lib - -CC_CXX_WARN_STRICT_CONVERSION = diff --git a/repos/dde_linux/src/app/wireguard/target.mk b/repos/dde_linux/src/app/wireguard/target.mk new file mode 100644 index 0000000000..55b0d4d888 --- /dev/null +++ b/repos/dde_linux/src/app/wireguard/target.mk @@ -0,0 +1,5 @@ +TARGET = wireguard + +SRC_CC += dummy.cc + +LIBS += wireguard