fix some packages, when static build is choosen

5 files changed, 31 insertions, 10 deletions

diff --git a/package/libpthread-stubs/Makefile b/package/libpthread-stubs/Makefile
index cd4834663..c3d68668b 100644
--- a/package/libpthread-stubs/Makefile
+++ b/package/libpthread-stubs/Makefile
@@ -22,6 +22,10 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,LIBPTHREAD_STUBS,libpthread-stubs,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBPTHREAD_STUBS,libpthread-stubs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y)
+TARGET_LDFLAGS+=	-pthread
+endif
+
 HOST_STYLE:=		auto
 
 include ${TOPDIR}/mk/host-bottom.mk
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index 084e2b283..cad3dba1a 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -26,7 +26,14 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_ENV+=		ac_cv_linux_vers=2
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y)
+CONFIGURE_ARGS+=	--with-static
+else
+CONFIGURE_ARGS+=	--with-shared
+endif
+
+CONFIGURE_ENV+=		ac_cv_linux_vers=2 \
+			PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig
 CONFIGURE_ARGS+=	--without-cxx \
 			--without-cxx-binding \
 			--with-build-cc=${HOST_CC} \
@@ -35,7 +42,6 @@ CONFIGURE_ARGS+=	--without-cxx \
 			--enable-symlinks \
 			--without-ada \
 			--without-normal \
-			--with-shared \
 			--enable-pc-files \
 			--with-termlib \
 			--without-debug \
diff --git a/package/pam/Makefile b/package/pam/Makefile
index 951307a9b..f08384a7b 100644
--- a/package/pam/Makefile
+++ b/package/pam/Makefile
@@ -28,8 +28,10 @@ CONFIGURE_ARGS+=	--disable-nis \
 			--enable-db=no
 
 post-install:
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS),)
 	# /lib is not automatically installed to staging area
 	$(CP) $(WRKINST)/lib/libpam*.so* $(STAGING_TARGET_DIR)/usr/lib
+endif
 
 pam-install:
 	$(INSTALL_DIR) $(IDIR_PAM)/etc/security
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 3f2b101c8..a0e885020 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -52,26 +52,32 @@ $(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},$
 $(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LOSETUP},${PKGSD_LOSETUP},${PKGSC_LOSETUP}))
 $(eval $(call PKG_template,MOUNT,mount,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_MOUNT},${PKGSD_MOUNT},${PKGSC_MOUNT}))
 $(eval $(call PKG_template,MCOOKIE,mcookie,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MCOOKIE},${PKGSC_MCOOKIE}))
-$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUUID},${PKGSC_LIBUUID}))
-$(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBBLKID},${PKGSC_LIBBLKID}))
-$(eval $(call PKG_template,LIBMOUNT,libmount,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBMOUNT},${PKGSC_LIBMOUNT}))
+$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUUID},${PKGSC_LIBUUID},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBBLKID},${PKGSC_LIBBLKID},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBMOUNT,libmount,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBMOUNT},${PKGSC_LIBMOUNT},${PKG_OPTS}))
 
 TARGET_CFLAGS+=		-DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK
 TARGET_LDFLAGS+=	-ltinfo
 AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ENV+=		have_scanf_alloc_modifier=yes \
 			scanf_cv_alloc_modifier=ms
+
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y)
+CONFIGURE_ARGS+=	--disable-su
+CONFIGURE_ARGS+=	--disable-runuser
+else
+CONFIGURE_ARGS+=	--enable-su
+endif
+
 CONFIGURE_ARGS+=	--disable-use-tty-group \
 			--disable-schedutils \
 			--disable-cramfs \
 			--disable-login \
 			--disable-eject \
-			--enable-su \
 			--enable-libuuid \
 			--enable-libblkid \
 			--enable-libmount \
-			--enable-mount \
-			--with-ncurses=$(STAGING_TARGET_DIR)/usr/include
+			--enable-mount
 FAKE_FLAGS+=		INSTALLSUID="install -m 4755"
 
 fdisk-install:
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 7c3b567ad..06e7cf2c2 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -22,11 +22,14 @@ $(eval $(call PKG_template,ZLIB,zlib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS
 CONFIG_STYLE:=		manual
 CONFIGURE_ENV+=		uname=Linux
 
-ifeq ($(ADK_STATIC),)
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS),)
 CONFIGURE_OPTS:=	--shared
 endif
 
-ALL_TARGET:=		libz.a libz.so.$(PKG_VERSION)
+ALL_TARGET:=		libz.a 
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS),)
+ALL_TARGET+=		libz.so.$(PKG_VERSION)
+endif
 
 do-configure:
 	(cd $(WRKBUILD); \