From f0b4c4638e9e29bd55b1d9437dc987b6ceeab53d Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 24 Feb 2018 10:56:13 +0100 Subject: [PATCH 1/2] spandsp: remove $(FPIC) from TARGET_CFLAGS spandsp already makes sure that the compiler emits position-independent code. Adding $(FPIC) makes no difference. In addition the spandsp build system puts its own flag behind the CFLAGS, overriding whatever was set before. Signed-off-by: Sebastian Kemper --- libs/spandsp/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/spandsp/Makefile b/libs/spandsp/Makefile index 9236282..e326bc7 100644 --- a/libs/spandsp/Makefile +++ b/libs/spandsp/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. @@ -33,8 +33,6 @@ define Package/libspandsp DEPENDS:=+libtiff endef -TARGET_CFLAGS += $(FPIC) - define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspandsp* $(1)/usr/lib/ From 55c4bf9f78a91efaceeef764f2472d7bd37b7f0a Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 24 Feb 2018 11:01:53 +0100 Subject: [PATCH 2/2] spandsp: use $(INSTALL_DATA) for regular files Signed-off-by: Sebastian Kemper --- libs/spandsp/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/spandsp/Makefile b/libs/spandsp/Makefile index e326bc7..5993ba6 100644 --- a/libs/spandsp/Makefile +++ b/libs/spandsp/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=spandsp PKG_VERSION:=0.0.6 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.soft-switch.org/downloads/spandsp @@ -38,16 +38,16 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspandsp* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/spandsp.h $(1)/usr/include/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/spandsp.h $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/include/spandsp - $(CP) $(PKG_INSTALL_DIR)/usr/include/spandsp/*.h $(1)/usr/include/spandsp/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/spandsp/*.h $(1)/usr/include/spandsp/ $(INSTALL_DIR) $(1)/usr/include/spandsp/private - $(CP) $(PKG_INSTALL_DIR)/usr/include/spandsp/private/*.h $(1)/usr/include/spandsp/private/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/spandsp/private/*.h $(1)/usr/include/spandsp/private/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/spandsp.pc $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/spandsp.pc $(1)/usr/lib/pkgconfig/ endef define Package/libspandsp/install