Commit 4f889ada authored by Eric Andersen's avatar Eric Andersen
Browse files

automatically detect if we have a usable version of sed 

installed.  If not, we will now build our own version.
parent 93b677ea

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ INSTALL_LIBSTDCPP=true 
# The list of stuff to build for the target filesystem

#

#############################################################

TARGETS:=

TARGETS:=host-sed

# The toolchain comes next if we are building one

ifeq ($(USE_UCLIBC_TOOLCHAIN),true)

ifeq ($(GCC_2_95_TOOLCHAIN),true)

make/bash.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ bash-source: $(DL_DIR)/$(BASH_SOURCE) 
$(BASH_DIR)/.unpacked: $(DL_DIR)/$(BASH_SOURCE)

	$(BASH_CAT) $(DL_DIR)/$(BASH_SOURCE) | tar -C $(BUILD_DIR) -xvf -

	# This is broken when -lintl is added to LIBS

	sed -i -e 's,LIBS_FOR_BUILD =.*,LIBS_FOR_BUILD =,g' \

	$(SED) 's,LIBS_FOR_BUILD =.*,LIBS_FOR_BUILD =,g' \

		$(BASH_DIR)/builtins/Makefile.in

	touch $(BASH_DIR)/.unpacked

make/berkeleydb.mk

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ $(DB_DIR)/.configured: $(DB_DIR)/.dist 
		--disable-compat185 \

		--with-pic \

	);

	sed -i -e 's/\.lo/.o/g' $(DB_DIR)/build_unix/Makefile

	$(SED) 's/\.lo/.o/g' $(DB_DIR)/build_unix/Makefile

	touch  $(DB_DIR)/.configured



$(DB_DIR)/build_unix/.libs/libdb-4.1.so: $(DB_DIR)/.configured

make/busybox.mk

+6 −6
Original line number Diff line number Diff line
@@ -28,20 +28,20 @@ $(BUSYBOX_DIR)/.configured: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG) 
	$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) -xvf -

ifeq ($(USE_BUSYBOX_SNAPSHOT),true)

	cp $(BUSYBOX_CONFIG) $(BUSYBOX_DIR)/.config

	sed -i -e "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\

	$(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\

		PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Rules.mak

ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true)

	sed -i -e "s/^.*CONFIG_LFS.*/CONFIG_LFS=y/;" $(BUSYBOX_DIR)/.config

	$(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=y/;" $(BUSYBOX_DIR)/.config

else

	sed -i -e "s/^.*CONFIG_LFS.*/CONFIG_LFS=n/;" $(BUSYBOX_DIR)/.config

	$(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=n/;" $(BUSYBOX_DIR)/.config

endif

	$(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) oldconfig

else  # Not using snapshot

	cp $(BUSYBOX_CONFIG) $(BUSYBOX_DIR)/Config.h

	sed -i -e "s,^CROSS.*,CROSS=$(TARGET_CROSS),;" $(BUSYBOX_DIR)/Makefile

	sed -i -e "s,^PREFIX.*,PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Makefile

	$(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS),;" $(BUSYBOX_DIR)/Makefile

	$(SED) "s,^PREFIX.*,PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Makefile

ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true)

	sed -i -e "s/^DOLFS.*/DOLFS=true/;" $(BUSYBOX_DIR)/Makefile

	$(SED) "s/^DOLFS.*/DOLFS=true/;" $(BUSYBOX_DIR)/Makefile

endif

endif

	touch $(BUSYBOX_DIR)/.configured

make/bzip2.mk

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ bzip2-source: $(DL_DIR)/$(BZIP2_SOURCE) 


$(BZIP2_DIR)/.unpacked: $(DL_DIR)/$(BZIP2_SOURCE)

	$(BZIP2_CAT) $(DL_DIR)/$(BZIP2_SOURCE) | tar -C $(BUILD_DIR) -xvf -

	sed -i -e "s,ln \$$(,ln -sf \$$(,g" $(BZIP2_DIR)/Makefile

	sed -i -e "s,ln -s (lib.*),ln -sf \$$1 ; ln -sf libbz2.so.1.0.2 libbz2.so,g" \

	$(SED) "s,ln \$$(,ln -sf \$$(,g" $(BZIP2_DIR)/Makefile

	$(SED) "s,ln -s (lib.*),ln -sf \$$1 ; ln -sf libbz2.so.1.0.2 libbz2.so,g" \

	    $(BZIP2_DIR)/Makefile-libbz2_so

	touch $(BZIP2_DIR)/.unpacked