rework static linking support, works with musl/glibc, fails to boot with uclibc (qemu-x86)

67 files changed, 23 insertions, 254 deletions

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+=