mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-30 14:46:31 +00:00
subversion: ensure --disable-debug doesn't mangle CFLAGS
Fixes: http://autobuild.buildroot.net/results/fc6/fc69a19c66462585449f7c4dad174d45a84e4947/ http://autobuild.buildroot.net/results/e04/e0471f2a9087d547840a7b18863289963e357b57/ http://autobuild.buildroot.net/results/bd8/bd8cdf976937c7b9029658871929f4be464b7a47/ http://autobuild.buildroot.net/results/652/652c3afe844e912061fbc5991e6fecad98ff6e6f/ And many more. When --disable-debug is passed to configure, as is automatically done by the autotools infrastructure since 822a757456e (infra: Move --enable/--disable-debug to package/Makefile.in), the configure script will try to strip debugging (-g) options from the C/CXXFLAGS. The logic to do so is unfortunately buggy, so it ends up mangling options like -mfloat-gprs=double that we use on certain PowerPC variants, breaking the build. Fix it by adjusting the sed regexp to be more selective in what it strips. The package unfortunately doesn't cleanly autoreconf, so configure is patched instead of configure.ac. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
704c540203
commit
395c88051e
28
package/subversion/0001-dont-mangle-cflags.patch
Normal file
28
package/subversion/0001-dont-mangle-cflags.patch
Normal file
@ -0,0 +1,28 @@
|
||||
[PATCH] configure: don't mangle CFLAGS
|
||||
|
||||
Ensure that the sed expression to strip debugging options from CFLAGS
|
||||
doesn't mangle flags like -mfloat-gprs=double, breaking the build.
|
||||
|
||||
Patch configure instead of configure.ac as subversion currently doesn't
|
||||
cleanly autoreconf.
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
configure | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: subversion-1.7.18/configure
|
||||
===================================================================
|
||||
--- subversion-1.7.18.orig/configure
|
||||
+++ subversion-1.7.18/configure
|
||||
@@ -19798,8 +19798,8 @@
|
||||
CFLAGS="$CFLAGS -DSVN_DEBUG -DAP_DEBUG"
|
||||
CXXFLAGS="$CXXFLAGS -DSVN_DEBUG -DAP_DEBUG"
|
||||
elif test "$enable_debugging" = "no" ; then
|
||||
- CFLAGS="`echo $CFLAGS' ' | $SED -e 's/-g[0-9] //g' | $SED -e 's/-g//g'`"
|
||||
- CXXFLAGS="`echo $CXXFLAGS' ' | $SED -e 's/-g[0-9] //g' | $SED -e 's/-g//g'`"
|
||||
+ CFLAGS="`echo $CFLAGS' ' | $SED -e 's/-g[0-9]* //g'`"
|
||||
+ CXXFLAGS="`echo $CXXFLAGS' ' | $SED -e 's/-g[0-9]* //g'`"
|
||||
CFLAGS="$CFLAGS -DNDEBUG"
|
||||
CXXFLAGS="$CXXFLAGS -DNDEBUG"
|
||||
# elif test "$enable_debugging" = "maybe" ; then
|
Loading…
x
Reference in New Issue
Block a user