From 96864abb6cf1bf4779f36cd30aa3101ef490ef9d Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Wed, 8 May 2024 15:28:04 +0200 Subject: [PATCH] Simplify cross build targets. In particular avoid rpath because that annoys rpmbuild --- configure/os/CONFIG.Common.deb10-x86_64 | 15 ++------------- configure/os/CONFIG.Common.gcc8-ppc4xxFP | 19 ++++++------------- configure/os/CONFIG.Common.moxa42-armv6l | 1 - configure/os/CONFIG.Common.raspbian-arm | 3 +++ 4 files changed, 11 insertions(+), 27 deletions(-) diff --git a/configure/os/CONFIG.Common.deb10-x86_64 b/configure/os/CONFIG.Common.deb10-x86_64 index d8a30d580..b1bf78f93 100644 --- a/configure/os/CONFIG.Common.deb10-x86_64 +++ b/configure/os/CONFIG.Common.deb10-x86_64 @@ -5,18 +5,7 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon ARCH_CLASS = x86_64 -LDLIBS_SHARED_YES=LDLIBS - -SDK = gcc -SDK_DIR = /opt/xgcc/gcc-8.3.0-deb10 -GNU_ARCH = x86_64-deb10-linux-gnu -SDKTARGETSYSROOT=$(SDK_DIR)/$(GNU_ARCH)/sys-root/ -GNU_DIR = $(SDK_DIR) -GNU_BIN = $(GNU_DIR)/bin -GNU_TARGET_INCLUDE_DIR = -GNU_TARGET=x86_64-deb10-linux-gnu - -ARCH_DEP_CPPFLAGS = -AS=$(GNU_BIN)/$(GNU_TARGET)-as +GNU_DIR = /opt/xgcc/gcc-8.3.0-deb10 +GNU_TARGET = x86_64-deb10-linux-gnu STD_CXXFLAGS = -std=c++17 diff --git a/configure/os/CONFIG.Common.gcc8-ppc4xxFP b/configure/os/CONFIG.Common.gcc8-ppc4xxFP index 2b07c00ad..9f321764f 100644 --- a/configure/os/CONFIG.Common.gcc8-ppc4xxFP +++ b/configure/os/CONFIG.Common.gcc8-ppc4xxFP @@ -5,17 +5,10 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon ARCH_CLASS = ppc -SDK = gcc -SDK_DIR = /opt/xgcc/gcc-8.5.0 -GNU_ARCH = powerpc-ppmac-linux-gnu -SDKTARGETSYSROOT=$(SDK_DIR)/$(GNU_ARCH)/sys-root/ -GNU_DIR = $(SDK_DIR) -GNU_BIN = $(GNU_DIR)/bin/ -GNU_TARGET_INCLUDE_DIR = -GNU_TARGET=powerpc-ppmac-linux-gnu +GNU_DIR = /opt/xgcc/gcc-8.5.0 +GNU_TARGET = powerpc-ppmac-linux-gnu -ARCH_DEP_CPPFLAGS = -m32 -mcpu=440fp -mhard-float -ARCH_DEP_LDFLAGS+=-Wl,-rpath,/opt/xgcc/gcc-8.5.0/$(GNU_ARCH)/lib -ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(SDKTARGETSYSROOT)/lib/powerpc-linux-gnu/ -ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(SDKTARGETSYSROOT)/usr/lib/powerpc-linux-gnu/ -AS=$(GNU_BIN)/$(GNU_TARGET)-as +ARCH_DEP_CPPFLAGS = -m32 -mcpu=440fp -mhard-float +ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(GNU_DIR)/$(GNU_TARGET)/sys-root/lib/powerpc-linux-gnu + +STD_CXXFLAGS = -std=c++17 diff --git a/configure/os/CONFIG.Common.moxa42-armv6l b/configure/os/CONFIG.Common.moxa42-armv6l index 14d872831..37205201d 100644 --- a/configure/os/CONFIG.Common.moxa42-armv6l +++ b/configure/os/CONFIG.Common.moxa42-armv6l @@ -6,7 +6,6 @@ include $(CONFIG)/os/CONFIG.Common.linux-arm GNU_DIR=/opt/moxa/arm-linux-4.4.2-v4 GNU_TARGET=arm ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(GNU_DIR)/arm-none-linux-gnueabi/lib -ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(INSTALL_LIB) COMMANDLINE_LIBRARY = READLINE_NCURSES diff --git a/configure/os/CONFIG.Common.raspbian-arm b/configure/os/CONFIG.Common.raspbian-arm index 6fee9eedb..7de49bc67 100644 --- a/configure/os/CONFIG.Common.raspbian-arm +++ b/configure/os/CONFIG.Common.raspbian-arm @@ -37,5 +37,8 @@ SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian-x64 # SDK_TARGET = arm-bcm2708hardfp-linux-gnueabi # SDK_TARGET = arm-bcm2708-linux-gnueabi +# gcc 4.9.3 for 64 bit hosts +# arm-rpi-4.9.3-linux-gnueabihf + GNU_DIR = $(SDK_DIR)/$(SDK_TARGET) GNU_TARGET = $(if $(filter arm-bcm2708%,SDK_TARGET),$(SDK_TARGET),arm-linux-gnueabihf)