Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5671 from micmac1/xslt-up

Browse source 
libxslt: remove $(FPIC), clean up install defines
This commit is contained in:
Jiri Slachta 2018-03-01 10:48:31 +01:00 committed by GitHub
commit 1d579e7867
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libs/libxslt/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libxslt PKG_NAME:=libxslt
PKG_VERSION:=1.1.32 PKG_VERSION:=1.1.32
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:= \ PKG_SOURCE_URL:= \
@ -54,7 +54,7 @@ endef
define Package/xsltproc define Package/xsltproc
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
DEPENDS:=+libxml2 +libxslt +libexslt DEPENDS:=+libxslt +PACKAGE_xsltproc:libexslt
TITLE:=Gnome XSLT xsltproc Utility TITLE:=Gnome XSLT xsltproc Utility
URL:=http://xmlsoft.org/XSLT/ URL:=http://xmlsoft.org/XSLT/
endef endef
@ -73,8 +73,6 @@ CONFIGURE_ARGS+= \
--without-mem-debug \ --without-mem-debug \
--without-debugger \ --without-debugger \
TARGET_CFLAGS += $(FPIC)
define Build/InstallDev/Xslt define Build/InstallDev/Xslt
$(INSTALL_DIR) $(1)/usr/bin $(2)/bin $(1)/usr/include/libxslt \ $(INSTALL_DIR) $(1)/usr/bin $(2)/bin $(1)/usr/include/libxslt \
$(1)/usr/include/libexslt $(1)/usr/lib \ $(1)/usr/include/libexslt $(1)/usr/lib \
@ -130,14 +128,14 @@ endef
define Package/libxslt/install define Package/libxslt/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/lib/libxslt.so.* \ $(PKG_INSTALL_DIR)/usr/lib/libxslt.so* \
$(1)/usr/lib/ $(1)/usr/lib/
endef endef
define Package/libexslt/install define Package/libexslt/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/lib/libexslt.so.* \ $(PKG_INSTALL_DIR)/usr/lib/libexslt.so* \
$(1)/usr/lib/ $(1)/usr/lib/
endef endef