static linking is very package dependent, so do not handle it globally

5 files changed, 31 insertions, 8 deletions

diff --git a/mk/vars.mk b/mk/vars.mk
index 7b9bbe462..a7c6e30b3 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -79,12 +79,6 @@ TARGET_CFLAGS:=		$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts
 TARGET_LDFLAGS:=
 endif
 
-ifneq ($(ADK_STATIC),)
-TARGET_CFLAGS+=		-static
-TARGET_CXXFLAGS+=	-static
-TARGET_LDFLAGS+=	-static
-endif
-
 ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),)
 TARGET_CFLAGS+=		-fstack-protector
 TARGET_CXXFLAGS+=	-fstack-protector
diff --git a/package/libX11/patches/patch-src_util_Makefile_in b/package/libX11/patches/patch-src_util_Makefile_in
index a92899818..2c1689069 100644
--- a/package/libX11/patches/patch-src_util_Makefile_in
+++ b/package/libX11/patches/patch-src_util_Makefile_in
@@ -1,5 +1,5 @@
 --- libX11-1.4.0.orig/src/util/Makefile.in	2010-11-21 23:15:55.000000000 +0100
-+++ libX11-1.4.0/src/util/Makefile.in	2011-01-24 16:37:00.000000000 +0100
++++ libX11-1.4.0/src/util/Makefile.in	2011-04-28 22:56:41.000000000 +0200
 @@ -262,7 +262,6 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
@@ -8,3 +8,18 @@
  	$(CWARNFLAGS)
  
  EXTRA_DIST = mkks.sh
+@@ -351,12 +350,12 @@ distclean-compile:
+ @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ 
+ makekeys-makekeys.o: makekeys.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.o -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -MT makekeys-makekeys.o -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
+ @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/makekeys-makekeys.Tpo $(DEPDIR)/makekeys-makekeys.Po
+ @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='makekeys.c' object='makekeys-makekeys.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
+ 
+ makekeys-makekeys.obj: makekeys.c
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.obj -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
diff --git a/package/libXi/Makefile b/package/libXi/Makefile
index 19e9325a4..bdf1c54c8 100644
--- a/package/libXi/Makefile
+++ b/package/libXi/Makefile
@@ -13,9 +13,13 @@ PKG_BUILDDEP:=		xproto xextproto libXext
 PKG_URL:=		http://xorg.freedesktop.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXI,libxi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXI,libxi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS)))
 
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 64a71f7d8..0ce3b3f52 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -75,6 +75,11 @@ CONFIGURE_ARGS+=	--disable-strip \
 			--with-privsep-path=/var/run/sshd \
 			--with-ssl-dir="${STAGING_TARGET_DIR}/usr"
 
+ifeq ($(ADK_STATIC),y)
+TARGET_CFLAGS+=		-static
+TARGET_LDFLAGS+=	-static
+endif
+
 openssh-install:
 	${INSTALL_DIR} ${IDIR_OPENSSH}/etc/ssh
 	chmod 0700 ${IDIR_OPENSSH}/etc/ssh
diff --git a/package/x11vnc/Makefile b/package/x11vnc/Makefile
index e6649892d..74e01e1f7 100644
--- a/package/x11vnc/Makefile
+++ b/package/x11vnc/Makefile
@@ -17,6 +17,11 @@ 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)
+MAKE_FLAGS+=		CFLAGS="${TARGET_CFLAGS} -static" \
+			LIBS="-lxcb -lXau -lXdmcp -ldl -pthread -ljpeg -lz"
+endif
+
 CONFIGURE_ARGS+=	--without-ssl
 
 x11vnc-install: