From b4392fbc2e12b30bd6c53dd5dcdf81634eea0e08 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 24 Feb 2018 10:10:16 +0100 Subject: [PATCH 1/3] dahdi-linux: clean up make flags Remove all flags/variables that are not used at all. Remove some ':' that are not needed in the context. Signed-off-by: Sebastian Kemper --- libs/dahdi-linux/Makefile | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/libs/dahdi-linux/Makefile b/libs/dahdi-linux/Makefile index 17d7978..80d3be9 100644 --- a/libs/dahdi-linux/Makefile +++ b/libs/dahdi-linux/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2014 OpenWrt.org +# Copyright (C) 2014 - 2018 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=dahdi-linux PKG_VERSION:=2.11.1-20180111 -PKG_RELEASE:=1 +PKG_RELEASE:=2 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz #PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases @@ -88,8 +88,6 @@ endef define Build/Configure endef -TARGET_CFLAGS += $(FPIC) - define Build/Prepare $(Build/Prepare/Default) mkdir -p $(PKG_BUILD_DIR)/drivers/staging/echo/ @@ -101,15 +99,8 @@ define Build/Compile ARCH="$(LINUX_KARCH)" \ $(TARGET_CONFIGURE_OPTS) \ CROSS_COMPILE="$(TARGET_CROSS)" \ - KERNELVERSION="$(KERNEL)" \ - KERNEL_VERSION="$(LINUX_VERSION)" \ - KERNELDIR="$(LINUX_DIR)" \ - KSRC:="$(LINUX_DIR)" \ - KVERS:="$(LINUX_VERSION)" \ - TOPDIR:="$(TOPDIR)" \ - INCLUDE_DIR:="$(INCLUDE_DIR)" \ - PWD:="$(PKG_BUILD_DIR)" \ - MODULES_EXTRA:="$(DAHDI_MODULES_EXTRA)" + KSRC="$(LINUX_DIR)" \ + MODULES_EXTRA="$(DAHDI_MODULES_EXTRA)" endef define Build/InstallDev From b05e390a84993eee4e387b1b32a1491a0fba296e Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 24 Feb 2018 10:15:20 +0100 Subject: [PATCH 2/3] dahdi-tools: clean up make flags, remove $(FPIC) - Remove all flags/variables that are not used at all. - dahdi-tools already makes sure that the compiler emits position-independent code for libtonezone. Adding $(FPIC) makes no difference. In addition the dahdi-toolsbuild system puts its own flag behind the CFLAGS, overriding whatever was set before. Also the applications should never be built with PIC, it should only be done for the lib. Signed-off-by: Sebastian Kemper --- libs/dahdi-tools/Makefile | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/libs/dahdi-tools/Makefile b/libs/dahdi-tools/Makefile index 05fef54..e9a7cb9 100644 --- a/libs/dahdi-tools/Makefile +++ b/libs/dahdi-tools/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2014 OpenWrt.org +# Copyright (C) 2014 - 2018 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -46,20 +46,12 @@ define Package/dahdi-tools-libtonezone TITLE:=DAHDI tonezone library endef -TARGET_CFLAGS += $(FPIC) -EXTRA_CFLAGS:= $(TARGET_CPPFLAGS) - define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ HOSTCC="$(HOSTCC)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - CFLAGS="$(TARGET_CFLAGS) -I. -DBUILDING_TONEZONE -I$(STAGING_DIR)/usr/include" \ - KSRC="$(LINUX_DIR)" \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \ - DAHDI_INCLUDE="$(STAGING_DIR)/usr/include" \ - CONFIGURE_SILENT="--silent" \ + CFLAGS="$(TARGET_CFLAGS)" \ + CPPFLAGS="$(TARGET_CPPFLAGS)" \ dahdi_cfg dahdi_monitor dahdi_scan dahdi_speed dahdi_test fxotune endef From babc530fc798575678c56fcd5a87787fa9ffb6fd Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 24 Feb 2018 10:28:13 +0100 Subject: [PATCH 3/3] dahdi-tools: update install defines - use $(INSTALL_BIN) and $(INSTALL_DATA) where possible. - instead of creating symlinks manually just copy them. Signed-off-by: Sebastian Kemper --- libs/dahdi-tools/Makefile | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/libs/dahdi-tools/Makefile b/libs/dahdi-tools/Makefile index e9a7cb9..5ad82a8 100644 --- a/libs/dahdi-tools/Makefile +++ b/libs/dahdi-tools/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dahdi-tools PKG_VERSION:=2.11.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/dahdi-tools/releases @@ -61,27 +61,26 @@ define Build/InstallDev $(CP) $(PKG_BUILD_DIR)/.libs/*.a $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/include/dahdi - $(CP) $(PKG_BUILD_DIR)/tonezone.h $(1)/usr/include/dahdi/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/tonezone.h $(1)/usr/include/dahdi/ endef define Package/dahdi-cfg/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/.libs/dahdi_cfg $(1)/usr/sbin/ - $(CP) $(PKG_BUILD_DIR)/dahdi_scan $(1)/usr/sbin/ - $(CP) $(PKG_BUILD_DIR)/fxotune $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/dahdi_cfg $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/dahdi_scan $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/fxotune $(1)/usr/sbin/ endef define Package/dahdi-monitor/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/dahdi_monitor $(1)/usr/sbin/ - $(CP) $(PKG_BUILD_DIR)/dahdi_speed $(1)/usr/sbin/ - $(CP) $(PKG_BUILD_DIR)/dahdi_test $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/dahdi_monitor $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/dahdi_speed $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/dahdi_test $(1)/usr/sbin/ endef define Package/dahdi-tools-libtonezone/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/.libs/libtonezone.so.2.0.0 $(1)/usr/lib/ - cd $(1)/usr/lib/; ln -s libtonezone.so.2.0.0 libtonezone.so; ln -s libtonezone.so.2.0.0 libtonezone.so.2 + $(CP) $(PKG_BUILD_DIR)/.libs/libtonezone.so* $(1)/usr/lib/ endef $(eval $(call BuildPackage,dahdi-cfg))