Fix: Added autoreconf and fixed wrong package direcotory name.
This commit is contained in:
parent
ecdcedeee4
commit
8d1687e02d
1 changed files with 10 additions and 1 deletions
|
@ -26,6 +26,8 @@ VERSION="2.3-r20"
|
||||||
SVN_BUILD="yes" # yes|no
|
SVN_BUILD="yes" # yes|no
|
||||||
|
|
||||||
if [ "$SVN_BUILD" == "yes" ]; then
|
if [ "$SVN_BUILD" == "yes" ]; then
|
||||||
|
echo "Using local toolchain!"
|
||||||
|
sleep 2
|
||||||
module use /opt/amtopt/autotools/modulefiles
|
module use /opt/amtopt/autotools/modulefiles
|
||||||
module use ~/modulefiles # we should build a complete toolstack for AMT...
|
module use ~/modulefiles # we should build a complete toolstack for AMT...
|
||||||
module load local
|
module load local
|
||||||
|
@ -108,7 +110,7 @@ ORIGDIR="${HOME}/work"
|
||||||
# final working directory path
|
# final working directory path
|
||||||
WORKDIR=${ORIGDIR}/${CATEGORY}/${PACKAGE}/${VERSION}-${COMPILER}-${COMPILER_VERSION}${PACKAGE_DESCRIPTOR}
|
WORKDIR=${ORIGDIR}/${CATEGORY}/${PACKAGE}/${VERSION}-${COMPILER}-${COMPILER_VERSION}${PACKAGE_DESCRIPTOR}
|
||||||
# path to the source code directory
|
# path to the source code directory
|
||||||
SRCDIR=${WORKDIR}/SMPSS-$VERSION
|
SRCDIR=${WORKDIR}/$PACKAGE-$VERSION
|
||||||
# build directory (should be different from source directory):
|
# build directory (should be different from source directory):
|
||||||
BUILDDIR=${SRCDIR}/build
|
BUILDDIR=${SRCDIR}/build
|
||||||
|
|
||||||
|
@ -145,6 +147,13 @@ esac
|
||||||
# TODO check subdirectory build
|
# TODO check subdirectory build
|
||||||
mkdir ${BUILDDIR}
|
mkdir ${BUILDDIR}
|
||||||
cd ${BUILDDIR}
|
cd ${BUILDDIR}
|
||||||
|
|
||||||
|
cd ${SRCDIR}
|
||||||
|
# updating build tools and environment
|
||||||
|
if [ "$SVN_BUILD" == "yes" ]; then
|
||||||
|
autoreconf -fiv
|
||||||
|
fi
|
||||||
|
|
||||||
echo "Running configure"
|
echo "Running configure"
|
||||||
${SRCDIR}/configure --prefix=${PREFIX} ${CONFIGURE_OPTS} ${COMPILER_OPTS} 2>&1 | tee configure.log
|
${SRCDIR}/configure --prefix=${PREFIX} ${CONFIGURE_OPTS} ${COMPILER_OPTS} 2>&1 | tee configure.log
|
||||||
echo "Running make"
|
echo "Running make"
|
||||||
|
|
Loading…
Reference in a new issue