aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Engberg <daniel.engberg.lists@pyret.net>2017-09-05 19:31:10 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2018-01-02 17:11:12 +0100
commit383e8aeec703fee957f30892487d7bb746c1a212 (patch)
treec523ad472b776e9d33b8d24a28fed07e6e92ffa0
parent37bb463daa21e2c97365c6543b2bfdfe673c5baa (diff)
downloadupstream-383e8aeec703fee957f30892487d7bb746c1a212.tar.gz
upstream-383e8aeec703fee957f30892487d7bb746c1a212.tar.bz2
upstream-383e8aeec703fee957f30892487d7bb746c1a212.zip
package/libs/zlib: Use toolchain build logic
Use build logic provided by toolchain instead of doing it manually. Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
-rw-r--r--package/libs/zlib/Makefile26
1 files changed, 4 insertions, 22 deletions
diff --git a/package/libs/zlib/Makefile b/package/libs/zlib/Makefile
index fe03276c92..597d0b6871 100644
--- a/package/libs/zlib/Makefile
+++ b/package/libs/zlib/Makefile
@@ -20,6 +20,7 @@ PKG_LICENSE_FILES:=README
PKG_CPE_ID:=cpe:/a:gnu:zlib
include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
define Package/zlib
SECTION:=libs
@@ -46,26 +47,7 @@ define Package/zlib-dev/description
This package includes the development support files.
endef
-CONFIGURE_VARS := \
- $(TARGET_CONFIGURE_OPTS) \
- LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
- CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
-
-CONFIGURE_ARGS := \
- --prefix=/usr \
- --shared \
- --uname=Linux \
-
-define Build/Compile
- +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)" \
- libz.a libz.so.$(PKG_VERSION)
- mkdir -p $(PKG_INSTALL_DIR)
- $(MAKE) -C $(PKG_BUILD_DIR) \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- install
-endef
+TARGET_CFLAGS += $(FPIC)
define Build/InstallDev
mkdir -p $(1)/usr/include
@@ -75,7 +57,7 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \
$(1)/usr/lib/
mkdir -p $(1)/usr/lib/pkgconfig
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/zlib.pc \
+ $(CP) $(PKG_INSTALL_DIR)/usr/share/pkgconfig/zlib.pc \
$(1)/usr/lib/pkgconfig/
endef
@@ -95,7 +77,7 @@ define Package/zlib-dev/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.a $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/zlib.pc \
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/pkgconfig/zlib.pc \
$(1)/usr/lib/pkgconfig/
endef