summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-08-10 16:13:43 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-08-10 16:13:43 +0000
commit3750c44c0ee03d7d514ec359c7c77ed5b9d966eb (patch)
treeb66baac79efc4b1150ed7ece63d2241f54a3e606
parent3a6a7aeadaa711e91e08fbdc5fda15ab25142f63 (diff)
Fix building when host and target systems are same arch,
Always disable readline support git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1599 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--openwrt/package/osiris/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/openwrt/package/osiris/Makefile b/openwrt/package/osiris/Makefile
index b119f6e03..152fcf46e 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