summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-31 17:58:50 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-31 17:59:05 (GMT)
commit0d5a4bd73159fc794fdb417d49ab810b26e7d059 (patch)
tree53ef333b84afbbe7d6fed470885d716075295395
parent9e3458d13ae01591479732c1fe0cada8fd2259b7 (diff)
rework static linking support, works with musl/glibc, fails to boot with uclibc (qemu-x86)
-rw-r--r--mk/build.mk2
-rw-r--r--mk/package.mk12
-rw-r--r--mk/vars.mk2
-rw-r--r--package/atk/Makefile4
-rw-r--r--package/avahi/Makefile4
-rw-r--r--package/axtls/Makefile4
-rw-r--r--package/bind/Makefile4
-rw-r--r--package/binutils/Makefile4
-rw-r--r--package/bluez/Makefile2
-rw-r--r--package/bzip2/Makefile4
-rw-r--r--package/cairo/Makefile4
-rw-r--r--package/curl/Makefile4
-rw-r--r--package/dbus/Makefile4
-rw-r--r--package/esound/Makefile4
-rw-r--r--package/eudev/Makefile4
-rw-r--r--package/expat/Makefile4
-rw-r--r--package/ffmpeg/Makefile4
-rw-r--r--package/file/Makefile19
-rw-r--r--package/fontconfig/Makefile4
-rw-r--r--package/freetype/Makefile4
-rw-r--r--package/fuse/Makefile4
-rw-r--r--package/glib/Makefile4
-rw-r--r--package/glibc/Makefile6
-rw-r--r--package/gnutls/Makefile4
-rw-r--r--package/gpm/Makefile4
-rw-r--r--package/gsm/Makefile4
-rw-r--r--package/gtk+/Makefile4
-rw-r--r--package/heimdal/Makefile4
-rw-r--r--package/lame/Makefile4
-rw-r--r--package/libX11/Makefile4
-rw-r--r--package/libXau/Makefile4
-rw-r--r--package/libXcomposite/Makefile4
-rw-r--r--package/libXdmcp/Makefile4
-rw-r--r--package/libXext/Makefile4
-rw-r--r--package/libXi/Makefile4
-rw-r--r--package/libXrender/Makefile4
-rw-r--r--package/libcapi20/Makefile4
-rw-r--r--package/liblzo/Makefile4
-rw-r--r--package/libpng/Makefile4
-rw-r--r--package/libpthread/Makefile4
-rw-r--r--package/librt/Makefile4
-rw-r--r--package/libssp/Makefile4
-rw-r--r--package/libtiff/Makefile4
-rw-r--r--package/libtool/Makefile4
-rw-r--r--package/libusb-compat/Makefile4
-rw-r--r--package/libusb/Makefile4
-rw-r--r--package/libxml2/Makefile4
-rw-r--r--package/libxslt/Makefile4
-rw-r--r--package/linux-atm/Makefile4
-rw-r--r--package/lm_sensors/Makefile4
-rw-r--r--package/lvm/Makefile4
-rw-r--r--package/musl/Makefile2
-rw-r--r--package/net-snmp/Makefile4
-rw-r--r--package/obexftp/Makefile6
-rw-r--r--package/openct/Makefile4
-rw-r--r--package/openldap/Makefile4
-rw-r--r--package/openobex/Makefile4
-rw-r--r--package/opensc/Makefile4
-rw-r--r--package/openssl/Makefile4
-rw-r--r--package/pango/Makefile4
-rw-r--r--package/pcre/Makefile4
-rw-r--r--package/pixman/Makefile4
-rw-r--r--package/popt/Makefile4
-rw-r--r--package/rrdtool/Makefile4
-rw-r--r--package/sqlite/Makefile4
-rw-r--r--package/tzdata/Makefile2
-rw-r--r--package/uclibc/Makefile2
-rw-r--r--package/v4l-utils/Makefile4
-rw-r--r--package/x11vnc/Makefile2
-rw-r--r--package/zlib/Makefile4
-rw-r--r--target/config/Config.in.toolchain4
71 files changed, 37 insertions, 260 deletions
diff --git a/mk/build.mk b/mk/build.mk
index a5d5d1c..929dfde 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -11,7 +11,6 @@ endif
CONFIG_CONFIG_IN = Config.in
CONFIG = adk/config
DEFCONFIG= ADK_DEBUG=n \
- ADK_STATIC=n \
ADK_DISABLE_KERNEL_PATCHES=n \
ADK_DISABLE_TARGET_KERNEL_PATCHES=n \
ADK_WGET_TIMEOUT=180 \
@@ -48,6 +47,7 @@ DEFCONFIG= ADK_DEBUG=n \
ADK_TARGET_USE_GOLD=n \
ADK_TARGET_USE_GNU_HASHSTYLE=n \
ADK_TARGET_USE_PIE=n \
+ ADK_TARGET_USE_STATIC_LIBS=n \
ADK_LINUX_ARM_WITH_THUMB=n \
BUSYBOX_IFPLUGD=n \
BUSYBOX_EXTRA_COMPAT=n \
diff --git a/mk/package.mk b/mk/package.mk
index 0025f80..d468d6e 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -123,11 +123,20 @@ IDIR_$(1)= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)
IDIR_$(1)_DEV= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)-dev
IDIR_$(1)_DBG= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)-dbg
ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},)
+ifneq (,$(filter dev,$(7)))
+ifneq ($(ADK_TARGET_USE_STATIC_LIBS),y)
+ALL_IPKGS+= $$(IPKG_$(1))
+ALL_IDIRS+= $${IDIR_$(1)}
+ALL_POSTINST+= $(2)-install
+$(2)-install:
+endif
+else
ALL_IPKGS+= $$(IPKG_$(1))
ALL_IDIRS+= $${IDIR_$(1)}
ALL_POSTINST+= $(2)-install
$(2)-install:
endif
+endif
INFO_$(1)= $(PKG_STATE_DIR)/info/$(2).list
INFO_$(1)_DEV= $(PKG_STATE_DIR)/info/$(2)-dev.list
INFO_$(1)_DBG= $(PKG_STATE_DIR)/info/$(2)-dbg.list
@@ -264,7 +273,7 @@ ifeq (,$(filter noscripts,$(7)))
>>'$${STAGING_PKG_DIR}/$(1)'; \
done
endif
-ifeq (,$(filter libmix,$(7)))
+
ifeq (,$(filter libonly,$(7)))
ifeq (,$(filter devonly,$(7)))
$${PKG_BUILD} $${IDIR_$(1)} $${PACKAGE_DIR} $(MAKE_TRACE)
@@ -273,7 +282,6 @@ ifneq ($(ADK_DEBUG),y)
endif
endif
endif
-endif
ifneq (,$(filter dev,$(7)))
$${PKG_BUILD} $${IDIR_$(1)_DEV} $${PACKAGE_DIR} $(MAKE_TRACE)
endif
diff --git a/mk/vars.mk b/mk/vars.mk
index f1bf2be..bd77f39 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -97,7 +97,7 @@ TARGET_LDFLAGS+= -Wl,--secure-plt
endif
endif
-ifeq ($(ADK_STATIC),y)
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y)
TARGET_CFLAGS+= -static
TARGET_CXXFLAGS+= -static
TARGET_LDFLAGS+= -static
diff --git a/package/atk/Makefile b/package/atk/Makefile
index 7c54346..2c9d8ae 100644
--- a/package/atk/Makefile
+++ b/package/atk/Makefile
@@ -15,10 +15,6 @@ PKG_SITES:= ${MASTER_SITE_GNOME:=/atk/2.11/}
PKG_LIBNAME:= libatk
PKG_OPTS:= dev
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBATK,libatk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/avahi/Makefile b/package/avahi/Makefile
index 9968729..3aa6820 100644
--- a/package/avahi/Makefile
+++ b/package/avahi/Makefile
@@ -26,10 +26,6 @@ PKGSD_AVAHI_DNSCONFD:= DNS server from mDNS configuration daemon
PKGSD_LIBAVAHI:= DNS-SD over mDNS library
PKGSC_LIBAVAHI:= libs/misc
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_AVAHI_DAEMON},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/axtls/Makefile b/package/axtls/Makefile
index 164d790..456b0a5 100644
--- a/package/axtls/Makefile
+++ b/package/axtls/Makefile
@@ -22,10 +22,6 @@ PKGSC_LIBAXTLS:= libs/crypto
DISTFILES:= axTLS-${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/axTLS
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,AXHTTPD,axhttpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/bind/Makefile b/package/bind/Makefile
index 965c118..47c5132 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -43,10 +43,6 @@ PKGSC_LIBBIND:= libs/net
PKG_FLAVOURS_BIND_SERVER:= WITH_IPV6
PKGFD_WITH_IPV6:= enable IPv6 support
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index a0f459b..b0c471e 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -16,10 +16,6 @@ PKGSC_LIBBFD:= libs/misc
PKG_HOST_DEPENDS:= !cygwin
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index 3a57cb9..579cff5 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -20,7 +20,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
AUTOTOOL_STYLE:= autoreconf
-ifeq ($(ADK_STATIC),y)
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y)
XAKE_FLAGS+= CCLD="$(TARGET_CC) -all-static -pthread"
endif
TARGET_LDFLAGS+= -lncurses
diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile
index 61e58e1..2e3dde5 100644
--- a/package/bzip2/Makefile
+++ b/package/bzip2/Makefile
@@ -23,10 +23,6 @@ PKG_SUBPKGS:= BZIP2 LIBBZ2
PKGSD_LIBBZ2:= bzip2 compression library
PKGSC_LIBBZ2:= libs/misc
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/host.mk
include ${TOPDIR}/mk/package.mk
diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 177a4a4..4772828 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -18,10 +18,6 @@ PKG_URL:= http://cairographics.org/
PKG_SITES:= http://cairographics.org/releases/
PKG_OPTS:= dev
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include ${TOPDIR}/mk/host.mk
include ${TOPDIR}/mk/package.mk
diff --git a/package/curl/Makefile b/package/curl/Makefile
index 0a03090..eb1d7bf 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -35,10 +35,6 @@ PKGCD_WITH_GNUTLS:= use gnutls for crypto
PKGCS_WITH_GNUTLS:= libgnutls ca-certificates libgmp
PKGCB_WITH_GNUTLS:= gnutls
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index 65ef43b..b682778 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -23,10 +23,6 @@ PKGSD_LIBDBUS:= DBUS library
PKGSC_LIBDBUS:= libs/misc
PKGSS_LIBDBUS:= libexpat libuuid
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/esound/Makefile b/package/esound/Makefile
index 02c72fe..0c2a2a6 100644
--- a/package/esound/Makefile
+++ b/package/esound/Makefile
@@ -22,10 +22,6 @@ PKG_SUBPKGS:= ESOUND LIBESD
PKGSC_LIBESD:= libs/audio
PKGSD_LIBESD:= esound library
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,ESOUND,esound,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/eudev/Makefile b/package/eudev/Makefile
index cf16880..2598665 100644
--- a/package/eudev/Makefile
+++ b/package/eudev/Makefile
@@ -23,10 +23,6 @@ PKGSD_UDEV:= dynamic device management manager
PKGSC_LIBUDEV:= libs/misc
PKGSD_LIBUDEV:= dynamic device management library
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,UDEV,udev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/expat/Makefile b/package/expat/Makefile
index 126a6b7..61e60ff 100644
--- a/package/expat/Makefile
+++ b/package/expat/Makefile
@@ -16,10 +16,6 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include ${TOPDIR}/mk/host.mk
include ${TOPDIR}/mk/package.mk
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index 930b1f4..e7f3493 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -86,10 +86,6 @@ endif
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBFFMPEG,libffmpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS},${PKGSD_LIBFFMPEG},${PKGSC_LIBFFMPEG},${PKG_OPTS}))
diff --git a/package/file/Makefile b/package/file/Makefile
index 7b47a65..2a3ab16 100644
--- a/package/file/Makefile
+++ b/package/file/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:= e19c47e069ced7b01ccb4db402cc01d3
PKG_DESCR:= file type guesser
PKG_SECTION:= sys/utils
PKG_BUILDDEP:= file-host
-PKG_DEPENDS:= libmagic
+PKG_DEPENDS:= libmagic magic
PKG_URL:= http://www.darwinsys.com/file
PKG_SITES:= ftp://ftp.fu-berlin.de/unix/tools/file/ \
ftp://ftp.astron.com/pub/file/
@@ -19,13 +19,11 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-PKG_SUBPKGS:= FILE LIBMAGIC
+PKG_SUBPKGS:= FILE LIBMAGIC MAGIC
PKGSD_LIBMAGIC:= file type guesser library
PKGSC_LIBMAGIC:= libs/misc
-
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
+PKGSD_MAGIC:= magic file
+PKGSC_MAGIC:= sys/misc
include ${TOPDIR}/mk/host.mk
include ${TOPDIR}/mk/package.mk
@@ -33,6 +31,11 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call HOST_template,FILE,file,${PKG_VERSION}-${PKG_RELEASE}))
$(eval $(call PKG_template,FILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,LIBMAGIC,libmagic,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBMAGIC},${PKGSD_LIBMAGIC},${PKGSC_LIBMAGIC},${PKG_OPTS}))
+$(eval $(call PKG_template,MAGIC,magic,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_MAGIC},${PKGSD_MAGIC},${PKGSC_MAGIC}))
+
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y)
+MAKE_FLAGS+= LDFLAGS="$(TARGET_LDFLAGS) -all-static"
+endif
HOST_STYLE:= auto
HOST_CONFIGURE_ARGS+= --enable-static \
@@ -43,10 +46,12 @@ file-install:
${INSTALL_DIR} ${IDIR_FILE}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/file ${IDIR_FILE}/usr/bin
-libmagic-install:
+magic-install:
${INSTALL_DIR} ${IDIR_LIBMAGIC}/usr/share/misc
${INSTALL_DATA} ${WRKINST}/usr/share/misc/magic.mgc \
${IDIR_LIBMAGIC}/usr/share/misc
+
+libmagic-install:
${INSTALL_DIR} ${IDIR_LIBMAGIC}/usr/lib
${CP} ${WRKINST}/usr/lib/libmagic.so* ${IDIR_LIBMAGIC}/usr/lib
diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile
index 92a2ee9..25cedb0 100644
--- a/package/fontconfig/Makefile
+++ b/package/fontconfig/Makefile
@@ -18,10 +18,6 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include ${TOPDIR}/mk/host.mk
include ${TOPDIR}/mk/package.mk
diff --git a/package/freetype/Makefile b/package/freetype/Makefile
index 5270891..159189b 100644
--- a/package/freetype/Makefile
+++ b/package/freetype/Makefile
@@ -18,10 +18,6 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include ${TOPDIR}/mk/host.mk
include ${TOPDIR}/mk/package.mk
diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index befbacc..f26d70f 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -22,10 +22,6 @@ PKG_SUBPKGS:= FUSE_UTILS LIBFUSE
PKGSD_LIBFUSE:= filesystem in userspace library
PKGSC_LIBFUSE:= libs/misc
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,FUSE_UTILS,fuse-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/glib/Makefile b/package/glib/Makefile
index 00560e4..c91d647 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -18,10 +18,6 @@ PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/
PKG_NOPARALLEL:= 1
PKG_OPTS:= dev noscripts
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include ${TOPDIR}/mk/host.mk
include ${TOPDIR}/mk/package.mk
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index b6440e4..a74493e 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -25,22 +25,20 @@ INSTALL_STYLE:= manual
# compile nothing, glibc is already build in toolchain directory
do-install:
+ifneq ($(ADK_TARGET_USE_STATIC_LIBS),y)
${INSTALL_DIR} ${IDIR_GLIBC}/$(ADK_TARGET_LIBC_PATH)
$(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH)
for file in libc libcrypt libdl libm libnsl libresolv libutil libnss_dns libnss_files; do \
$(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \
$(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \
done
+endif
${INSTALL_DIR} $(IDIR_GLIBC)/usr/bin
$(CP) $(STAGING_TARGET_DIR)/usr/bin/getconf $(IDIR_GLIBC)/usr/bin
${INSTALL_DIR} ${IDIR_GLIBC}/etc
${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/gai.conf ${IDIR_GLIBC}/etc
${INSTALL_DATA} ./files/nsswitch.conf ${IDIR_GLIBC}/etc
-glibc-static-install:
- ${INSTALL_DIR} $(IDIR_GLIBC_STATIC)/usr/lib
- $(CP) $(STAGING_TARGET_DIR)/usr/lib/libc.a $(IDIR_GLIBC_STATIC)/usr/lib
-
glibc-dev-install:
${INSTALL_DIR} $(IDIR_GLIBC_DEV)/$(ADK_TARGET_LIBC_PATH) $(IDIR_GLIBC_DEV)/usr/lib
# install linker script
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index ff2196d..2598b11 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -29,10 +29,6 @@ PKG_FLAVOURS_LIBGNUTLS:= WITH_CRYPTODEV
PKGFD_WITH_CRYPTODEV:= enable support for cryptodev-linux
PKGFB_WITH_CRYPTODEV:= cryptodev-linux
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS},${PKG_OPTS}))
diff --git a/package/gpm/Makefile b/package/gpm/Makefile
index 1513bb2..0ab4c7f 100644
--- a/package/gpm/Makefile
+++ b/package/gpm/Makefile
@@ -17,10 +17,6 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,GPM,gpm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/gsm/Makefile b/package/gsm/Makefile
index 3b854e3..d490d9f 100644
--- a/package/gsm/Makefile
+++ b/package/gsm/Makefile
@@ -24,10 +24,6 @@ PKGSC_GSM_UTILS:= sys/misc
WRKDIST= ${WRKDIR}/${PKG_NAME}-1.0-pl10
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBGSM,libgsm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile
index 357e0b2..d35eefb 100644
--- a/package/gtk+/Makefile
+++ b/package/gtk+/Makefile
@@ -18,10 +18,6 @@ PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gtk+/$(PKG_EXTRAVER)/
PKG_LIBNAME:= libgtk
PKG_OPTS:= dev
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBGTK,libgtk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index 56f407b..8e81f7d 100644
--- a/package/heimdal/Makefile
+++ b/package/heimdal/Makefile
@@ -35,10 +35,6 @@ PKGCD_WITH_BDB:= use Berkeley DB as database backend
PKGCS_WITH_BDB:= libdb
PKGCB_WITH_BDB:= db
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
diff --git a/package/lame/Makefile b/package/lame/Makefile
index 7a0149b..1dee439 100644
--- a/package/lame/Makefile
+++ b/package/lame/Makefile
@@ -22,10 +22,6 @@ PKG_SUBPKGS:= LAME LIBMP3LAME
PKGSD_LIBMP3LAME:= mp3 encoding library
PKGSC_LIBMP3LAME:= libs/audio
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LAME,lame,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index 3b6334d..b5fe4b5 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -21,10 +21,6 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXau/Makefile b/package/libXau/Makefile
index 61db4c0..605eae7 100644
--- a/package/libXau/Makefile
+++ b/package/libXau/Makefile
@@ -16,10 +16,6 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXcomposite/Makefile b/package/libXcomposite/Makefile
index c3075bb..7803894 100644
--- a/package/libXcomposite/Makefile
+++ b/package/libXcomposite/Makefile
@@ -16,10 +16,6 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBXCOMPOSITE,libxcomposite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/libXdmcp/Makefile b/package/libXdmcp/Makefile
index 70aff9b..54fcd57 100644
--- a/package/libXdmcp/Makefile
+++ b/package/libXdmcp/Makefile
@@ -16,10 +16,6 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBXDMCP,libxdmcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/libXext/Makefile b/package/libXext/Makefile
index 640f7ed..9e5d221 100644
--- a/package/libXext/Makefile
+++ b/package/libXext/Makefile
@@ -16,10 +16,6 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXi/Makefile b/package/libXi/Makefile
index 8b2e627..2b366de 100644
--- a/package/libXi/Makefile
+++ b/package/libXi/Makefile
@@ -17,10 +17,6 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXrender/Makefile b/package/libXrender/Makefile
index 8bbbf86..ab6a207 100644
--- a/package/libXrender/Makefile
+++ b/package/libXrender/Makefile
@@ -18,10 +18,6 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
diff --git a/package/libcapi20/Makefile b/package/libcapi20/Makefile
index 84e03a5..17a993c 100644
--- a/package/libcapi20/Makefile
+++ b/package/libcapi20/Makefile
@@ -15,10 +15,6 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBCAPI20,libcapi20,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/liblzo/Makefile b/package/liblzo/Makefile
index 81f69f5..1b8f7df 100644
--- a/package/liblzo/Makefile
+++ b/package/liblzo/Makefile
@@ -16,10 +16,6 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include ${TOPDIR}/mk/host.mk
include ${TOPDIR}/mk/package.mk
diff --git a/package/libpng/Makefile b/package/libpng/Makefile
index 12f5bcf..37ebcdf 100644
--- a/package/libpng/Makefile
+++ b/package/libpng/Makefile
@@ -15,10 +15,6 @@ PKG_URL:= http://www.libpng.org/pub/png/libpng.html
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libpng/}
PKG_OPTS:= dev
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include ${TOPDIR}/mk/host.mk
include ${TOPDIR}/mk/package.mk
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index ae8512c..88d10d5 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -20,10 +20,6 @@ PKG_OPTS:= noremove
NO_DISTFILES:= 1
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBPTHREAD,libpthread,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/librt/Makefile b/package/librt/Makefile
index 7acd31f..4acf88e 100644
--- a/package/librt/Makefile
+++ b/package/librt/Makefile
@@ -17,10 +17,6 @@ PKG_OPTS:= noremove
NO_DISTFILES:= 1
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBRT,librt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/libssp/Makefile b/package/libssp/Makefile
index 4d714b3..09c363c 100644
--- a/package/libssp/Makefile
+++ b/package/libssp/Makefile
@@ -20,10 +20,6 @@ PKG_OPTS:= noremove
NO_DISTFILES:= 1
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBSSP,libssp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile
index c62a47f..b1e38af 100644
--- a/package/libtiff/Makefile
+++ b/package/libtiff/Makefile
@@ -17,10 +17,6 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index 547d458..6a7ff7e 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -18,10 +18,6 @@ PKG_OPTS:= dev
PKG_SUBPKGS:= LIBTOOL LIBLTDL
PKGSC_LIBLTDL:= libs/misc
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/host.mk
include ${TOPDIR}/mk/package.mk
diff --git a/package/libusb-compat/Makefile b/package/libusb-compat/Makefile
index 91ae03c..d38ca6a 100644
--- a/package/libusb-compat/Makefile
+++ b/package/libusb-compat/Makefile
@@ -16,10 +16,6 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBUSB_COMPAT,libusb-compat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/libusb/Makefile b/package/libusb/Makefile
index a445dcd..b3f73bb 100644
--- a/package/libusb/Makefile
+++ b/package/libusb/Makefile
@@ -14,10 +14,6 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libusbx/}
PKG_LIBNAME:= libusb
PKG_OPTS:= dev
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index f10b3e2..b4757fc 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -24,10 +24,6 @@ PKGSC_LIBXML2_PYTHON:= libs/misc
PKGSB_LIBXML2_PYTHON:= python2
PKGSS_LIBXML2_PYTHON:= python2
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/host.mk
include ${TOPDIR}/mk/package.mk
diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile
index 5cc1b17..fb75caa 100644
--- a/package/libxslt/Makefile
+++ b/package/libxslt/Makefile
@@ -22,10 +22,6 @@ PKG_SUBPKGS:= LIBXSLT XSLTPROC
PKGSD_XSLTPROC:= XSLT processor utility
PKGSC_XSLTPROC:= sys/misc
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/host.mk
include ${TOPDIR}/mk/package.mk
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index 34d6c69..b164140 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -25,10 +25,6 @@ PKGSC_BR2684CTL:= net/route
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBATM,libatm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/lm_sensors/Makefile b/package/lm_sensors/Makefile
index 5926100..1a7e77e 100644
--- a/package/lm_sensors/Makefile
+++ b/package/lm_sensors/Makefile
@@ -23,10 +23,6 @@ PKGSC_LM_SENSORS_DETECT:= sys/misc
PKGSS_LM_SENSORS_DETECT:= perl
PKGSB_LM_SENSORS_DETECT:= perl
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LM_SENSORS,lm-sensors,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index a090ff6..7c3ddd2 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -25,10 +25,6 @@ PKGSC_LIBDEVMAPPER:= libs/misc
DISTFILES:= LVM2.${PKG_VERSION}.tgz
WRKDIST= ${WRKDIR}/LVM2.${PKG_VERSION}
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/musl/Makefile b/package/musl/Makefile
index bc6b831..a440cd7 100644
--- a/package/musl/Makefile
+++ b/package/musl/Makefile
@@ -61,6 +61,7 @@ endif
# do nothing, musl is already build in toolchain directory
do-install:
+ifneq ($(ADK_TARGET_USE_STATIC_LIBS),y)
${INSTALL_DIR} $(IDIR_MUSL)/bin
${INSTALL_DIR} $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH)
$(CP) $(STAGING_TARGET_DIR)/usr/lib/libc.so $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH)
@@ -68,6 +69,7 @@ do-install:
ln -sf libc.so ld-musl-$(MARCH).so.1)
(cd $(IDIR_MUSL)/bin && \
ln -sf ../lib/ld-musl-$(MARCH).so.1 ldd)
+endif
musl-dev-install:
diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile
index 309df00..24a4aac 100644
--- a/package/net-snmp/Makefile
+++ b/package/net-snmp/Makefile
@@ -29,10 +29,6 @@ PKGSC_LIBNETSNMP:= libs/net
PKG_FLAVOURS_SNMPD:= WITH_IPV6
PKGFD_WITH_IPV6:= enable ipv6 support
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,SNMPD,snmpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/obexftp/Makefile b/package/obexftp/Makefile
index ed1af08..5c61163 100644
--- a/package/obexftp/Makefile
+++ b/package/obexftp/Makefile
@@ -22,16 +22,12 @@ PKGSD_LIBOBEXFTP:= obex ftp library
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,OBEXFTP,obexftp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,LIBOBEXFTP,libobexftp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBOBEXFTP},${PKGSC_LIBOBEXFTP},${PKG_OPTS}))
-ifeq ($(ADK_STATIC),y)
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y)
XAKE_FLAGS+= STATIC_CFLAGS=-all-static
endif
diff --git a/package/openct/Makefile b/package/openct/Makefile
index cf3f04d..88d5108 100644
--- a/package/openct/Makefile
+++ b/package/openct/Makefile
@@ -24,10 +24,6 @@ PKGSC_LIBOPENCT:= libs/crypto
PKGSS_LIBOPENCT:= libltdl libusb
PKGSB_LIBOPENCT:= libtool libusb
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,OPENCT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/openldap/Makefile b/package/openldap/Makefile
index 794da84..7e09cee 100644
--- a/package/openldap/Makefile
+++ b/package/openldap/Makefile
@@ -29,10 +29,6 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
PKG_FLAVOURS_OPENLDAP_SLAPD:= WITH_IPV6
PKGFD_WITH_IPV6:= enable IPv6 support
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBOPENLDAP,libopenldap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/openobex/Makefile b/package/openobex/Makefile
index c8c21dd..061f37a 100644
--- a/package/openobex/Makefile
+++ b/package/openobex/Makefile
@@ -15,10 +15,6 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,OPENOBEX,openobex,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/opensc/Makefile b/package/opensc/Makefile
index b6b1686..cf874a1 100644
--- a/package/opensc/Makefile
+++ b/package/opensc/Makefile
@@ -24,10 +24,6 @@ PKGSC_LIBOPENSC:= libs/crypto
PKGSS_LIBOPENSC:= libltdl
PKGSB_LIBOPENSC:= libtool
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,OPENSC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index a9836ff..3c41f0f 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -26,10 +26,6 @@ PKGSS_OPENSSL_UTIL:= libopenssl
PKG_FLAVOURS_LIBOPENSSL:= WITH_CRYPTODEV
PKGFD_WITH_CRYPTODEV:= enable support for cryptodev-linux
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS)))
diff --git a/package/pango/Makefile b/package/pango/Makefile
index d818fad..4cf4d25 100644
--- a/package/pango/Makefile
+++ b/package/pango/Makefile
@@ -16,10 +16,6 @@ PKG_URL:= http://www.pango.org/
PKG_SITES:= ${MASTER_SITE_GNOME:=pango/1.36/}
PKG_OPTS:= dev
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include ${TOPDIR}/mk/host.mk
include ${TOPDIR}/mk/package.mk
diff --git a/package/pcre/Makefile b/package/pcre/Makefile
index 94d661c..a093f6f 100644
--- a/package/pcre/Makefile
+++ b/package/pcre/Makefile
@@ -20,10 +20,6 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= LIBPCRE LIBPCRECPP
PKGSD_LIBPCRECPP:= PCRE c++ library
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/host.mk
include ${TOPDIR}/mk/package.mk
diff --git a/package/pixman/Makefile b/package/pixman/Makefile
index 97c397b..f493ef9 100644
--- a/package/pixman/Makefile
+++ b/package/pixman/Makefile
@@ -16,10 +16,6 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
diff --git a/package/popt/Makefile b/package/popt/Makefile
index 0d6cc55..49965ea 100644
--- a/package/popt/Makefile
+++ b/package/popt/Makefile
@@ -17,10 +17,6 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBPOPT,libpopt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile
index 87291ae..67eb51d 100644
--- a/package/rrdtool/Makefile
+++ b/package/rrdtool/Makefile
@@ -28,10 +28,6 @@ PKGSD_RRDCGI:= RRD CGI
PKGSC_RRDTOOL:= sys/misc
PKGSD_RRDTOOL:= RRD tool
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBRRD,librrd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile
index 37deed9..5267e5f 100644
--- a/package/sqlite/Makefile
+++ b/package/sqlite/Makefile
@@ -22,10 +22,6 @@ PKG_SUBPKGS:= SQLITE_CLI LIBSQLITE
PKGSD_LIBSQLITE:= emeddable sql library
PKGSC_LIBSQLITE:= libs/db
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBSQLITE,libsqlite,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSQLITE},${PKGSC_LIBSQLITE},${PKG_OPTS}))
diff --git a/package/tzdata/Makefile b/package/tzdata/Makefile
index aef0208..c10357d 100644
--- a/package/tzdata/Makefile
+++ b/package/tzdata/Makefile
@@ -13,6 +13,8 @@ PKG_URL:= http://www.iana.org/time-zones/
PKG_SITES:= http://www.iana.org/time-zones/repository/releases/
PKG_NOPARALLEL:= 1
+PKG_LIBC_DEPENDS:= glibc musl
+
DISTFILES:= ${PKG_NAME}${PKG_VERSION}.tar.gz tzcode${PKG_VERSION}.tar.gz
# both archives do not extract into subdirectories
WRKDIST= ${WRKDIR}
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
index 7a76233..0c5daf2 100644
--- a/package/uclibc/Makefile
+++ b/package/uclibc/Makefile
@@ -31,6 +31,7 @@ do-install:
test -z $(ADK_RUNTIME_TIMEZONE) || \
grep $(ADK_RUNTIME_TIMEZONE) ./files/tz.lst | \
cut -f 2 > $(IDIR_UCLIBC)/etc/TZ
+ifneq ($(ADK_TARGET_USE_STATIC_LIBS),y)
$(CP) $(STAGING_TARGET_DIR)/lib/libc.so.* $(IDIR_UCLIBC)/$(ADK_TARGET_LIBC_PATH)
$(CP) $(STAGING_TARGET_DIR)/lib/libuClibc-$(GIT_VERSION).so \
$(IDIR_UCLIBC)/$(ADK_TARGET_LIBC_PATH)
@@ -42,6 +43,7 @@ do-install:
$(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(GIT_VERSION).so \
$(IDIR_UCLIBC)/$(ADK_TARGET_LIBC_PATH); \
done
+endif
uclibc-dev-install:
${INSTALL_DIR} ${IDIR_UCLIBC_DEV}/usr/lib ${IDIR_UCLIBC_DEV}/$(ADK_TARGET_LIBC_PATH)
diff --git a/package/v4l-utils/Makefile b/package/v4l-utils/Makefile
index 814489b..af3f618 100644
--- a/package/v4l-utils/Makefile
+++ b/package/v4l-utils/Makefile
@@ -21,10 +21,6 @@ PKG_SUBPKGS:= V4L_UTILS LIBV4L
PKGSC_LIBV4L:= libs/video
PKGSD_LIBV4L:= Video4Linux2 libraries
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,V4L_UTILS,v4l-utils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/x11vnc/Makefile b/package/x11vnc/Makefile
index 0ddc536..f728dbe 100644
--- a/package/x11vnc/Makefile
+++ b/package/x11vnc/Makefile
@@ -20,7 +20,7 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,X11VNC,x11vnc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-ifeq ($(ADK_STATIC),y)
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y)
MAKE_FLAGS+= CFLAGS="${TARGET_CFLAGS} -static" \
LIBS="-lxcb -lXau -lXdmcp -ldl -pthread -ljpeg -lz"
endif
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index d0a991f..7c3b567 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -15,10 +15,6 @@ PKG_OPTS:= dev
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,zlib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain
index 9118278..f4dc90f 100644
--- a/target/config/Config.in.toolchain
+++ b/target/config/Config.in.toolchain
@@ -116,11 +116,11 @@ config ADK_DEBUG_STRIP
help
All packages and C library will be compiled with debug information, but stripped for the target.
-config ADK_STATIC
+config ADK_TARGET_USE_STATIC_LIBS
bool "Link applications statically by default"
default n
select BUSYBOX_STATIC
help
- Useful for toolchain only target devices.
+ Useful for debugging of dynamic linker problems.
endmenu