Date: Thu, 23 Oct 2008 08:58:13 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 151794 for review Message-ID: <200810230858.m9N8wDlU081747@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=151794 Change 151794 by peter@peter_cheese on 2008/10/23 08:57:58 Give up for now and use gnu sed like it wants. Add to $PATH before biuilding. Affected files ... .. //depot/projects/valgrind/Makefile.am#5 edit .. //depot/projects/valgrind/autogen.sh#5 edit .. //depot/projects/valgrind/configure.in#7 edit .. //depot/projects/valgrind/tests/filter_stderr_basic#4 edit Differences ... ==== //depot/projects/valgrind/Makefile.am#5 (text+ko) ==== @@ -213,14 +213,14 @@ # 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 \ - -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 '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 \ + $(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' > $@ \ ==== //depot/projects/valgrind/autogen.sh#5 (text+kox) ==== @@ -1,5 +1,8 @@ #!/bin/sh +PATH=/usr/bin:$PATH +export PATH + run () { echo "running: $*" ==== //depot/projects/valgrind/configure.in#7 (text+ko) ==== @@ -95,20 +95,20 @@ # 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 ensure first 'sed' in your path is GNU sed]) -# AC_MSG_RESULT([note: GNU sed is only required at build/install time]) -# AC_MSG_ERROR([build/install requires that 'sed' is GNU sed]) -# ;; -#esac +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 ensure first 'sed' in your path is GNU sed]) + AC_MSG_RESULT([note: GNU sed is only required at build/install time]) + AC_MSG_ERROR([build/install requires that 'sed' is GNU sed]) + ;; +esac # We don't want gcc < 3.0 ==== //depot/projects/valgrind/tests/filter_stderr_basic#4 (text+kox) ==== @@ -6,8 +6,7 @@ dir=`dirname $0` # Remove ==pid== and --pid-- and ++pid++ and **pid** strings -#sed "s/\(==\|--\|\+\+\|\*\*\)[0-9]\{1,7\}\1 //" | -perl -pe 's/(==|--|\+\+|\*\*)\d{1,5}\1 //;' | +sed "s/\(==\|--\|\+\+\|\*\*\)[0-9]\{1,7\}\1 //" | # Remove any --pid:0: strings (debuglog level zero output) sed "/^--[0-9]\{1,7\}:0:*/d" |
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810230858.m9N8wDlU081747>