changeset 31863:4b6dc3f9b281

restore functionality to be able to pass custom configure flags or override the used compiler
author siretart
date Sat, 07 Aug 2010 18:23:31 +0000
parents 4551864b8e69
children d277ede2b207
files README debian/rules
diffstat 2 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/README	Sat Aug 07 18:10:15 2010 +0000
+++ b/README	Sat Aug 07 18:23:31 2010 +0000
@@ -135,8 +135,12 @@
 
   debian/daily-build.sh -b
 
-If you want to modify options to configure, please adjust the file
-debian/rules to your needs.
+You can also pass some variables to the Makefile. For example, if you
+want to compile with gcc 3.4 even if it's not the default compiler, or
+pass extra configure options you would use:
+
+  CC=gcc-3.4 DEB_EXTRA_CONFIGURE_FLAGS="--disable-libdvdcss-internal" debian/daily-build.sh -b
+
 
 To clean up the source tree run the following command:
 
--- a/debian/rules	Sat Aug 07 18:10:15 2010 +0000
+++ b/debian/rules	Sat Aug 07 18:23:31 2010 +0000
@@ -83,9 +83,9 @@
     CONFIGURE_FLAGS += --enable-mga --enable-3dfx --enable-tdfxfb
 endif
 
-# See http://wiki.debian.org/Teams/Dpkg/DebianRules; #465282  and
-# https://wiki.ubuntu.com/DistCompilerFlags
-CLEAN_ENV=env -u CFLAGS -u CPPFLAGS -u LDFLAGS -u FFLAGS -u CXXFLAGS
+ifneq (,$(DEB_EXTRA_CONFIGURE_FLAGS))
+    CONFIGURE_FLAGS += $(DEB_EXTRA_CONFIGURE_FLAGS)
+endif
 
 build: build-arch build-indep