* [Buildroot] [pull request] Pull request for branch for-2012.05/static-libs
@ 2012-04-23 21:45 Thomas Petazzoni
2012-04-23 21:45 ` [Buildroot] [PATCH 1/1] external-toolchain: do not copy shared libraries when BR2_PREFER_STATIC_LIB=y Thomas Petazzoni
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Petazzoni @ 2012-04-23 21:45 UTC (permalink / raw)
To: buildroot
The following changes since commit f00424cff00bdabd54350eb82deb908676e86a1d:
uClibc: 0.9.33.1: fix version (soname) number (2012-04-23 09:26:13 +0200)
are available in the git repository at:
git://git.free-electrons.com/users/thomas-petazzoni/buildroot.git for-2012.05/static-libs
Thomas Petazzoni (1):
external-toolchain: do not copy shared libraries when BR2_PREFER_STATIC_LIB=y
toolchain/toolchain-external/ext-tool.mk | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
Thanks,
--
Thomas Petazzoni
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] external-toolchain: do not copy shared libraries when BR2_PREFER_STATIC_LIB=y
2012-04-23 21:45 [Buildroot] [pull request] Pull request for branch for-2012.05/static-libs Thomas Petazzoni
@ 2012-04-23 21:45 ` Thomas Petazzoni
2012-04-29 18:33 ` Peter Korsgaard
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Petazzoni @ 2012-04-23 21:45 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
toolchain/toolchain-external/ext-tool.mk | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 0a997a5..a45603a 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -372,13 +372,15 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
ARCH_LIB_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:.*/usr/(lib(64)?)/(.*/)?libc.a:\1:'` ; \
ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR}(.*)/$$:\1:"` ; \
mkdir -p $(TARGET_DIR)/lib ; \
- echo "Copy external toolchain libraries to target..." ; \
- for libs in $(LIB_EXTERNAL_LIBS); do \
- $(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$${ARCH_LIB_DIR},$$libs,/lib); \
- done ; \
- for libs in $(USR_LIB_EXTERNAL_LIBS); do \
- $(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$${ARCH_LIB_DIR},$$libs,/usr/lib); \
- done ; \
+ if test -z "$(BR2_PREFER_STATIC_LIB)" ; then \
+ echo "Copy external toolchain libraries to target..." ; \
+ for libs in $(LIB_EXTERNAL_LIBS); do \
+ $(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$${ARCH_LIB_DIR},$$libs,/lib); \
+ done ; \
+ for libs in $(USR_LIB_EXTERNAL_LIBS); do \
+ $(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$${ARCH_LIB_DIR},$$libs,/usr/lib); \
+ done ; \
+ fi ; \
echo "Copy external toolchain sysroot to staging..." ; \
$(call copy_toolchain_sysroot,$${SYSROOT_DIR},$${ARCH_SYSROOT_DIR},$${ARCH_SUBDIR},$${ARCH_LIB_DIR}) ; \
if [ -L $${ARCH_SYSROOT_DIR}/lib64 ] ; then \
--
1.7.5.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] external-toolchain: do not copy shared libraries when BR2_PREFER_STATIC_LIB=y
2012-04-23 21:45 ` [Buildroot] [PATCH 1/1] external-toolchain: do not copy shared libraries when BR2_PREFER_STATIC_LIB=y Thomas Petazzoni
@ 2012-04-29 18:33 ` Peter Korsgaard
0 siblings, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2012-04-29 18:33 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-04-29 18:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-23 21:45 [Buildroot] [pull request] Pull request for branch for-2012.05/static-libs Thomas Petazzoni
2012-04-23 21:45 ` [Buildroot] [PATCH 1/1] external-toolchain: do not copy shared libraries when BR2_PREFER_STATIC_LIB=y Thomas Petazzoni
2012-04-29 18:33 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox