From 1e8584dc581567d12c9f4fcb1e1dd29b7a189ae9 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Fri, 20 Jan 2023 14:54:59 +0000 Subject: [PATCH] treewide: quote CC and CXX When CC is set to e.g. "ccache mips-openwrt-linux-musl-gcc" it needs to be quoted to avoid word splitting on substitution. Signed-off-by: Paul Fertser --- lang/chicken-scheme/Makefile | 2 +- libs/liburing/Makefile | 4 ++-- libs/pcapplusplus/Makefile | 2 +- net/isc-dhcp/Makefile | 2 +- net/isc-dhcp/patches/510-bind-CC.patch | 2 +- net/isc-dhcp/patches/520-bind-no-catgets.patch | 2 +- utils/ctop/Makefile | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lang/chicken-scheme/Makefile b/lang/chicken-scheme/Makefile index 79917fa5e4..c7fb98da20 100644 --- a/lang/chicken-scheme/Makefile +++ b/lang/chicken-scheme/Makefile @@ -49,7 +49,7 @@ define Package/chicken-scheme-interpreter/description For more information, please refer to the Chicken Scheme website at https://call-cc.org. endef -MAKE_FLAGS += PLATFORM=linux C_COMPILER=$(TARGET_CC) LINKER=$(TARGET_CC) PREFIX=/usr C_COMPILER_OPTIMIZATION_OPTIONS="$(TARGET_CFLAGS)" +MAKE_FLAGS += PLATFORM=linux C_COMPILER="$(TARGET_CC)" LINKER="$(TARGET_CC)" PREFIX=/usr C_COMPILER_OPTIMIZATION_OPTIONS="$(TARGET_CFLAGS)" # not installed: # - csc and chicken, the compiler diff --git a/libs/liburing/Makefile b/libs/liburing/Makefile index 6eb84b18d8..445e535adc 100644 --- a/libs/liburing/Makefile +++ b/libs/liburing/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=liburing PKG_VERSION:=2.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://git.kernel.dk/cgit/liburing/snapshot @@ -32,7 +32,7 @@ define Package/liburing/description For more info on io_uring, please see: https://kernel.dk/io_uring.pdf endef -CONFIGURE_ARGS:=--prefix=$(CONFIGURE_PREFIX) --cc=${TARGET_CC} +CONFIGURE_ARGS:=--prefix=$(CONFIGURE_PREFIX) --cc="${TARGET_CC}" define Build/Compile $(MAKE) $(PKG_BUILD_DIR) \ diff --git a/libs/pcapplusplus/Makefile b/libs/pcapplusplus/Makefile index af44583a10..63d52f1a4d 100644 --- a/libs/pcapplusplus/Makefile +++ b/libs/pcapplusplus/Makefile @@ -32,7 +32,7 @@ endef define Build/Compile cd $(PKG_BUILD_DIR)/PcapPlusPlus; ./configure-linux.sh --install-dir /usr - make -C $(PKG_BUILD_DIR)/PcapPlusPlus CXXFLAGS="$(TARGET_CXXFLAGS) -fPIC" CFLAGS="$(TARGET_CFLAGS) -fPIC" CXX=$(TARGET_CXX) CC=$(TARGET_CC) AR=$(TARGET_AR) libs + make -C $(PKG_BUILD_DIR)/PcapPlusPlus CXXFLAGS="$(TARGET_CXXFLAGS) -fPIC" CFLAGS="$(TARGET_CFLAGS) -fPIC" CXX="$(TARGET_CXX)" CC="$(TARGET_CC)" AR=$(TARGET_AR) libs endef define Build/InstallDev diff --git a/net/isc-dhcp/Makefile b/net/isc-dhcp/Makefile index 9f2b0555ed..2c6dd442be 100644 --- a/net/isc-dhcp/Makefile +++ b/net/isc-dhcp/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=isc-dhcp UPSTREAM_NAME:=dhcp PKG_VERSION:=4.4.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=6 PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE diff --git a/net/isc-dhcp/patches/510-bind-CC.patch b/net/isc-dhcp/patches/510-bind-CC.patch index dcee7593c4..bbbd949f0c 100644 --- a/net/isc-dhcp/patches/510-bind-CC.patch +++ b/net/isc-dhcp/patches/510-bind-CC.patch @@ -5,7 +5,7 @@ rm -rf ${cleandirs} ${cleanfiles} ; \ (cd ${bindsrcdir} && \ - ./configure ${bindconfig} > ${binddir}/configure.log); \ -+ export CC=${CROSS_CC} AR=${TARGET_AR} RANLIB=${TARGET_RANLIB} && \ ++ export CC="${CROSS_CC}" AR=${TARGET_AR} RANLIB=${TARGET_RANLIB} && \ + ./configure ${bindconfig} --disable-atomic \ + --disable-kqueue --disable-epoll --disable-kqueue \ + --disable-epoll --disable-devpoll --without-openssl \ diff --git a/net/isc-dhcp/patches/520-bind-no-catgets.patch b/net/isc-dhcp/patches/520-bind-no-catgets.patch index bd956032cd..fbd4d5dc4f 100644 --- a/net/isc-dhcp/patches/520-bind-no-catgets.patch +++ b/net/isc-dhcp/patches/520-bind-no-catgets.patch @@ -3,7 +3,7 @@ @@ -57,6 +57,7 @@ bind1: rm -rf ${cleandirs} ${cleanfiles} ; \ (cd ${bindsrcdir} && \ - export CC=${CROSS_CC} AR=${TARGET_AR} RANLIB=${TARGET_RANLIB} && \ + export CC="${CROSS_CC}" AR=${TARGET_AR} RANLIB=${TARGET_RANLIB} && \ + ac_cv_func_catgets=no \ ./configure ${bindconfig} --disable-atomic \ --disable-kqueue --disable-epoll --disable-kqueue \ diff --git a/utils/ctop/Makefile b/utils/ctop/Makefile index 69268008b7..65180fad6b 100644 --- a/utils/ctop/Makefile +++ b/utils/ctop/Makefile @@ -38,8 +38,8 @@ MAKE_VARS += \ GOPATH=$(GO_PKG_BUILD_DIR) \ GOCACHE=$(GO_BUILD_CACHE_DIR) \ GOROOT_FINAL=$(GO_TARGET_ROOT) \ - CC=$(TARGET_CC) \ - CXX=$(TARGET_CXX) \ + CC="$(TARGET_CC)" \ + CXX="$(TARGET_CXX)" \ $(GO_PKG_VARS) MAKE_FLAGS += \ COMMIT=$(PKG_SOURCE_VERSION)