[vlc-commits] Contrib: allow building contribs with no optimization

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Tue Mar 24 09:17:37 2015 +0000| [da197ddb1bf34128ccb542dc38d91e47ce3b9244] | committer: Jean-Baptiste Kempf

Contrib: allow building contribs with no optimization

--
uses the same flag logic as --disable-gpl

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=da197ddb1bf34128ccb542dc38d91e47ce3b9244
---

 contrib/bootstrap    |    6 ++++++
 contrib/src/main.mak |    6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 4d2b826a..ced4fe0 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -31,6 +31,7 @@ usage()
 	echo "  --disable-sout   configure to not build stream output packages"
 	echo "  --enable-small   optimize libraries for size with slight speed decrease [DANGEROUS]"
 	echo "  --disable-gpl    configure to not build viral GPL code"
+	echo "  --disable-optim  disable optimization in libraries"
 }
 
 BUILD=
@@ -42,6 +43,7 @@ BUILD_ENCODERS="1"
 BUILD_NETWORK="1"
 BUILD_DISCS="1"
 GPL="1"
+WITH_OPTIMIZATION="1"
 
 if test ! -f "../../contrib/src/main.mak"
 then
@@ -74,6 +76,9 @@ do
 		--disable-sout)
 			BUILD_ENCODERS=
 			;;
+		--disable-optim)
+			WITH_OPTIMIZATION=
+			;;
 		--enable-small)
 			ENABLE_SMALL=1
 			;;
@@ -226,6 +231,7 @@ test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
 test -z "$BUILD_NETWORK" || add_make_enabled "BUILD_NETWORK"
 test -z "$ENABLE_SMALL" || add_make_enabled "ENABLE_SMALL"
 test -z "$GPL" || add_make_enabled "GPL"
+test -z "$WITH_OPTIMIZATION" || add_make_enabled "WITH_OPTIMIZATION"
 
 #
 # Checks
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 287a0ad..1b5dd4a 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -166,6 +166,12 @@ CFLAGS := $(CFLAGS) $(EXTRA_CFLAGS) -g
 CXXFLAGS := $(CXXFLAGS) $(EXTRA_CFLAGS) -g
 EXTRA_LDFLAGS += -L$(PREFIX)/lib
 LDFLAGS := $(LDFLAGS) $(EXTRA_LDFLAGS)
+
+ifndef WITH_OPTIMIZATION
+CFLAGS := $(CFLAGS) -O0
+CXXFLAGS := $(CXXFLAGS) -O0
+endif
+
 # Do not export those! Use HOSTVARS.
 
 # Do the FPU detection, after we have figured out our compilers and flags.