diff --git a/README.new b/README.new index f0262b392..c6beba95b 100644 --- a/README.new +++ b/README.new @@ -105,5 +105,7 @@ Lmod 8.7+ * Issue #654: Do not use install to copy symbolic links (8.7.27) * PR #644: Created hook colorize_fullName to allow for sites to control how "module list" and "module av" prints to the terminal. - +W.I.P: + (8.7.28) * Must delete old tcl2lua.so* files before installing new ones + diff --git a/build.rtm b/build.rtm index 47ef26a4b..c63aaeea2 100755 --- a/build.rtm +++ b/build.rtm @@ -12,7 +12,8 @@ parallel_make_install() fi if [ "$BUILD_TYPE" != "EXPERIMENTAL" ]; then - $SUDO $MAKE GIT_VERSION=$GIT_VERSION -j install $MAKE_EXTRA + echo "$SUDO $MAKE GIT_VERSION=$GIT_VERSION -j install $MAKE_EXTRA" + $SUDO $MAKE GIT_VERSION=$GIT_VERSION -j install $MAKE_EXTRA else echo "$SUDO $MAKE pre-install $MAKE_EXTRA" $SUDO $MAKE GIT_VERSION=$GIT_VERSION -j pre-install $MAKE_EXTRA @@ -80,6 +81,9 @@ if [ "$1" = "-e" ]; then echo BUILD_TYPE: $BUILD_TYPE fi +pkgName=lmod +PKG=$BASE_DIR/$pkgName/$PKG_VERSION + myhost=$(hostname -f) myhost=${myhost%.tacc.utexas.edu} myhost=${myhost%.local} @@ -103,6 +107,7 @@ if [ -n "$LUA_PATH" ]; then MAKE_EXTRA="LUA_PATH=$LUA_PATH LUA_CPATH=$LUA_CPATH" fi +EXTRA_CMD="echo " COMMON_OPTIONS="--with-supportKsh=yes --with-siteName=TACC --with-silentShellDebugging=yes" @@ -111,12 +116,13 @@ case $SYSHOST in SITE_CONTROLLED_PREFIX=yes SUDO="sudo" base="/opt/apps/lmod/$PKG_VERSION" + PKG=$base ADMIN_DIR=/opt/moduleData UPDATE_FN=$ADMIN_DIR/system.txt CACHEDIRS=$ADMIN_DIR/cacheDir EXTRA="--with-spiderCacheDir=$CACHEDIRS --with-updateSystemFn=$UPDATE_FN --with-siteControlPrefix=yes --with-module-root-path=/opt/apps/modulefiles --with-silentShellDebugging=yes --with-useDotConfigDirOnly=yes" SITE_PKG="contrib/Personal/*.lua" - + if [ "$SYSHOST" == "mijo" ]; then EXTRA="$EXTRA --with-exportedModuleCmd=no" fi @@ -154,14 +160,13 @@ case $SYSHOST in esac BASE_DIR=$base -pkgName=lmod -PKG=$BASE_DIR/$pkgName/$PKG_VERSION - -EXTRA_CMD="echo " if [ -n "$SITE_PKG" ]; then EXTRA_CMD="$SUDO cp $SITE_PKG $PKG/libexec" fi +echo EXTRA_CMD: $EXTRA_CMD + + rm -f config.status config.log MAKE=make diff --git a/pkgs/tcl2lua/Makefile b/pkgs/tcl2lua/Makefile index d2fd659bb..c91be36ca 100644 --- a/pkgs/tcl2lua/Makefile +++ b/pkgs/tcl2lua/Makefile @@ -26,6 +26,7 @@ $(LIBRARY): $(OBJ) install: all install -m $(MODE_R) $(LIBRARY) $(LIB) + $(RM) -f $(LIB)/$(SONAMEV) $(LIB)/$(SONAME) ln -s $(LIBRARY) $(LIB)/$(SONAMEV) ln -s $(SONAMEV) $(LIB)/$(SONAME)