From: Nicolas Thill <nico@openwrt.org>
Date: Wed, 10 Aug 2005 16:13:43 +0000 (+0000)
Subject: Fix building when host and target systems are same arch, Always disable readline... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=26cfd9fa56ef6b531d3ed17fa5776501b840fd42;p=openwrt%2Fstaging%2Fzorun.git

Fix building when host and target systems are same arch, Always disable readline support

SVN-Revision: 1599
---

diff --git a/openwrt/package/osiris/Makefile b/openwrt/package/osiris/Makefile
index b119f6e039..152fcf46e5 100644
--- a/openwrt/package/osiris/Makefile
+++ b/openwrt/package/osiris/Makefile
@@ -23,7 +23,7 @@ $(PKG_BUILD_DIR)/.configured:
 		$(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_openssldir="$(STAGING_DIR)/usr" \
 		ac_cv_have_accrights_in_msghdr=no \
 		ac_cv_have_control_in_msghdr=yes \
@@ -49,6 +49,7 @@ $(PKG_BUILD_DIR)/.configured:
 		  $(DISABLE_NLS) \
 		  --with-osiris-user=root \
 		  --with-root-dir=/var/lib/osiris \
+		  --with-readline=no \
 	);
 	touch $@
 
@@ -56,6 +57,8 @@ $(PKG_BUILD_DIR)/.built:
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		ar=$(TARGET_CROSS)ar \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		INTERACTIVE=0 \
 		all install