openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-21 19:14:30 +04:00
Code Issues Packages Projects Releases Wiki Activity

treewide: update packages to use new toolchain define

Browse Source 
Update packages to use new toolchain define and drop usage of
TOOLCHAIN_DIR.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi
2023-10-19 18:24:57 +02:00
committed by Tianling Shen
parent b642f337b2
commit e28bd51cab
6 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
devel/gcc/Makefile
View File

@@ -73,15 +73,15 @@ define Package/gcc/config
endef endef
ifeq ($(CONFIG_INCLUDE_STATIC_LIBC),y) 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 endif
ifeq ($(CONFIG_INCLUDE_STATIC_LIBPTHREAD),y) 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 endif
ifeq ($(CONFIG_INCLUDE_STATIC_LIBSTDC),y) 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 endif
ifeq ($(CONFIG_INCLUDE_STATIC_LINK_SPEC),y) ifeq ($(CONFIG_INCLUDE_STATIC_LINK_SPEC),y)
@@ -95,9 +95,9 @@ PKGVERSION=OpenWrt GCC $(PKG_VERSION)
TARGET_CPPFLAGS += -D_GLIBCXX_INCLUDE_NEXT_C_HEADERS TARGET_CPPFLAGS += -D_GLIBCXX_INCLUDE_NEXT_C_HEADERS
# not using sstrip here as this messes up the .so's somehow # 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:= \ RSTRIP:= \
NM="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)nm" \ NM="$(firstword $(TOOLCHAIN_BIN_DIRS))/$(TARGET_CROSS)nm" \
STRIP="$(STRIP)" \ STRIP="$(STRIP)" \
STRIP_KMOD="$(STRIP) --strip-debug" \ STRIP_KMOD="$(STRIP) --strip-debug" \
$(SCRIPT_DIR)/rstrip.sh $(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/cc
ln -s $(REAL_GNU_TARGET_NAME)-gcc $(1)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc-$(PKG_VERSION) 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 $(PKG_INSTALL_DIR)/usr/lib/gcc $(1)/usr/lib
cp -ar $(TOOLCHAIN_DIR)/include $(1)/usr cp -ar $(TOOLCHAIN_ROOT_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_ROOT_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_ROOT_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 -a $(TOOLCHAIN_ROOT_DIR)/lib/libm.a $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION)
$(COPY_STATIC_LIBC) $(COPY_STATIC_LIBC)
$(COPY_STATIC_LIBPTHREAD) $(COPY_STATIC_LIBPTHREAD)
$(COPY_STATIC_LIBSTDC) $(COPY_STATIC_LIBSTDC)

2
lang/perl/Makefile
View File

@@ -102,7 +102,7 @@ define Build/Configure
-Dowrt:threads=$(if $(CONFIG_PERL_THREADS),yes,no) \ -Dowrt:threads=$(if $(CONFIG_PERL_THREADS),yes,no) \
-Dowrt:staging_dir='$(STAGING_DIR)' \ -Dowrt:staging_dir='$(STAGING_DIR)' \
-Dowrt:host_perl_prefix='$(HOST_PERL_PREFIX)' \ -Dowrt:host_perl_prefix='$(HOST_PERL_PREFIX)' \
-Dsysroot='$(TOOLCHAIN_DIR)' \ -Dsysroot='$(TOOLCHAIN_ROOT_DIR)' \
files/version.config \ files/version.config \
files/base.config \ files/base.config \
files/$(patsubst i386,i486,$(ARCH)).config \ files/$(patsubst i386,i486,$(ARCH)).config \

2
lang/rust/Makefile
View File

@@ -54,7 +54,7 @@ TARGET_CONFIGURE_ARGS = \
--set=target.$(RUSTC_TARGET_ARCH).linker=$(TARGET_CC_NOCACHE) \ --set=target.$(RUSTC_TARGET_ARCH).linker=$(TARGET_CC_NOCACHE) \
--set=target.$(RUSTC_TARGET_ARCH).ranlib=$(TARGET_RANLIB) \ --set=target.$(RUSTC_TARGET_ARCH).ranlib=$(TARGET_RANLIB) \
--set=target.$(RUSTC_TARGET_ARCH).crt-static=false \ --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 # CARGO_HOME is an environmental
HOST_CONFIGURE_VARS += CARGO_HOME="$(CARGO_HOME)" HOST_CONFIGURE_VARS += CARGO_HOME="$(CARGO_HOME)"

2
net/net-snmp/Makefile
View File

@@ -223,8 +223,6 @@ ifeq ($(CONFIG_IPV6),y)
SNMP_TRANSPORTS_INCLUDED+= UDPIPv6 SNMP_TRANSPORTS_INCLUDED+= UDPIPv6
endif endif
TARGET_LDFLAGS += -L$(TOOLCHAIN_DIR)/usr/lib
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \ INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \

2
utils/gpsd/Makefile
View File

@@ -119,7 +119,7 @@ SCONS_OPTIONS += \
implicit_link=no \ implicit_link=no \
chrpath=no \ chrpath=no \
manbuild=no \ manbuild=no \
sysroot="$(TOOLCHAIN_DIR)" \ sysroot="$(TOOLCHAIN_ROOT_DIR)" \
target="$(TARGET_CROSS:-=)" target="$(TARGET_CROSS:-=)"
define Build/InstallDev define Build/InstallDev

4
utils/gummiboot/Makefile
View File

@@ -44,14 +44,14 @@ CONFIGURE_ARGS += \
--disable-manpages --disable-manpages
define Build/Compile 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) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
$(MAKE_FLAGS) \ $(MAKE_FLAGS) \
$(1); $(1);
endef endef
define Build/Install 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) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
$(MAKE_INSTALL_FLAGS) install $(MAKE_INSTALL_FLAGS) install
endef endef