The following commit has been merged in the master branch:
commit 495dfd0389fc48fe8723d424952340530577b8f3
Author: Guillem Jover <[email protected]>
Date:   Sat Oct 30 09:00:24 2010 +0200

    build: Add missing m4 quotes to sed regex
    
    This was making the regex non-functional, as the square brackets
    were being removed when generating the output file, thus making the
    --disable-compiler-optimisations and --disable-linker-optimisations
    non-functional.

diff --git a/m4/dpkg-compiler.m4 b/m4/dpkg-compiler.m4
index 5a0f791..e885af4 100644
--- a/m4/dpkg-compiler.m4
+++ b/m4/dpkg-compiler.m4
@@ -36,7 +36,7 @@ AC_DEFUN([DPKG_COMPILER_OPTIMISATIONS],
        AS_HELP_STRING([--disable-compiler-optimisations],
                       [Disable compiler optimisations]),
 [if test "x$enable_compiler_optimisations" = "xno"; then
-       [CFLAGS=$(echo "$CFLAGS" | sed -e "s/ -O[1-9]*\b/ -O0/g")]
+       [CFLAGS=$(echo "$CFLAGS" | sed -e "s/ -O[[1-9]]*\b/ -O0/g")]
 fi])dnl
 ])
 
diff --git a/m4/dpkg-linker.m4 b/m4/dpkg-linker.m4
index 9bd98f0..bff4d22 100644
--- a/m4/dpkg-linker.m4
+++ b/m4/dpkg-linker.m4
@@ -8,7 +8,7 @@ AC_DEFUN([DPKG_LINKER_OPTIMISATIONS],
        AS_HELP_STRING([--disable-linker-optimisations],
                       [Disable linker optimisations]),
 [if test "x$enable_linker_optimisations" = "xno"; then
-       [LDFLAGS=$(echo "$LDFLAGS" | sed -e "s/ -Wl,-O[0-9]*\b//g")]
+       [LDFLAGS=$(echo "$LDFLAGS" | sed -e "s/ -Wl,-O[[0-9]]*\b//g")]
 else
        [LDFLAGS="$LDFLAGS -Wl,-O1"]
 fi], [LDFLAGS="$LDFLAGS -Wl,-O1"])dnl

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to