diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/zlib | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/zlib')
| -rw-r--r-- | package/zlib/Config.in | 19 | ||||
| -rw-r--r-- | package/zlib/Makefile | 38 |
2 files changed, 22 insertions, 35 deletions
diff --git a/package/zlib/Config.in b/package/zlib/Config.in deleted file mode 100644 index 2d4be8d8d..000000000 --- a/package/zlib/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config ADK_PACKAGE_ZLIB - prompt "zlib.............................. Library implementing the deflate compression method" - tristate - default n - help - A library implementing the 'deflate' compression method - - http://www.zlib.net/ - -config ADK_PACKAGE_ZLIB_DEV - prompt "zlib-dev........................ Zlib development files" - tristate - depends on ADK_PACKAGE_ZLIB - default n - help - A library implementing the 'deflate' compression method - http://www.zlib.net/ - - diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 1f0e11ef6..e031baf0a 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= zlib PKG_VERSION:= 1.2.3 PKG_RELEASE:= 6 PKG_MD5SUM:= dee233bf288ee795ac96a98cc2e369b6 -PKG_DESCR:= implementation of the deflate compression method (library) +PKG_DESCR:= implementation of the deflate compression method PKG_SECTION:= libs PKG_URL:= http://www.zlib.net PKG_SITES:= http://www.zlib.net/ \ @@ -15,29 +15,35 @@ PKG_SITES:= http://www.zlib.net/ \ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +ifeq ($(ADK_STATIC),y) +PKG_OPTS:= libonly +endif + include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ZLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(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},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= manual -BUILD_STYLE= auto -INSTALL_STYLE= auto +CONFIG_STYLE:= manual + +ifeq ($(ADK_NATIVE),) +COPTS:= $(TARGET_CONFIGURE_OPTS) +endif -ifeq ($(ADK_NATIVE),n) -COPTS:= $(TARGET_CONFIGURE_OPTS) +ifeq ($(ADK_STATIC),) +CONFIGURE_OPTS:= --shared endif do-configure: - (cd $(WRKBUILD); $(COPTS) \ - CFLAGS="$(TARGET_CFLAGS) -fPIC" \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ - ./configure \ - --prefix=$(STAGING_DIR)/usr \ - --includedir=$(STAGING_DIR)/usr/include \ - --shared \ - ); + (cd $(WRKBUILD); $(COPTS) \ + CFLAGS="$(TARGET_CFLAGS) -fPIC" \ + CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ + LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ + ./configure \ + --prefix=$(STAGING_DIR)/usr \ + --includedir=$(STAGING_DIR)/usr/include \ + $(CONFIGURE_OPTS) \ + ); post-install: ${INSTALL_DIR} ${IDIR_ZLIB}/usr/lib |