Mercurial > hg > buildbot

changeset 59:fea2b60ab331 draft default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build.sh Add --disable-system-lcms as EXTRA_CONFIGURE for 6 and 7.
author Mark Wielaard <mark@klomp.org>
date Tue, 03 Jun 2014 14:37:23 +0200
parents b589c9b21c44
children
files icedtea/build.sh
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/icedtea/build.sh	Tue Jun 03 10:17:14 2014 +0200
+++ b/icedtea/build.sh	Tue Jun 03 14:37:23 2014 +0200
@@ -30,8 +30,10 @@
 
 if [ "$1" == "6" -o "$1" == "7" ]; then
  EXTRA_VERBOSE='VERBOSE=true'
+ EXTRA_CONFIGURE='--disable-system-lcms'
 elif [ "$1" == "trunk" ]; then
  EXTRA_VERBOSE='LOG=debug'
+ EXTRA_CONFIGURE=''
 else
  echo "build.sh argument must be 6, 7 or trunk"
  exit -1;
@@ -124,6 +126,7 @@
 	&& cd $ICEDTEA_BUILD_DIR \
 	&& $ICEDTEA_DIR/configure \
 		--enable-nss \
+		$EXTRA_CONFIGURE \
 	&& make $EXTRA_VERBOSE) 2>&1 | tee $BUILD_LOG_FILE
 BUILD_RESULT=$?