Skip to content

Commit

Permalink
fix bugs witn installing symlinks for tcl2lua.so
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert McLay committed Jun 13, 2023
1 parent e68012a commit 39bea83
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 7 deletions.
4 changes: 3 additions & 1 deletion README.new
Original file line number Diff line number Diff line change
Expand Up @@ -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


17 changes: 11 additions & 6 deletions build.rtm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand All @@ -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"


Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions pkgs/tcl2lua/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 39bea83

Please sign in to comment.