[SCM] x264/master: print config.log in case the configure script fails

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Wed Jul 27 18:56:57 UTC 2011


The following commit has been merged in the master branch:
commit 4af19d4e82644d913c1aebc1019ed881eba262fc
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jul 27 20:56:00 2011 +0200

    print config.log in case the configure script fails
    
    this help with diagnosing issues. The tail command line was taken from
    debhelper's autoconf build module.

diff --git a/debian/rules b/debian/rules
index 1c70031..69a19dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,18 +15,21 @@ LDFLAGS += -Wl,--as-needed
 
 override_dh_auto_build:
 	# Build static lib
-	LDFLAGS="$(LDFLAGS)" ./configure $(static_confflags)
+	LDFLAGS="$(LDFLAGS)" ./configure $(static_confflags) \
+	   || ( tail -v -n +0 config.log config.log ; exit 1 )
 	$(MAKE)
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/install/static
 	$(MAKE) distclean
 	# Build shared lib
-	CFLAGS="$(shared_extra_cflags)" LDFLAGS="$(LDFLAGS)" ./configure $(shared_confflags)
+	CFLAGS="$(shared_extra_cflags)" LDFLAGS="$(LDFLAGS)" ./configure $(shared_confflags) \
+	   || ( tail -v -n +0 config.log config.log ; exit 1 )
 	$(MAKE)
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/install/shared
 ifeq ($(do_opt),yes)
 	$(MAKE) distclean
 	# Build opt lib
-	LDFLAGS="$(LDFLAGS)" ./configure $(opt_confflags)
+	LDFLAGS="$(LDFLAGS)" ./configure $(opt_confflags) \
+	   || ( tail -v -n +0 config.log config.log ; exit 1 )
 	$(MAKE)
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/install/opt
 endif

-- 
x264 packaging



More information about the pkg-multimedia-commits mailing list