summaryrefslogtreecommitdiff
path: root/package/zlib/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'package/zlib/Makefile')
-rw-r--r--package/zlib/Makefile68
1 files changed, 38 insertions, 30 deletions
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index c94c0dcf3..e5de4a036 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -1,48 +1,59 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-include ${TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= zlib
-PKG_VERSION:= 1.2.5
+PKG_VERSION:= 1.3.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= be1e89810e66150f5b0327984d8625a0
+PKG_HASH:= 38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32
PKG_DESCR:= implementation of the deflate compression method
-PKG_SECTION:= libs
+PKG_SECTION:= libs/comp
PKG_URL:= http://www.zlib.net/
-PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libpng/zlib/}
+PKG_SITES:= http://zlib.net/
+PKG_OPTS:= dev
-PKG_SUBPKGS:= ZLIB ZLIB_DEV
-PKGSD_ZLIB_DEV:= development files for zlib
-PKGSC_ZLIB_DEV:= devel
+include $(ADK_TOPDIR)/mk/host.mk
+include $(ADK_TOPDIR)/mk/package.mk
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+$(eval $(call HOST_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+ifeq ($(ADK_TARGET_USE_STATIC_AND_SHARED_LIBS),y)
+TARGET_CFLAGS:= $(filter-out -static,$(TARGET_CFLAGS))
+TARGET_LDFLAGS:=$(filter-out -static,$(TARGET_LDFLAGS))
endif
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,ZLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,ZLIB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ZLIB_DEV},${PKGSC_ZLIB_DEV}))
+HOST_STYLE:= auto
+HOST_CONFIG_STYLE:= manual
+HOST_CONFIGURE_ENV+= uname=Linux
+HOST_FAKE_FLAGS+= DESTDIR=/
CONFIG_STYLE:= manual
CONFIGURE_ENV+= uname=Linux
-ifeq ($(ADK_NATIVE),)
-COPTS:= $(TARGET_CONFIGURE_OPTS)
-endif
-
-ifeq ($(ADK_STATIC),)
+ifeq ($(ADK_TARGET_BINFMT_FLAT)$(ADK_TARGET_USE_STATIC_LIBS_ONLY),)
CONFIGURE_OPTS:= --shared
+else
+CONFIGURE_OPTS:= --static
endif
-ALL_TARGET:= libz.a libz.so.1.2.5
+host-configure:
+ (cd $(WRKBUILD); \
+ uname="Linux" \
+ $(HOST_CONFIGURE_OPTS) \
+ CFLAGS="$(HOST_CFLAGS) -fPIC" \
+ CPPFLAGS="-I$(STAGING_HOST_DIR)/usr/include" \
+ LDFLAGS="-L$(STAGING_HOST_DIR)/usr/lib" \
+ ./configure \
+ --prefix=$(STAGING_HOST_DIR)/usr \
+ --shared \
+ );
do-configure:
- (cd $(WRKBUILD); $(COPTS) \
+ (cd $(WRKBUILD); \
uname="Linux" \
+ $(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) -fPIC" \
CPPFLAGS="-I$(STAGING_TARGET_DIR)/usr/include" \
LDFLAGS="-L$(STAGING_TARGET_DIR)/usr/lib" \
@@ -51,12 +62,9 @@ do-configure:
$(CONFIGURE_OPTS) \
);
-post-install:
- ${INSTALL_DIR} ${IDIR_ZLIB}/usr/lib
- ${CP} ${WRKBUILD}/libz.so* ${IDIR_ZLIB}/usr/lib
-
-zlib-dev-install:
- ${INSTALL_DIR} ${IDIR_ZLIB_DEV}/usr/include
- ${CP} ${WRKBUILD}/*.h ${IDIR_ZLIB_DEV}/usr/include
+zlib-install:
+ $(INSTALL_DIR) $(IDIR_ZLIB)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libz.so* $(IDIR_ZLIB)/usr/lib
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/host-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk