[SCM] ffmpeg/master: Use 'set -e' to abort build on configure failure

aca-guest at users.alioth.debian.org aca-guest at users.alioth.debian.org
Tue Oct 11 19:51:37 UTC 2016


The following commit has been merged in the master branch:
commit c17bdadec2ae8db3f33b8cb9ba36585ebe2908d5
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Tue Oct 11 21:04:27 2016 +0200

    Use 'set -e' to abort build on configure failure
    
    Currently the build can 'succeed', even though configure failed for the
    extra flavor.

diff --git a/debian/rules b/debian/rules
index 75803cc..bb7c296 100755
--- a/debian/rules
+++ b/debian/rules
@@ -178,7 +178,7 @@ include /usr/share/dpkg/buildflags.mk
 # Add configuration options:
 override_dh_auto_configure:
 	$(foreach flavor,$(FLAVORS),mkdir -p debian/$(flavor);)
-	$(foreach flavor,$(FLAVORS), echo " *** $(flavor) ***"; cd debian/$(flavor); ../../configure $(CONFIG) $(CONFIG_$(flavor)) || (cat config.log && exit 1); cd ../.. ;)
+	$(foreach flavor,$(FLAVORS),set -e; echo " *** $(flavor) ***"; cd debian/$(flavor); ../../configure $(CONFIG) $(CONFIG_$(flavor)) || (cat config.log && exit 1); cd ../.. ;)
 
 # Remove the subdirectories generated for the flavors.
 override_dh_auto_clean:

-- 
ffmpeg packaging



More information about the pkg-multimedia-commits mailing list