diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-06 12:31:45 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-06 12:31:45 +0100 |
| commit | 1d022f040aa90e8a436e3538e457e2e229001ffa (patch) | |
| tree | 471c0405d1e7e9c1684233a3ef45d749eae49db0 /package/zlib | |
| parent | 63b085190ffcc617ffc5b1cf02a5643bf3ab99df (diff) | |
| parent | 7f853c20b539d4b71e6d0ef53fcc16d7b9c00976 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/zlib')
| -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" \ |