From 0d5a4bd73159fc794fdb417d49ab810b26e7d059 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 31 May 2014 19:58:50 +0200 Subject: rework static linking support, works with musl/glibc, fails to boot with uclibc (qemu-x86) --- mk/build.mk | 2 +- mk/package.mk | 12 ++++++++++-- mk/vars.mk | 2 +- package/atk/Makefile | 4 ---- package/avahi/Makefile | 4 ---- package/axtls/Makefile | 4 ---- package/bind/Makefile | 4 ---- package/binutils/Makefile | 4 ---- package/bluez/Makefile | 2 +- package/bzip2/Makefile | 4 ---- package/cairo/Makefile | 4 ---- package/curl/Makefile | 4 ---- package/dbus/Makefile | 4 ---- package/esound/Makefile | 4 ---- package/eudev/Makefile | 4 ---- package/expat/Makefile | 4 ---- package/ffmpeg/Makefile | 4 ---- package/file/Makefile | 19 ++++++++++++------- package/fontconfig/Makefile | 4 ---- package/freetype/Makefile | 4 ---- package/fuse/Makefile | 4 ---- package/glib/Makefile | 4 ---- package/glibc/Makefile | 6 ++---- package/gnutls/Makefile | 4 ---- package/gpm/Makefile | 4 ---- package/gsm/Makefile | 4 ---- package/gtk+/Makefile | 4 ---- package/heimdal/Makefile | 4 ---- package/lame/Makefile | 4 ---- package/libX11/Makefile | 4 ---- package/libXau/Makefile | 4 ---- package/libXcomposite/Makefile | 4 ---- package/libXdmcp/Makefile | 4 ---- package/libXext/Makefile | 4 ---- package/libXi/Makefile | 4 ---- package/libXrender/Makefile | 4 ---- package/libcapi20/Makefile | 4 ---- package/liblzo/Makefile | 4 ---- package/libpng/Makefile | 4 ---- package/libpthread/Makefile | 4 ---- package/librt/Makefile | 4 ---- package/libssp/Makefile | 4 ---- package/libtiff/Makefile | 4 ---- package/libtool/Makefile | 4 ---- package/libusb-compat/Makefile | 4 ---- package/libusb/Makefile | 4 ---- package/libxml2/Makefile | 4 ---- package/libxslt/Makefile | 4 ---- package/linux-atm/Makefile | 4 ---- package/lm_sensors/Makefile | 4 ---- package/lvm/Makefile | 4 ---- package/musl/Makefile | 2 ++ package/net-snmp/Makefile | 4 ---- package/obexftp/Makefile | 6 +----- package/openct/Makefile | 4 ---- package/openldap/Makefile | 4 ---- package/openobex/Makefile | 4 ---- package/opensc/Makefile | 4 ---- package/openssl/Makefile | 4 ---- package/pango/Makefile | 4 ---- package/pcre/Makefile | 4 ---- package/pixman/Makefile | 4 ---- package/popt/Makefile | 4 ---- package/rrdtool/Makefile | 4 ---- package/sqlite/Makefile | 4 ---- package/tzdata/Makefile | 2 ++ package/uclibc/Makefile | 2 ++ package/v4l-utils/Makefile | 4 ---- package/x11vnc/Makefile | 2 +- package/zlib/Makefile | 4 ---- target/config/Config.in.toolchain | 4 ++-- 71 files changed, 37 insertions(+), 260 deletions(-) diff --git a/mk/build.mk b/mk/build.mk index a5d5d1c57..929dfdee1 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 0025f802c..d468d6ed0 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 f1bf2be48..bd77f391f 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 7c54346aa..2c9d8ae88 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 99687297c..3aa682058 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 164d79045..456b0a51c 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 965c11874..47c513229 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 a0f459b95..b0c471e7d 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 3a57cb9a5..579cff571 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 61e58e18c..2e3dde534 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 177a4a4ad..47728289f 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 0a03090ed..eb1d7bf97 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 65ef43b2f..b682778a6 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 02c72fec9..0c2a2a670 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 cf1688002..25986650a 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 126a6b742..61e60ff61 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 930b1f466..e7f3493f3 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 7b47a6530..2a3ab16cf 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 92a2ee997..25cedb0f1 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 5270891e9..159189b56 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 befbacc97..f26d70f82 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 00560e4be..c91d6479c 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 b6440e479..a74493e23 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 ff2196d2a..2598b11cc 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 1513bb21a..0ab4c7fe5 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 3b854e3ec..d490d9f1d 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 357e0b284..d35eefb11 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 56f407b35..8e81f7d60 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 7a0149bd7..1dee4394f 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 3b6334da3..b5fe4b57b 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 61db4c086..605eae7db 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 c3075bb49..7803894ba 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 70aff9bad..54fcd57b5 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 640f7ed50..9e5d221fa 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 8b2e62727..2b366dee1 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 8bbbf8677..ab6a20791 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 84e03a595..17a993c5f 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 81f69f5bf..1b8f7dfda 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 12f5bcfc6..37ebcdf26 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 ae8512cda..88d10d561 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 7acd31f3d..4acf88efb 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 4d714b346..09c363cb8 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 c62a47fab..b1e38af8c 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 547d45826..6a7ff7e1a 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 91ae03c32..d38ca6a27 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 a445dcdd7..b3f73bb47 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 f10b3e2b3..b4757fc55 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 5cc1b17c7..fb75caaab 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 34d6c6972..b16414086 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 59261005e..1a7e77ed3 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 a090ff62c..7c3ddd220 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 bc6b831aa..a440cd7d4 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 309df001a..24a4aaccb 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 ed1af086e..5c6116342 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 cf3f04d34..88d5108a7 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 794da84e7..7e09ceeba 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 c8c21dd6f..061f37a27 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 b6b16863d..cf874a126 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 a9836ffe9..3c41f0f74 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 d818fad4c..4cf4d25ad 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 94d661c21..a093f6fb0 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 97c397b0f..f493ef9ba 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 0d6cc551a..49965eab6 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 87291ae08..67eb51d29 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 37deed9d7..5267e5f51 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 aef020895..c10357d3f 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 7a76233b8..0c5daf272 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 814489b8a..af3f6188c 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 0ddc53651..f728dbe82 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 d0a991f65..7c3b567ad 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 91182782a..f4dc90f5d 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 -- cgit v1.2.3