Changeset a316a45 in freewrt

Timestamp:

Jun 19, 2006, 2:30:25 AM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

001c754

Parents:

6223c2d

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@

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@144 afb5a338-a214-0410-bd46-81f09a774fd1

Files:

• Makefile (modified) (1 diff)
• rules.mk (modified) (1 diff)
• scripts/sed.bsd (deleted)
• toolchain/Makefile (modified) (1 diff)
• toolchain/sed/Makefile (modified) (2 diffs)

Makefile

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

rules.mk

@@ -110 +110 @@
 STRIP:=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-strip
 PATCH=$(SCRIPT_DIR)/patch-kernel.sh
-ifeq ($(shell [[ "$(OStype)" = *BSD ]] && echo 1),)
 SED:=$(STAGING_DIR)/bin/sed -i -e
-else
-SED:=$(TOPDIR)/lbin/sed -i -e
-endif
 LINUX_DIR:=$(BUILD_DIR)/linux
 LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux

toolchain/Makefile

@@ -2 +2 @@
 include $(TOPDIR)/rules.mk
 
-ifeq ($(shell [[ "$(OStype)" = *BSD ]] && echo 1),)
 BUILD_SED:=sed
 BUILD_SED_DEP:=sed-install
-else
-BUILD_SED:=
-BUILD_SED_DEP:=
-endif
 
 TARGETS:=$(BUILD_SED) binutils gcc uClibc ipkg-utils gdb libnotimpl utils lzma

toolchain/sed/Makefile

@@ -27 +27 @@
 $(SED_DIR)/.configured: $(SED_DIR)/.unpacked
         (cd $(SED_DIR); rm -rf config.cache; \
+                ac_cv_header_wchar_h=no \
                 ./configure \
+                --disable-nls \
                 --prefix=$(STAGING_DIR) \
                 --prefix=/usr \
@@ -48 +50 @@
             rm -rf $(STAGING_DIR)/share/locale $(STAGING_DIR)/usr/info \
                     $(STAGING_DIR)/usr/man $(STAGING_DIR)/usr/share/doc; fi
+        @ln -sf $(STAGING_DIR)/$(SED_TARGET_BINARY) $(TOPDIR)/lbin/sed
 
 use-sed-host-binary: