From a57ffe6c639c482d49984bd587a13c947599869a Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 24 Feb 2018 12:02:48 +0100 Subject: [PATCH 1/3] libxslt: remove $(FPIC) from TARGET_CFLAGS libxslt already makes sure that the compiler emits position-independent code. Adding $(FPIC) makes no difference. In addition the libxslt build system puts its own flag behind the CFLAGS, overriding whatever was set before. Also with $(FPIC) in CFLAGS even the libxslt utils get compiled with PIC, which us undesirable. Signed-off-by: Sebastian Kemper --- libs/libxslt/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/libs/libxslt/Makefile b/libs/libxslt/Makefile index 9f276d3fd..4de059724 100644 --- a/libs/libxslt/Makefile +++ b/libs/libxslt/Makefile @@ -73,8 +73,6 @@ CONFIGURE_ARGS+= \ --without-mem-debug \ --without-debugger \ -TARGET_CFLAGS += $(FPIC) - define Build/InstallDev/Xslt $(INSTALL_DIR) $(1)/usr/bin $(2)/bin $(1)/usr/include/libxslt \ $(1)/usr/include/libexslt $(1)/usr/lib \ From baef65fed04044e1c3e07d6daef592242db313b3 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 24 Feb 2018 12:04:56 +0100 Subject: [PATCH 2/3] libxslt: update xsltproc depends libxml2 can be removed as libxslt already depends on it. Signed-off-by: Sebastian Kemper --- libs/libxslt/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/libxslt/Makefile b/libs/libxslt/Makefile index 4de059724..64d5a7ff3 100644 --- a/libs/libxslt/Makefile +++ b/libs/libxslt/Makefile @@ -54,7 +54,7 @@ endef define Package/xsltproc SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+libxml2 +libxslt +libexslt + DEPENDS:=+libxslt +PACKAGE_xsltproc:libexslt TITLE:=Gnome XSLT xsltproc Utility URL:=http://xmlsoft.org/XSLT/ endef From 54512199ee72aef1de3e6eaf9d12ca90b63b8fa2 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 24 Feb 2018 12:06:22 +0100 Subject: [PATCH 3/3] libxslt: install all lib symlinks Makes sure that even i.e. libxslt.so symlink gets copied to the target. Signed-off-by: Sebastian Kemper --- libs/libxslt/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/libxslt/Makefile b/libs/libxslt/Makefile index 64d5a7ff3..8c546c831 100644 --- a/libs/libxslt/Makefile +++ b/libs/libxslt/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libxslt PKG_VERSION:=1.1.32 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= \ @@ -128,14 +128,14 @@ endef define Package/libxslt/install $(INSTALL_DIR) $(1)/usr/lib $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libxslt.so.* \ + $(PKG_INSTALL_DIR)/usr/lib/libxslt.so* \ $(1)/usr/lib/ endef define Package/libexslt/install $(INSTALL_DIR) $(1)/usr/lib $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libexslt.so.* \ + $(PKG_INSTALL_DIR)/usr/lib/libexslt.so* \ $(1)/usr/lib/ endef