aboutsummaryrefslogtreecommitdiff
path: root/package/Makefile.in
diff options
context:
space:
mode:
authorGravatar Lionel Landwerlin <llandwerlin@gmail.com>2010-05-01 14:10:28 +0200
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2010-05-03 13:37:11 +0200
commit0d1830b07db4ebfd14e77a258de6fb391e57e960 (patch)
tree8dd7a572646a76fc1804f46bd041fd8b90643ddf /package/Makefile.in
parentd39641ccd64b82494716e4bf35ac5d0c8fa67201 (diff)
downloadbuildroot-0d1830b07db4ebfd14e77a258de6fb391e57e960.tar.gz
buildroot-0d1830b07db4ebfd14e77a258de6fb391e57e960.tar.bz2
package: Add $(HOST_DIR)/usr/lib to LD_LIBRARY_PATH for host but not target
Some packages like icu requires to be compiled against the host system first to be able to compile against the target. This is due to the usage of self generated binaries by the package to build itself. When the generated tools also depends on generated libraries it is required to add the path to these libraries in the library path (LD_LIBRARY_PATH) especially for the configure step. Adding $(HOST_DIR)/usr/lib to LD_LIBRARY_PATH for target compilation might break the link step by mixing host libraries and target binaries. Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/Makefile.in')
-rw-r--r--package/Makefile.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/package/Makefile.in b/package/Makefile.in
index acba382b36..eab9168707 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -210,7 +210,6 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
PERLLIB="$(HOST_DIR)/usr/lib/perl" \
- LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib" \
STAGING_DIR="$(STAGING_DIR)"
TARGET_CONFIGURE_ENV=\
@@ -220,7 +219,6 @@ TARGET_CONFIGURE_ENV=\
FCFLAGS="$(TARGET_FCFLAGS)" \
TARGET_MAKE_ENV=PATH=$(TARGET_PATH) \
- LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)" \
PERLLIB="$(HOST_DIR)/usr/lib/perl"
HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
@@ -258,9 +256,12 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
ORIGINAL_LD_FOR_TARGET="$(TARGET_LD)" \
ORIGINAL_NM_FOR_TARGET="$(TARGET_NM)" \
ORIGINAL_OBJDUMP_FOR_TARGET="$(TARGET_OBJDUMP)" \
+ PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
+ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig" \
- PERLLIB="$(HOST_DIR)/usr/lib/perl"
+ PERLLIB="$(HOST_DIR)/usr/lib/perl" \
+ LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)"
HOST_MAKE_ENV=PATH=$(HOST_PATH) \
LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)" \