summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/Makefile17
-rw-r--r--package/MesaLib/Makefile4
-rw-r--r--package/ant/Makefile2
-rw-r--r--package/binutils/Makefile4
-rw-r--r--package/busybox/Makefile6
-rw-r--r--package/cdrtools/Makefile2
-rw-r--r--package/cmake/Makefile2
-rw-r--r--package/ecj/Makefile2
-rw-r--r--package/fastjar/Makefile2
-rw-r--r--package/firefox/Makefile2
-rw-r--r--package/gcj/Makefile1
-rw-r--r--package/jikes/Makefile2
-rw-r--r--package/krb5/Makefile4
-rw-r--r--package/libc/Config.in.manual6
-rw-r--r--package/libc/Makefile36
-rw-r--r--package/libgcc/Makefile2
-rw-r--r--package/libpthread/Makefile6
-rw-r--r--package/librt/Makefile6
-rw-r--r--package/libssh/Makefile2
-rw-r--r--package/libssp/Makefile6
-rw-r--r--package/libstdcxx/Makefile4
-rw-r--r--package/libthread_db/Makefile2
-rw-r--r--package/nfs-utils/Makefile5
-rw-r--r--package/p5-XML-Parser/Makefile2
-rw-r--r--package/pycurl/Makefile5
-rw-r--r--package/qemu/Makefile2
-rw-r--r--package/valgrind/Makefile2
-rw-r--r--package/zlib/Makefile7
28 files changed, 12 insertions, 131 deletions
diff --git a/package/Makefile b/package/Makefile
index eb49efd6a..1b8cc97f3 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -9,26 +9,19 @@ ifeq (${ADK_TARGET_LIB_GLIBC},y)
package-$(ADK_PACKAGE_GLIBC) += glibc
gcc-compile: glibc-compile
endif
+
ifeq (${ADK_TARGET_LIB_MUSL},y)
package-$(ADK_PACKAGE_MUSL) += musl
gcc-compile: musl-compile
endif
-ifeq (${ADK_NATIVE},y)
-package-$(ADK_PACKAGE_LIBC) += libc
-endif
-ifneq (${ADK_NATIVE},y)
-package-$(ADK_PACKAGE_LIBPTHREAD) += libpthread
-endif
-ifneq (${ADK_TARGET_LIB_GLIBC},y)
-ifneq (${ADK_TARGET_LIB_MUSL},y)
-ifneq (${ADK_NATIVE},y)
+ifeq (${ADK_TARGET_LIB_UCLIBC},y)
package-$(ADK_PACKAGE_UCLIBC) += uclibc
-gcc-compile: uclibc-compile
-endif
package-$(ADK_PACKAGE_UCLIBCXX) += uclibc++
+gcc-compile: uclibc-compile
endif
-endif
+
+package-$(ADK_PACKAGE_LIBPTHREAD) += libpthread
include $(TOPDIR)/package/Depends.mk
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index e207dac9b..c6e1811a5 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -52,11 +52,7 @@ CONFIGURE_ARGS+= --disable-static \
--with-dri-drivers=${DRI_DRIVERS},swrast
CONFIGURE_ENV+= MISSING="echo" \
PYTHON2=$(PYTHON)
-
XAKE_FLAGS+= HOST_CC=${CC_FOR_BUILD}
-ifeq ($(ADK_NATIVE),y)
-XAKE_FLAGS+= RANLIB=ranlib AR=ar
-endif
mesalib-install:
$(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib/dri
diff --git a/package/ant/Makefile b/package/ant/Makefile
index 5476596eb..625853bd8 100644
--- a/package/ant/Makefile
+++ b/package/ant/Makefile
@@ -14,8 +14,6 @@ PKG_SITES:= http://archive.apache.org/dist/ant/source/
DISTFILES:= apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2
WRKDIST= $(WRKDIR)/apache-$(PKG_NAME)-$(PKG_VERSION)
-PKG_ARCH_DEPENDS:= native
-
include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index b6e6fb616..c23bac585 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -33,13 +33,9 @@ endif
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
TARGET_CFLAGS+= -fPIC
-ifeq ($(ADK_NATIVE),)
CONFIGURE_ARGS+= --disable-werror \
--host=$(GNU_TARGET_NAME) \
--target=$(GNU_TARGET_NAME)
-else
-CONFIGURE_ARGS+= --disable-werror
-endif
# disable honour cflags stuff
XAKE_FLAGS+= GCC_HONOUR_COPTS=s
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index d4184a37a..1fe63ff0a 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -36,12 +36,8 @@ INSTALL_STYLE:= manual
BB_MAKE_FLAGS:= V=1 IPKG_ARCH="${CPU_ARCH}" ARCH="${ARCH}" GCC_HONOUR_COPTS=s \
HOSTCC="${CC_FOR_BUILD}" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
+ CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS='-static-libgcc' \
-C ${WRKBUILD}
-ifneq (${ADK_NATIVE},y)
-BB_MAKE_FLAGS+= CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS='-static-libgcc'
-else
-BB_MAKE_FLAGS+= EXTRA_LDFLAGS="-static-libgcc"
-endif
do-configure:
# get all symbols from top level config
diff --git a/package/cdrtools/Makefile b/package/cdrtools/Makefile
index 9483ad7b9..1b195fc3f 100644
--- a/package/cdrtools/Makefile
+++ b/package/cdrtools/Makefile
@@ -12,8 +12,6 @@ PKG_SECTION:= misc
PKG_URL:= http://cdrecord.berlios.de/private/cdrecord.html
PKG_SITES:= http://openadk.org/
-PKG_ARCH_DEPENDS:= native
-
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,CDRTOOLS,cdrtools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/cmake/Makefile b/package/cmake/Makefile
index e4d26b185..1079227f2 100644
--- a/package/cmake/Makefile
+++ b/package/cmake/Makefile
@@ -12,8 +12,6 @@ PKG_SECTION:= lang
PKG_URL:= http://www.cmake.org/
PKG_SITES:= http://www.cmake.org/files/v2.8/
-PKG_ARCH_DEPENDS:= native
-
include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
diff --git a/package/ecj/Makefile b/package/ecj/Makefile
index 37a463eb1..92898307b 100644
--- a/package/ecj/Makefile
+++ b/package/ecj/Makefile
@@ -12,8 +12,6 @@ PKG_SECTION:= lang
NO_DISTFILES:= 1
-PKG_ARCH_DEPENDS:= native
-
include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
diff --git a/package/fastjar/Makefile b/package/fastjar/Makefile
index e14c66076..0f4c1a50c 100644
--- a/package/fastjar/Makefile
+++ b/package/fastjar/Makefile
@@ -11,8 +11,6 @@ PKG_DESCR:= fastjar utility
PKG_SECTION:= lang
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=fastjar/}
-PKG_ARCH_DEPENDS:= native
-
include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index e4b69591d..1fb663e06 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -22,7 +22,7 @@ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_
PKG_NOPARALLEL:= 1
PKG_NEED_CXX:= 1
-PKG_ARCH_DEPENDS:= arm x86 x86_64 native mips
+PKG_ARCH_DEPENDS:= arm x86 x86_64 mips
PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin
PKG_SYSTEM_DEPENDS:= tarox-pc ibm-x40 lemote-yeelong qemu-i686 qemu-x86_64 qemu-mips64el raspberry-pi
diff --git a/package/gcj/Makefile b/package/gcj/Makefile
index be7059def..5ff8cc810 100644
--- a/package/gcj/Makefile
+++ b/package/gcj/Makefile
@@ -13,7 +13,6 @@ PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/}
DISTFILES:= gcc-$(PKG_VERSION).tar.bz2
-PKG_ARCH_DEPENDS:= native
WRKDIST= ${WRKDIR}/gcc-${PKG_VERSION}
include $(TOPDIR)/mk/host.mk
diff --git a/package/jikes/Makefile b/package/jikes/Makefile
index 6f7649a49..7404fc123 100644
--- a/package/jikes/Makefile
+++ b/package/jikes/Makefile
@@ -13,8 +13,6 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/}
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_ARCH_DEPENDS:= native
-
include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 2af556c9e..692b7d630 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -31,10 +31,6 @@ PKGSS_KRB5_UTIL:= libkrb5 libncurses libss libcom-err
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-signed.tar
WRKSRC= ${WRKDIST}/src
-ifeq ($(ADK_NATIVE),y)
-NM:=nm
-endif
-
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/libc/Config.in.manual b/package/libc/Config.in.manual
deleted file mode 100644
index ae74da26d..000000000
--- a/package/libc/Config.in.manual
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_LIBC
- boolean
- depends on ADK_NATIVE
- default y if ADK_NATIVE
- help
- Native C library from host system.
diff --git a/package/libc/Makefile b/package/libc/Makefile
deleted file mode 100644
index 9b85b82bc..000000000
--- a/package/libc/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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
-
-PKG_NAME:= libc
-PKG_VERSION:= 1.0
-PKG_RELEASE:= 2
-PKG_SECTION:= base
-PKG_DESCR:= native C library
-
-NO_DISTFILES:= 1
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,LIBC,libc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:= manual
-BUILD_STYLE:= manual
-INSTALL_STYLE:= manual
-
-# do nothing, use native c library
-do-install:
- ${INSTALL_DIR} $(IDIR_LIBC)/lib
- $(CP) /lib/libgcc_s.so* $(IDIR_LIBC)/lib/
- $(CP) /lib/ld*-*.so* $(IDIR_LIBC)/lib/
- if test -f /lib/libuClibc-*.so; then $(CP) /lib/libuClibc-*.so \
- $(IDIR_LIBC)/lib/;fi
- -for file in libc libpthread libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \
- $(CP) /lib/$$file.so.* $(IDIR_LIBC)/lib/; \
- $(CP) /lib/$$file-*.so $(IDIR_LIBC)/lib/; \
- done
- # create ld.so link for ldd
- cd $(IDIR_LIBC)/lib && ln -sf ld-linux.so.2 ld.so
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile
index 28f277f8d..20f7f60f9 100644
--- a/package/libgcc/Makefile
+++ b/package/libgcc/Makefile
@@ -19,7 +19,6 @@ BUILD_STYLE:= manual
INSTALL_STYLE:= manual
do-install:
-ifeq ($(ADK_NATIVE),)
${INSTALL_DIR} ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
ifeq ($(ADK_LINUX_SH),y)
ifeq ($(ADK_TARGET_LIB_GLIBC),y)
@@ -30,6 +29,5 @@ endif
else
${CP} ${STAGING_TARGET_DIR}/$(ADK_TARGET_LIBC_PATH)/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
endif
-endif
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index f6f9e5f5f..cdb84d5fe 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -12,10 +12,6 @@ endif
ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
include ${TOPDIR}/toolchain/uClibc/Makefile.inc
endif
-ifeq ($(ADK_NATIVE),y)
-PKG_VERSION:= 1.0
-PKG_RELEASE:= 1
-endif
PKG_NAME:= libpthread
PKG_DESCR:= POSIX threading library
@@ -37,11 +33,9 @@ BUILD_STYLE:= manual
INSTALL_STYLE:= manual
libpthread-install:
-ifeq ($(ADK_NATIVE),)
ifeq ($(ADK_TARGET_LIB_MUSL),)
${INSTALL_DIR} ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
${CP} ${STAGING_TARGET_DIR}/lib/libpthread*.so* ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
endif
-endif
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/librt/Makefile b/package/librt/Makefile
index d056bc203..cf646672f 100644
--- a/package/librt/Makefile
+++ b/package/librt/Makefile
@@ -9,10 +9,6 @@ endif
ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
include ${TOPDIR}/toolchain/uClibc/Makefile.inc
endif
-ifeq ($(ADK_NATIVE),y)
-PKG_VERSION:= 1.0
-PKG_RELEASE:= 1
-endif
PKG_NAME:= librt
PKG_DESCR:= Realtime library
@@ -34,11 +30,9 @@ BUILD_STYLE:= manual
INSTALL_STYLE:= manual
librt-install:
-ifeq ($(ADK_NATIVE),)
${INSTALL_DIR} ${IDIR_LIBRT}/$(ADK_TARGET_LIBC_PATH)
ifeq ($(ADK_TARGET_LIB_MUSL),)
${CP} ${STAGING_TARGET_DIR}/lib/librt*.so* ${IDIR_LIBRT}/$(ADK_TARGET_LIBC_PATH)
endif
-endif
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libssh/Makefile b/package/libssh/Makefile
index 997e78895..6a49c346a 100644
--- a/package/libssh/Makefile
+++ b/package/libssh/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:= 9ad01838d3b89d98e900e0f6260a88cc
PKG_DESCR:= SSH library
PKG_SECTION:= libs
PKG_DEPENDS:= libopenssl zlib
-PKG_BUILDDEP:= openssl zlib
+PKG_BUILDDEP:= cmake-host openssl zlib
PKG_URL:= http://www.libssh.org/
PKG_SITES:= http://www.libssh.org/files/0.5/
PKG_OPTS:= dev
diff --git a/package/libssp/Makefile b/package/libssp/Makefile
index a5a4a2dc7..def4443e8 100644
--- a/package/libssp/Makefile
+++ b/package/libssp/Makefile
@@ -9,10 +9,6 @@ endif
ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
include ${TOPDIR}/toolchain/uClibc/Makefile.inc
endif
-ifeq ($(ADK_NATIVE),y)
-PKG_VERSION:= 1.0
-PKG_RELEASE:= 1
-endif
PKG_NAME:= libssp
PKG_DESCR:= Stack smashing protection library
@@ -34,9 +30,7 @@ BUILD_STYLE:= manual
INSTALL_STYLE:= manual
libssp-install:
-ifeq ($(ADK_NATIVE),)
${INSTALL_DIR} ${IDIR_LIBSSP}/$(ADK_TARGET_LIBC_PATH)
${CP} ${STAGING_TARGET_DIR}/lib/libssp.so* ${IDIR_LIBSSP}/$(ADK_TARGET_LIBC_PATH)
-endif
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile
index 7fc3503f8..84f0a7aec 100644
--- a/package/libstdcxx/Makefile
+++ b/package/libstdcxx/Makefile
@@ -28,11 +28,7 @@ INSTALL_STYLE:= manual
do-install:
${INSTALL_DIR} ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}
-ifeq ($(ADK_NATIVE),y)
- $(CP) /usr/lib/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/lib
-else
$(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}
-@rm ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}/libstdc++.so.*-gdb.py
-endif
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile
index ed92676a3..a2e14cd10 100644
--- a/package/libthread_db/Makefile
+++ b/package/libthread_db/Makefile
@@ -32,11 +32,9 @@ BUILD_STYLE:= manual
INSTALL_STYLE:= manual
do-install:
-ifeq ($(ADK_NATIVE),)
${INSTALL_DIR} ${IDIR_LIBTHREAD_DB}/lib
ifeq ($(ADK_TARGET_LIB_MUSL),)
${CP} ${STAGING_TARGET_DIR}/lib/libthread_db*.so* ${IDIR_LIBTHREAD_DB}/lib
endif
-endif
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index 694c9d7ae..59a71d6ed 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -40,13 +40,8 @@ $(eval $(call PKG_template,NFS_UTILS,nfs-utils,${PKG_VERSION}-${PKG_RELEASE},${P
$(eval $(call PKG_template,NFS_UTILS_CLIENT,nfs-utils-client,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_NFS_UTILS_CLIENT},${PKGSD_NFS_UTILS_CLIENT},${PKG_SECTION}))
$(eval $(call PKG_template,NFS_UTILS_SERVER,nfs-utils-server,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_NFS_UTILS_SERVER},${PKGSD_NFS_UTILS_SERVER},${PKG_SECTION}))
-ifeq ($(ADK_NATIVE),)
KRB5INC:= ${STAGING_TARGET_DIR}/usr
TIRPCINC:= ${STAGING_TARGET_DIR}/usr/include/tirpc
-else
-KRB5INC:= /usr
-TIRPCINC:= /usr/include/tirpc
-endif
ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y)
CONFIGURE_ARGS+= --enable-nfsv4 \
diff --git a/package/p5-XML-Parser/Makefile b/package/p5-XML-Parser/Makefile
index 19ad06ab0..13406fb9e 100644
--- a/package/p5-XML-Parser/Makefile
+++ b/package/p5-XML-Parser/Makefile
@@ -16,8 +16,6 @@ PKG_SITES:= http://search.cpan.org/CPAN/authors/id/C/CH/CHORNY/
DISTFILES:= XML-Parser-${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/XML-Parser-${PKG_VERSION}
-PKG_ARCH_DEPENDS:= native
-
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,P5_XML_PARSER,p5-xml-parser,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/pycurl/Makefile b/package/pycurl/Makefile
index 05dcb49d8..899bb3ddb 100644
--- a/package/pycurl/Makefile
+++ b/package/pycurl/Makefile
@@ -24,13 +24,8 @@ INSTALL_STYLE:= manual
XAKE_FLAGS+= GCC_HONOUR_COPTS=s
TARGET_CFLAGS+= -fPIC
-ifeq ($(ADK_NATIVE),)
MAKE_ENV+= LDSHARED="$(TARGET_CC) -shared"
CURL_CONFIG:= $(STAGING_DIR)/usr/bin/curl-config
-else
-MAKE_ENV+= CC="$(CC)" LDSHARED="$(CC) -shared"
-CURL_CONFIG:= /usr/bin/curl-config
-endif
include $(TOPDIR)/mk/python.mk
diff --git a/package/qemu/Makefile b/package/qemu/Makefile
index b03a3ca59..4c2067ac9 100644
--- a/package/qemu/Makefile
+++ b/package/qemu/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= http://wiki.qemu.org/download/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-PKG_ARCH_DEPENDS:= native x86 x86_64
+PKG_ARCH_DEPENDS:= x86 x86_64
include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile
index d0337d8f5..025db9dac 100644
--- a/package/valgrind/Makefile
+++ b/package/valgrind/Makefile
@@ -13,7 +13,7 @@ PKG_BUILDDEP:= autotool
PKG_URL:= http://valgrind.org/
PKG_SITES:= http://valgrind.org/downloads/
-PKG_ARCH_DEPENDS:= ppc ppc64 mips mipsel mips64 mips64el x86 x86_64 native
+PKG_ARCH_DEPENDS:= ppc ppc64 mips mipsel mips64 mips64el x86 x86_64
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
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" \