From 0791cc6f494329452b92108652241401e674d096 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 24 Feb 2018 10:35:35 +0100 Subject: [PATCH 1/2] libosip2: remove $(FPIC) from TARGET_CFLAGS libosip2 already makes sure that the compiler emits position-independent code. Adding $(FPIC) makes no difference. In addition the libosip2 build system puts its own flag behind the CFLAGS, overriding whatever was set before. Signed-off-by: Sebastian Kemper --- libs/libosip2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libosip2/Makefile b/libs/libosip2/Makefile index 4440880..100990b 100644 --- a/libs/libosip2/Makefile +++ b/libs/libosip2/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. @@ -38,7 +38,7 @@ define Package/libosip2/description endef # toolchain __arc__ define conflicts with libosip2 source -TARGET_CFLAGS += $(FPIC) $(if $(CONFIG_arc),-U__arc__) +TARGET_CFLAGS += $(if $(CONFIG_arc),-U__arc__) CONFIGURE_ARGS += \ --enable-shared \ From c228dd21b19548bdfeca6c6d751b147a3f6267f1 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 24 Feb 2018 10:37:25 +0100 Subject: [PATCH 2/2] libosip2: simplify install define Signed-off-by: Sebastian Kemper --- libs/libosip2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libosip2/Makefile b/libs/libosip2/Makefile index 100990b..1c17f44 100644 --- a/libs/libosip2/Makefile +++ b/libs/libosip2/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libosip2 PKG_VERSION:=5.0.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/osip @@ -68,7 +68,7 @@ endef define Package/libosip2/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.so $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.so* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libosip2))