From e28bd51caba415102c972184d493ddec49aa9307 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Thu, 19 Oct 2023 18:24:57 +0200 Subject: [PATCH] treewide: update packages to use new toolchain define Update packages to use new toolchain define and drop usage of TOOLCHAIN_DIR. Signed-off-by: Christian Marangi --- devel/gcc/Makefile | 18 +++++++++--------- lang/perl/Makefile | 2 +- lang/rust/Makefile | 2 +- net/net-snmp/Makefile | 2 -- utils/gpsd/Makefile | 2 +- utils/gummiboot/Makefile | 4 ++-- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/devel/gcc/Makefile b/devel/gcc/Makefile index cf2178f2ff..26e44f49c9 100644 --- a/devel/gcc/Makefile +++ b/devel/gcc/Makefile @@ -73,15 +73,15 @@ define Package/gcc/config endef ifeq ($(CONFIG_INCLUDE_STATIC_LIBC),y) - COPY_STATIC_LIBC=cp -a $(TOOLCHAIN_DIR)/lib/libc.a $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) + COPY_STATIC_LIBC=cp -a $(TOOLCHAIN_ROOT_DIR)/lib/libc.a $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) endif ifeq ($(CONFIG_INCLUDE_STATIC_LIBPTHREAD),y) - COPY_STATIC_LIBPTHREAD=cp -a $(TOOLCHAIN_DIR)/lib/libpthread.a $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) + COPY_STATIC_LIBPTHREAD=cp -a $(TOOLCHAIN_ROOT_DIR)/lib/libpthread.a $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) endif ifeq ($(CONFIG_INCLUDE_STATIC_LIBSTDC),y) - COPY_STATIC_LIBSTDC=cp -a $(TOOLCHAIN_DIR)/lib/libstdc++.a $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) + COPY_STATIC_LIBSTDC=cp -a $(TOOLCHAIN_ROOT_DIR)/lib/libstdc++.a $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) endif ifeq ($(CONFIG_INCLUDE_STATIC_LINK_SPEC),y) @@ -95,9 +95,9 @@ PKGVERSION=OpenWrt GCC $(PKG_VERSION) TARGET_CPPFLAGS += -D_GLIBCXX_INCLUDE_NEXT_C_HEADERS # not using sstrip here as this messes up the .so's somehow -STRIP:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)strip +STRIP:=$(firstword $(TOOLCHAIN_BIN_DIRS))/$(TARGET_CROSS)strip RSTRIP:= \ - NM="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)nm" \ + NM="$(firstword $(TOOLCHAIN_BIN_DIRS))/$(TARGET_CROSS)nm" \ STRIP="$(STRIP)" \ STRIP_KMOD="$(STRIP) --strip-debug" \ $(SCRIPT_DIR)/rstrip.sh @@ -224,10 +224,10 @@ define Package/gcc/install ln -s $(REAL_GNU_TARGET_NAME)-gcc $(1)/usr/bin/cc ln -s $(REAL_GNU_TARGET_NAME)-gcc $(1)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc-$(PKG_VERSION) cp -ar $(PKG_INSTALL_DIR)/usr/lib/gcc $(1)/usr/lib - cp -ar $(TOOLCHAIN_DIR)/include $(1)/usr - cp -a $(TOOLCHAIN_DIR)/lib/*.{o,so*} $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) - cp -a $(TOOLCHAIN_DIR)/lib/*nonshared*.a $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) - cp -a $(TOOLCHAIN_DIR)/lib/libm.a $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) + cp -ar $(TOOLCHAIN_ROOT_DIR)/include $(1)/usr + cp -a $(TOOLCHAIN_ROOT_DIR)/lib/*.{o,so*} $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) + cp -a $(TOOLCHAIN_ROOT_DIR)/lib/*nonshared*.a $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) + cp -a $(TOOLCHAIN_ROOT_DIR)/lib/libm.a $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) $(COPY_STATIC_LIBC) $(COPY_STATIC_LIBPTHREAD) $(COPY_STATIC_LIBSTDC) diff --git a/lang/perl/Makefile b/lang/perl/Makefile index 6b748019bc..dbc982d6bc 100644 --- a/lang/perl/Makefile +++ b/lang/perl/Makefile @@ -102,7 +102,7 @@ define Build/Configure -Dowrt:threads=$(if $(CONFIG_PERL_THREADS),yes,no) \ -Dowrt:staging_dir='$(STAGING_DIR)' \ -Dowrt:host_perl_prefix='$(HOST_PERL_PREFIX)' \ - -Dsysroot='$(TOOLCHAIN_DIR)' \ + -Dsysroot='$(TOOLCHAIN_ROOT_DIR)' \ files/version.config \ files/base.config \ files/$(patsubst i386,i486,$(ARCH)).config \ diff --git a/lang/rust/Makefile b/lang/rust/Makefile index cdf3c2adf9..f0d6a866f8 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -54,7 +54,7 @@ TARGET_CONFIGURE_ARGS = \ --set=target.$(RUSTC_TARGET_ARCH).linker=$(TARGET_CC_NOCACHE) \ --set=target.$(RUSTC_TARGET_ARCH).ranlib=$(TARGET_RANLIB) \ --set=target.$(RUSTC_TARGET_ARCH).crt-static=false \ - $(if $(CONFIG_USE_MUSL),--set=target.$(RUSTC_TARGET_ARCH).musl-root=$(TOOLCHAIN_DIR)) + $(if $(CONFIG_USE_MUSL),--set=target.$(RUSTC_TARGET_ARCH).musl-root=$(TOOLCHAIN_ROOT_DIR)) # CARGO_HOME is an environmental HOST_CONFIGURE_VARS += CARGO_HOME="$(CARGO_HOME)" diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile index d7e51c037f..7e6a7b1059 100644 --- a/net/net-snmp/Makefile +++ b/net/net-snmp/Makefile @@ -223,8 +223,6 @@ ifeq ($(CONFIG_IPV6),y) SNMP_TRANSPORTS_INCLUDED+= UDPIPv6 endif -TARGET_LDFLAGS += -L$(TOOLCHAIN_DIR)/usr/lib - define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \ diff --git a/utils/gpsd/Makefile b/utils/gpsd/Makefile index dcd00a956d..928c4a06e4 100644 --- a/utils/gpsd/Makefile +++ b/utils/gpsd/Makefile @@ -119,7 +119,7 @@ SCONS_OPTIONS += \ implicit_link=no \ chrpath=no \ manbuild=no \ - sysroot="$(TOOLCHAIN_DIR)" \ + sysroot="$(TOOLCHAIN_ROOT_DIR)" \ target="$(TARGET_CROSS:-=)" define Build/InstallDev diff --git a/utils/gummiboot/Makefile b/utils/gummiboot/Makefile index 688764e43c..2295a0b39c 100644 --- a/utils/gummiboot/Makefile +++ b/utils/gummiboot/Makefile @@ -44,14 +44,14 @@ CONFIGURE_ARGS += \ --disable-manpages define Build/Compile - +$(MAKE_VARS) EFI_CFLAGS="-I$(TOOLCHAIN_DIR)/include $(TARGET_CFLAGS)" \ + +$(MAKE_VARS) EFI_CFLAGS="$(patsubst %,-I%,$(TOOLCHAIN_INC_DIRS)) $(TARGET_CFLAGS)" \ $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \ $(MAKE_FLAGS) \ $(1); endef define Build/Install - $(MAKE_VARS) EFI_CFLAGS="-I$(TOOLCHAIN_DIR)/include $(TARGET_CFLAGS)" \ + $(MAKE_VARS) EFI_CFLAGS="$(patsubst %,-I%,$(TOOLCHAIN_INC_DIRS)) $(TARGET_CFLAGS)" \ $(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \ $(MAKE_INSTALL_FLAGS) install endef -- 2.30.2