From cd3cf32668979e1318647dab352dd075311fabff Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 10 Aug 2005 16:06:24 +0000
Subject: Fix building when host and target systems are same arch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1597 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
package/bluez-libs/Makefile | 3 ++-
package/glib/Makefile | 1 +
package/libosip2/Makefile | 2 +-
package/openldap/Makefile | 4 ++--
package/snort/Makefile | 2 +-
5 files changed, 7 insertions(+), 5 deletions(-)
(limited to 'package')
diff --git a/package/bluez-libs/Makefile b/package/bluez-libs/Makefile
index 6a6559084..17ac5a116 100644
--- a/package/bluez-libs/Makefile
+++ b/package/bluez-libs/Makefile
@@ -27,7 +27,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
- LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+ LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
sys_lib_dlsearch_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
sys_lib_search_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
./configure \
@@ -81,6 +81,7 @@ $(STAGING_DIR)/usr/lib/libbluetooth.so: $(PKG_BUILD_DIR)/.built
install-dev: $(STAGING_DIR)/usr/lib/libbluetooth.so
uninstall-dev:
+ rm -rf $(STAGING_DIR)/usr/include/bluetooth
rm -rf $(STAGING_DIR)/usr/lib/libbluetooth.{a,so*}
compile: install-dev
diff --git a/package/glib/Makefile b/package/glib/Makefile
index 473e8b635..cbbd48678 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -48,6 +48,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
glib_cv_byte_contents_gmutex="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
+ LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
diff --git a/package/libosip2/Makefile b/package/libosip2/Makefile
index d4e6d6151..bf7a224f0 100644
--- a/package/libosip2/Makefile
+++ b/package/libosip2/Makefile
@@ -26,7 +26,7 @@ $(PKG_BUILD_DIR)/.configured:
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(strip $(TARGET_CFLAGS))" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
- LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+ LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
diff --git a/package/openldap/Makefile b/package/openldap/Makefile
index 35a15b37e..20179b271 100644
--- a/package/openldap/Makefile
+++ b/package/openldap/Makefile
@@ -78,7 +78,7 @@ $(PKG_BUILD_DIR)/.built:
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
- LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+ LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
ac_cv_func_memcmp_clean="yes" \
./configure \
--target=$(GNU_TARGET_NAME) \
@@ -128,7 +128,7 @@ $(STAGING_DIR)/usr/lib/libldap.so: $(PKG_BUILD_DIR)/.built
cp -fpR $(PKG_INSTALL_DIR)/usr/include/{lber,ldap}*.h $(STAGING_DIR)/usr/include/
mkdir -p $(STAGING_DIR)/usr/lib/
cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.{a,so*} $(STAGING_DIR)/usr/lib/
- touch $(STAGING_DIR)/usr/lib/libldap.so
+ touch $@
install-dev: $(STAGING_DIR)/usr/lib/libldap.so
diff --git a/package/snort/Makefile b/package/snort/Makefile
index c58fa75e8..630ac127e 100644
--- a/package/snort/Makefile
+++ b/package/snort/Makefile
@@ -100,7 +100,7 @@ $(PKG_BUILD_DIR)/$(2): $(PKG_BUILD_DIR)/.prepared
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/mysql" \
- LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/mysql" \
+ LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/mysql" \
./configure \
$(PKG_CONFIGURE_OPTS) \
$$($(1)_CONFIGURE_OPTS) \
--
cgit v1.2.3