PERFORCE change 167082 for review

[Stanislav Sedov]

http://perforce.freebsd.org/chv.cgi?CH=167082

Change 167082 by stas at stas_deglitch on 2009/08/07 08:00:33

	- Make valgrind build with ordinary sed by using standard POSIX
	  regular expressions.

Affected files ...

.. //depot/projects/valgrind/Makefile.am#10 edit
.. //depot/projects/valgrind/configure.in#9 edit

Differences ...

==== //depot/projects/valgrind/Makefile.am#10 (text+ko) ====

@@ -214,44 +214,44 @@
 # So we search for the line with a hex value "+ SIZEOF_HEADERS", and replace
 # all the hex values in that line with "valt_load_address".
 valt_load_address_x86_freebsd.lds: Makefile
-	$(CC) @FLAG_M32@ -Wl,--verbose -nostdlib 2>&1 | $(SED) \
-		-e '1,/^=====\+$$/d' \
-		-e '/^=====\+$$/d' \
-		-e '/\. = 0x[0-9A-Fa-f]\+ + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/valt_load_address/g' > $@ \
+	$(CC) @FLAG_M32@ -Wl,--verbose -nostdlib 2>&1 | $(SED) -E \
+		-e '1,/^=====+$$/d' \
+		-e '/^=====+$$/d' \
+		-e '/\. = 0x[0-9A-Fa-f]+ \+ SIZEOF_HEADERS/s/0x[0-9A-Fa-f]+/valt_load_address/g' > $@ \
 	|| rm -f $@
 
 valt_load_address_amd64_freebsd.lds: Makefile
-	$(CC) -m64 -Wl,--verbose -nostdlib 2>&1 | $(SED) \
-		-e '1,/^=====\+$$/d' \
-		-e '/^=====\+$$/d' \
+	$(CC) -m64 -Wl,--verbose -nostdlib 2>&1 | $(SED) -E \
+		-e '1,/^=====+$$/d' \
+		-e '/^=====+$$/d' \
 		-e '/ALIGN/s/0x100000/0x1000/g' \
-		-e '/\. = 0x[0-9A-Fa-f]\+ + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/valt_load_address/g' > $@ \
+		-e '/\. = 0x[0-9A-Fa-f]+ \+ SIZEOF_HEADERS/s/0x[0-9A-Fa-f]+/valt_load_address/g' > $@ \
 	|| rm -f $@
 
 valt_load_address_x86_linux.lds: Makefile
-	$(CC) @FLAG_M32@ -Wl,--verbose -nostdlib 2>&1 | $(SED) \
-		-e '1,/^=====\+$$/d' \
-		-e '/^=====\+$$/d' \
-		-e '/\. = 0x[0-9A-Fa-f]\+ + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/valt_load_address/g' > $@ \
+	$(CC) @FLAG_M32@ -Wl,--verbose -nostdlib 2>&1 | $(SED) -E \
+		-e '1,/^=====+$$/d' \
+		-e '/^=====+$$/d' \
+		-e '/\. = 0x[0-9A-Fa-f]+ \+ SIZEOF_HEADERS/s/0x[0-9A-Fa-f]+/valt_load_address/g' > $@ \
 	|| rm -f $@
 
 valt_load_address_amd64_linux.lds: Makefile
-	$(CC) -m64 -Wl,--verbose -nostdlib 2>&1 | $(SED) \
-		-e '1,/^=====\+$$/d' \
-		-e '/^=====\+$$/d' \
-		-e '/\. = 0x[0-9A-Fa-f]\+ + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/valt_load_address/g' > $@ \
+	$(CC) -m64 -Wl,--verbose -nostdlib 2>&1 | $(SED) -E \
+		-e '1,/^=====+$$/d' \
+		-e '/^=====+$$/d' \
+		-e '/\. = 0x[0-9A-Fa-f]+ \+ SIZEOF_HEADERS/s/0x[0-9A-Fa-f]+/valt_load_address/g' > $@ \
 	|| rm -f $@
 
 valt_load_address_ppc32_linux.lds: Makefile
-	$(CC) @FLAG_M32@ -Wl,--verbose -nostdlib 2>&1 | $(SED) \
-		-e '1,/^=====\+$$/d' \
-		-e '/^=====\+$$/d' \
-		-e '/\. = 0x[0-9A-Fa-f]\+ + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/valt_load_address/g' > $@ \
+	$(CC) @FLAG_M32@ -Wl,--verbose -nostdlib 2>&1 | $(SED) -E \
+		-e '1,/^=====+$$/d' \
+		-e '/^=====+$$/d' \
+		-e '/\. = 0x[0-9A-Fa-f]+ \+ SIZEOF_HEADERS/s/0x[0-9A-Fa-f]+/valt_load_address/g' > $@ \
 	|| rm -f $@
 
 valt_load_address_ppc64_linux.lds: Makefile
-	$(CC) -m64 -Wl,--verbose -nostdlib 2>&1 | $(SED) \
-		-e '1,/^=====\+$$/d' \
-		-e '/^=====\+$$/d' \
-		-e '/\. = 0x[0-9A-Fa-f]\+ + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/valt_load_address/g' > $@ \
+	$(CC) -m64 -Wl,--verbose -nostdlib 2>&1 | $(SED) -E \
+		-e '1,/^=====+$$/d' \
+		-e '/^=====+$$/d' \
+		-e '/\. = 0x[0-9A-Fa-f]+ \+ SIZEOF_HEADERS/s/0x[0-9A-Fa-f]+/valt_load_address/g' > $@ \
 	|| rm -f $@

==== //depot/projects/valgrind/configure.in#9 (text+ko) ====

@@ -93,27 +93,6 @@
 AC_SUBST(ASFLAGS)
 ])
 
-
-# Check we have GNU sed: some of the stuff done by "make install" relies
-# on some pretty fancy sed expressions, and AIX sed doesn't produce the
-# same results, causing install to fail
-
-AC_MSG_CHECKING([for GNU sed])
-
-[sed_firstline=`${SED} --version | head -n 1`]
-
-case "${sed_firstline}" in
-    GNU*)
-	AC_MSG_RESULT([ok, looks like GNU sed])
-	;;
-    *)
-	AC_MSG_RESULT([please specify the path to GNU 'sed' in the SED environment variable])
-	AC_MSG_RESULT([note: GNU sed is only required at build/install time, not run time])
-	AC_MSG_ERROR([build/install requires that 'sed' is GNU sed])
-	;;
-esac
-
-
 # We don't want gcc < 3.0
 AC_MSG_CHECKING([for a supported version of gcc])