hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
owl
Daniel Engberg 2017-09-05 19:31:10 +02:00 committed by Hauke Mehrtens
parent 37bb463daa
commit 383e8aeec7
1 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
package/libs/zlib/Makefile
View File

@ -20,6 +20,7 @@ PKG_LICENSE_FILES:=README
PKG_CPE_ID:=cpe:/a:gnu:zlib PKG_CPE_ID:=cpe:/a:gnu:zlib
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
define Package/zlib define Package/zlib
SECTION:=libs SECTION:=libs
@ -46,26 +47,7 @@ define Package/zlib-dev/description
This package includes the development support files. This package includes the development support files.
endef endef
CONFIGURE_VARS := \ TARGET_CFLAGS += $(FPIC)
$(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
define Build/InstallDev define Build/InstallDev
mkdir -p $(1)/usr/include mkdir -p $(1)/usr/include
@ -75,7 +57,7 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \
$(1)/usr/lib/ $(1)/usr/lib/
mkdir -p $(1)/usr/lib/pkgconfig 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/ $(1)/usr/lib/pkgconfig/
endef endef
@ -95,7 +77,7 @@ define Package/zlib-dev/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.a $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.a $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(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/ $(1)/usr/lib/pkgconfig/
endef endef