Changeset 144

Show
Ignore:
Timestamp:
06/19/06 02:30:25 (2 years ago)
Author:
tg
Message:

use the GNU sed built by toolchain again, but prevent it
from picking up I18N support (causes it to segfault at
least under mirbsd - GNU libregex clashes)

ok wbx@

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/Makefile

    r139 r144  
    117117                chmod 555 lbin/uname; \ 
    118118        fi 
    119         @if ! sed --help 2>&1 | fgrep in-place >/dev/null 2>&1; then \ 
    120                 cp scripts/sed.bsd lbin/sed; \ 
    121                 chmod 555 lbin/sed; \ 
    122         fi 
    123119        @echo "BASH=$$(which bash)" >>lbin/prereq.mk 
    124120        @echo "GNU_HOST_NAME=$$(${CC} -dumpmachine | sed -e 's!mirbsd!openbsd!g')" >>lbin/prereq.mk 

  • trunk/freewrt/rules.mk

    r141 r144  
    110110STRIP:=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-strip 
    111111PATCH=$(SCRIPT_DIR)/patch-kernel.sh 
    112 ifeq ($(shell [[ "$(OStype)" = *BSD ]] && echo 1),) 
    113112SED:=$(STAGING_DIR)/bin/sed -i -e 
    114 else 
    115 SED:=$(TOPDIR)/lbin/sed -i -e 
    116 endif 
    117113LINUX_DIR:=$(BUILD_DIR)/linux 
    118114LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux 

  • trunk/freewrt/toolchain/Makefile

    r113 r144  
    22include $(TOPDIR)/rules.mk 
    33 
    4 ifeq ($(shell [[ "$(OStype)" = *BSD ]] && echo 1),) 
    54BUILD_SED:=sed 
    65BUILD_SED_DEP:=sed-install 
    7 else 
    8 BUILD_SED:= 
    9 BUILD_SED_DEP:= 
    10 endif 
    116 
    127TARGETS:=$(BUILD_SED) binutils gcc uClibc ipkg-utils gdb libnotimpl utils lzma 

  • trunk/freewrt/toolchain/sed/Makefile

    r48 r144  
    2727$(SED_DIR)/.configured: $(SED_DIR)/.unpacked 
    2828        (cd $(SED_DIR); rm -rf config.cache; \ 
     29                ac_cv_header_wchar_h=no \ 
    2930                ./configure \ 
     31                --disable-nls \ 
    3032                --prefix=$(STAGING_DIR) \ 
    3133                --prefix=/usr \ 
    …… 
    4850            rm -rf $(STAGING_DIR)/share/locale $(STAGING_DIR)/usr/info \ 
    4951                    $(STAGING_DIR)/usr/man $(STAGING_DIR)/usr/share/doc; fi 
     52        @ln -sf $(STAGING_DIR)/$(SED_TARGET_BINARY) $(TOPDIR)/lbin/sed 
    5053 
    5154use-sed-host-binary: