summaryrefslogtreecommitdiffstats
path: root/remote/modules
diff options
context:
space:
mode:
authorChristian Rößler2013-08-08 15:42:44 +0200
committerChristian Rößler2013-08-08 15:42:44 +0200
commitf35a12c27a4382ef8ab8a31d035143114cc1b4fd (patch)
tree772a51b937a63fa680ad6790af65e788c88db749 /remote/modules
parent[systemd] .build Scientific Linux: m4 compiling (diff)
downloadtm-scripts-f35a12c27a4382ef8ab8a31d035143114cc1b4fd.tar.gz
tm-scripts-f35a12c27a4382ef8ab8a31d035143114cc1b4fd.tar.xz
tm-scripts-f35a12c27a4382ef8ab8a31d035143114cc1b4fd.zip
[systemd] Scientific Linux: Chain m4->autoconf->automake compiles now.
Diffstat (limited to 'remote/modules')
-rw-r--r--remote/modules/systemd/systemd.build24
1 files changed, 17 insertions, 7 deletions
diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build
index 8153fc97..a5291677 100644
--- a/remote/modules/systemd/systemd.build
+++ b/remote/modules/systemd/systemd.build
@@ -32,7 +32,7 @@ build () {
# Some path mainpulations for followong utilities
OLDPATH=$PATH
- PATH="${MODULE_BUILD_DIR}/usr/local/bin/:$PATH" # autoconf needs new m4
+ export PATH="${MODULE_BUILD_DIR}/usr/local/bin/:$PATH" # autoconf etc. needs new m4 etc.
# Utillinux stuff
pinfo "Building util-linux"
@@ -58,8 +58,7 @@ build () {
DESTDIR="${MODULE_BUILD_DIR}" make install || perror "m4 make install failed."
cd - &> /dev/null
- # Let's have some starting fun with autoconf, as we want systemd, which wants automake 1.13, which wants
- # autoconf 2.65 or better...
+ # And have some more fun with autoconf, chain see above:
pinfo "Building autoconf Version $REQUIRED_AUTOCONF_VERSION."
cd "${MODULE_DIR}/src/autoconf-$REQUIRED_AUTOCONF_VERSION"
./configure || perror "./configure autoconf failed."
@@ -67,8 +66,15 @@ build () {
DESTDIR="${MODULE_BUILD_DIR}" make install || perror "autoconf make install failed."
cd - &> /dev/null
- # Now let's have some fun with automake, as config.log/systemd will whine later about SL's automake 1.11:
- # AUTOMAKE='${SHELL} /root/tm-scripts/remote/modules/systemd/src/systemd-206/build-aux/missing automake-1.13'
+ # Now let's have some fun with automake, as config.log/automake will whine later about SL's automake 1.11:
+ # AUTOMAKE='${SHELL} [...] missing automake-1.13'. We use a newer automake than 1.11, if we are at it.
+ # Link fun, as configure searches in /usr/local/bin, ignores PATH above, also 'share':
+ ln -s "${MODULE_BUILD_DIR}/usr/local/bin/autom4te" /usr/local/bin/autom4te
+ ln -s "${MODULE_BUILD_DIR}/usr/local/share/autoconf" /usr/local/share/autoconf
+ # ... and manipulate perl library path, as else the libs will not be found by (system) perl:
+ OLDPERL5LIB="$PERL5LIB"
+ export PERL5LIB="${MODULE_BUILD_DIR}/usr/local/share/autoconf/:$PERL5LIB"
+
pinfo "Building automake Version $REQUIRED_AUTOMAKE_VERSION."
cd "${MODULE_DIR}/src/automake-$REQUIRED_AUTOMAKE_VERSION"
./configure || perror "./configure automake failed."
@@ -90,14 +96,18 @@ build () {
LDFLAGS="$LDFLAGS -L${MODULE_BUILD_DIR}/usr/lib/ -ldl"
# LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${MODULE_BUILD_DIR}/usr/lib/"
cd - &> /dev/null
- PATH=$OLDPATH # re-set PATH
+
+ # ... and tidy our manipulations with path, perllib, links etc.
+ export PERL5LIB="$OLDPERL5LIB"
+ export PATH="$OLDPATH"
+ unlink /usr/local/bin/autom4te
+ unlink /usr/local/share/autoconf
fi
#build systemd
pinfo "Building systemd"
cd "${MODULE_DIR}/src/$REQUIRED_VERSION"
pinfo "calling configure"
-pinfo "-------$LDFLAGS------------$CPPFLAGS-----------------$LD_LIBRARY_PATH---------------------------------------------------"
./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no --disable-nls \
--disable-microhttpd --disable-bootchart --disable-quotacheck --disable-hostnamed --disable-timedated \
--disable-localed --disable-coredump --disable-keymap --without-python --enable-blkid --enable-acl --enable-pam \