Commit 620dd7c5 authored by Eric Andersen's avatar Eric Andersen
Browse files

By popular demand, use 'sed' rather than 'perl' for doing 

search and replace stuff.  Hopefully we do not have any
perl specific regexs that will be broken by this change,
but it seems to be working thus far anyways,
parent 192bace3

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

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

	sed -ie '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 \

	);

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

	sed -ie '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

+5 −5
Original line number Diff line number Diff line
@@ -28,18 +28,18 @@ $(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

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

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

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

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

	perl -i -p -e "s/^.*DOLFS.*/DOLFS=y/;" $(BUSYBOX_DIR)/.config

	sed -ie "s/^.*DOLFS.*/DOLFS=y/;" $(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

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

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

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

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

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

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

	sed -ie "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 -

	perl -pi -e "s,ln \\$$\(,ln -sf \\$$\(,g" $(BZIP2_DIR)/Makefile

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

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

	sed -ie "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

make/coreutils.mk

+2 −2
Original line number Diff line number Diff line
@@ -45,10 +45,10 @@ $(COREUTILS_DIR)/.configured: $(COREUTILS_DIR)/.unpacked 
	);

	#Fix up the max number of open files per process, which apparently 

	# is not set when cross compiling

	perl -i -p -e 's,.*UTILS_OPEN_MAX.*,#define UTILS_OPEN_MAX 1019,g' \

	sed -ie 's,.*UTILS_OPEN_MAX.*,#define UTILS_OPEN_MAX 1019,g' \

		$(COREUTILS_DIR)/config.h

	# This is undefined when crosscompiling...

	perl -i -p -e 's,.*HAVE_PROC_UPTIME.*,#define HAVE_PROC_UPTIME 1,g' \

	sed -ie 's,.*HAVE_PROC_UPTIME.*,#define HAVE_PROC_UPTIME 1,g' \

		$(COREUTILS_DIR)/config.h

	touch  $(COREUTILS_DIR)/.configured