diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-06 13:48:31 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-06 13:48:31 +0100 |
commit | 091853fb61e56b30e7d069a921d81ab6715a9dd8 (patch) | |
tree | a74acdcbeada27aeb4a20630bd7abc750954758d /package/zlib/Makefile | |
parent | 0cefe8a1ad706687651dd1e3e1f9319856142740 (diff) | |
parent | 3f8e6e157f3183d1af9ce7933b99ff8b3d5e3c20 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/zlib/Makefile')
-rw-r--r-- | package/zlib/Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 1d1c0d57c..6fe11ae3d 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -26,10 +26,6 @@ $(eval $(call PKG_template,ZLIB,zlib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS CONFIG_STYLE:= manual CONFIGURE_ENV+= uname=Linux -ifeq ($(ADK_NATIVE),) -COPTS:= $(TARGET_CONFIGURE_OPTS) -endif - ifeq ($(ADK_STATIC),) CONFIGURE_OPTS:= --shared endif @@ -37,8 +33,9 @@ endif ALL_TARGET:= libz.a libz.so.$(PKG_VERSION) 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" \ |