summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-03-08 18:47:07 +0000
committerKarl Berry <karl@freefriends.org>2009-03-08 18:47:07 +0000
commit2ddb1828aa9fef0b87977e3087ed5f606600dbe0 (patch)
treec4fa9beae6028aaedbe926b29f4fd35d62eb6636 /Build
parentf76551fde87a64c598b60e7504e24a1f4e118ccb (diff)
-g, TL_CONF_SHARED, set -vx
git-svn-id: svn://tug.org/texlive/trunk@12339 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rwxr-xr-xBuild/source/Build12
-rw-r--r--Build/source/ChangeLog6
2 files changed, 14 insertions, 4 deletions
diff --git a/Build/source/Build b/Build/source/Build
index 27efea93f00..7c05b044c62 100755
--- a/Build/source/Build
+++ b/Build/source/Build
@@ -1,6 +1,6 @@
#!/bin/sh
# $Id$
-# Originally written many years ago by Sebastian Rahtz. Public domain.
+# Public domain. Originally written many years ago by Sebastian Rahtz.
# To build again from same sources, try Build --no-clean.
# To build (mostly) without optimization, try Build --debug.
#
@@ -39,7 +39,7 @@ else
fi
: ${TL_BUILD_ENV=}
-if test "x$1" = x--debug; then
+if test "x$1" = x--debug || test "x$1" = x-g; then
TL_BUILD_ENV="CFLAGS=-g CXXFLAGS=-g"
shift
fi
@@ -51,6 +51,9 @@ cd $TL_WORKDIR || exit 1
# allow override of configure location, just in case.
: ${TL_CONFIGURE=../configure}
+# default to static linking.
+: ${TL_CONF_SHARED=--disable-shared}
+
# longinteger and off_t declarations are still inconsistent, do not
# enable this unless you are testing.
: ${TL_CONF_LARGEFILE=--disable-largefile}
@@ -77,14 +80,15 @@ cd $TL_WORKDIR || exit 1
# build, so omit the warning about it.
: ${KPATHSEA_WARNING=0}
-# set -vx
-
# configure && make. Keep the tee outside, so that we can detect
# failure at either step.
{
+ set +vx # show the configure and make commands in the log.
+
eval $TL_BUILD_ENV time $TL_CONFIGURE \
--prefix=$TL_INSTALL_DEST \
--datadir=$TL_INSTALL_DEST \
+ $TL_CONF_SHARED \
$TL_CONF_LARGEFILE \
$TL_CONF_XDVI_TOOLKIT \
$TL_CONF_THREADS \
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog
index a4cc91356e8..d7f597384b3 100644
--- a/Build/source/ChangeLog
+++ b/Build/source/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-08 Karl Berry <karl@tug.org>
+
+ * Build (TL_CONF_SHARED): new variable, --disable-shared by default.
+ (-g): alias for --debug.
+ use set -vx to see configure && make commands in the log.
+
2009-01-24 Karl Berry <karl@tug.org>
* utils/texinfo: remove, we will no longer include Texinfo in TeX Live