Fix building when host and target systems are same arch,
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Wed, 10 Aug 2005 16:13:43 +0000 (16:13 +0000)
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Wed, 10 Aug 2005 16:13:43 +0000 (16:13 +0000)
Always disable readline support

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1599 3c298f89-4303-0410-b956-a3cf2f4a3e73

package/osiris/Makefile

index b119f6e..152fcf4 100644 (file)
@@ -23,7 +23,7 @@ $(PKG_BUILD_DIR)/.configured:
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
                $(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 \
                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 \
                  $(DISABLE_NLS) \
                  --with-osiris-user=root \
                  --with-root-dir=/var/lib/osiris \
+                 --with-readline=no \
        );
        touch $@
 
        );
        touch $@
 
@@ -56,6 +57,8 @@ $(PKG_BUILD_DIR)/.built:
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
        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
                DESTDIR="$(PKG_INSTALL_DIR)" \
                INTERACTIVE=0 \
                all install
This page took 0.024464 seconds and 4 git commands to generate.