NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

host-pkgconf: use --static option for static builds

Browse Source 
Detect when BR2_PREFER_STATIC_LIBS is selected and modify the host
pkg-config wrapper to append the --static option in that case.

Fixes:
   http://autobuild.buildroot.net/results/161/161446dde7e8e774773eb2b34fd555f5ac22dd02/

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Tested-by: Baruch Siach <baruch@tkos.co.il>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Vicente Olivert Riera 2014-03-05 12:19:37 +00:00 committed by Peter Korsgaard
parent fcb5b619f8
commit 958c9438cc
2 changed files with 15 additions and 1 deletions

2
package/pkgconf/pkg-config.in
View File

@ -1,2 +1,2 @@
#!/bin/sh
PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-@PKG_CONFIG_LIBDIR@} PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:-@STAGING_DIR@} $(dirname $0)/pkgconf $@
PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-@PKG_CONFIG_LIBDIR@} PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:-@STAGING_DIR@} $(dirname $0)/pkgconf @STATIC@ $@

14
package/pkgconf/pkgconf.mk
View File

@ -24,8 +24,22 @@ define HOST_PKGCONF_INSTALL_WRAPPER
$(HOST_DIR)/usr/bin/pkg-config
endef
define HOST_PKGCONF_STATIC
$(SED) 's,@STATIC@,--static,' $(HOST_DIR)/usr/bin/pkg-config
endef
define HOST_PKGCONF_SHARED
$(SED) 's,@STATIC@,,' $(HOST_DIR)/usr/bin/pkg-config
endef
PKGCONF_POST_INSTALL_TARGET_HOOKS += PKGCONF_LINK_PKGCONFIG
HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_INSTALL_WRAPPER
ifeq ($(BR2_PREFER_STATIC_LIB),y)
HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_STATIC
else
HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_SHARED
endif
$(eval $(autotools-package))
$(eval $(host-autotools-package))