commit: b5082d98c8c3f43edba891c9a74a6c08e4e95c98
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Fri Oct 30 23:07:27 2020 +0000
Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Fri Oct 30 23:07:52 2020 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=b5082d98
sys-cluster/Lmod: drop old version 8.4.5
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
sys-cluster/Lmod/Lmod-8.4.11.ebuild | 8 ++
sys-cluster/Lmod/Lmod-8.4.5.ebuild | 104 -----------------------
sys-cluster/Lmod/files/Lmod-8.4.11-ldflags.patch | 26 ++++++
3 files changed, 34 insertions(+), 104 deletions(-)
diff --git a/sys-cluster/Lmod/Lmod-8.4.11.ebuild
b/sys-cluster/Lmod/Lmod-8.4.11.ebuild
index 925e1d5e9..afe34b143 100644
--- a/sys-cluster/Lmod/Lmod-8.4.11.ebuild
+++ b/sys-cluster/Lmod/Lmod-8.4.11.ebuild
@@ -35,6 +35,8 @@ BDEPEND+="
)
"
+PATCHES=( "${FILESDIR}"/${PN}-8.4.11-ldflags.patch )
+
pkg_setup() {
elog "There is a lot of options for this package,"
elog "especially for run time behaviour."
@@ -83,12 +85,18 @@ src_configure() {
econf ${myconf[@]} ${EXTRA_ECONF[@]}
}
+src_compile() {
+ CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+ default
+}
+
src_test() {
local -x PATH="/opt/hermes/bin:${PATH}"
tm -vvv || die
}
src_install() {
+ CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
default
keepdir /var/lmod
diff --git a/sys-cluster/Lmod/Lmod-8.4.5.ebuild
b/sys-cluster/Lmod/Lmod-8.4.5.ebuild
deleted file mode 100644
index 925e1d5e9..000000000
--- a/sys-cluster/Lmod/Lmod-8.4.5.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Environment Module System based on Lua"
-HOMEPAGE="https://lmod.readthedocs.io/en/latest";
-SRC_URI="https://github.com/TACC/Lmod/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="auto-swap cache dotfiles duplicate +extend italic module-cmd nocase
redirect test"
-RESTRICT="!test? ( test )"
-
-RDEPEND+="
- app-shells/tcsh
- || (
- app-shells/loksh
- app-shells/mksh
- app-shells/ksh
- )
- app-shells/zsh
- dev-lang/tcl
- dev-lua/luafilesystem
- dev-lua/luajson
- dev-lua/luaposix
- dev-lua/lua-term
-"
-DEPEND+="${RDEPEND}"
-BDEPEND+="
- test? (
- dev-util/Hermes
- )
-"
-
-pkg_setup() {
- elog "There is a lot of options for this package,"
- elog "especially for run time behaviour."
- elog "You can set them using EXTRA_ECONF variable."
- elog "To see full list of options visit:"
- elog "https://lmod.readthedocs.io/en/latest/090_configuring_lmod.html";
-}
-
-src_prepare() {
- default
-
- rm -r "${S}"/rt/{colorize,end2end,help,ifur,settarg} || die
-}
-
-src_configure() {
- # set environment variables to pass to Lmod configuration
- local -x CACHE_LIFETIME="${CACHE_LIFETIME:-86400}"
- local -x SHORT_TIME="${SHORT_TIME:-2}"
- local -x
SYSTEM_TOUCH="${SYSTEM_TOUCH:-/var/lmod/latest_system_update.time}"
- local -x SITE_NAME="${SITE_NAME:-Gentoo}"
- local -x SYSHOST="${SYSHOST:-Gentoo}"
-
- local myconf=(
- --with-tcl
- --with-fastTCLInterp
- --with-colorize
- --prefix=/opt
- --with-ancient="${CACHE_LIFETIME}"
- --with-supportKsh
- --with-updateSystemFn="${SYSTEM_TOUCH}"
- --with-siteName="${SITE_NAME}"
- --with-syshost="${SYSHOST}"
- --with-shortTime="${SHORT_TIME}"
- --without-useBuiltinPkgs
- $(use_with duplicate duplicatePaths)
- $(use_with nocase caseIndependentSorting)
- $(use_with italic hiddenItalic)
- $(use_with auto-swap autoSwap)
- $(use_with module-cmd exportedModuleCmd)
- $(use_with redirect)
- $(use_with dotfiles useDotFiles)
- $(use_with cache cachedLoads)
- $(use_with extend extendedDefault)
- )
-
- econf ${myconf[@]} ${EXTRA_ECONF[@]}
-}
-
-src_test() {
- local -x PATH="/opt/hermes/bin:${PATH}"
- tm -vvv || die
-}
-
-src_install() {
- default
-
- keepdir /var/lmod
-}
-
-pkg_postinst() {
- elog "Lmod has been installed at /opt/lmod/{lmod -> ${PV}}"
- elog "To activate Lmod, you need to source the profile"
- elog "script provided"
- elog " $ . /opt/lmod/lmod/init/profile"
- elog "This will provide you with the 'module' command"
- elog " $ man module"
-}
diff --git a/sys-cluster/Lmod/files/Lmod-8.4.11-ldflags.patch
b/sys-cluster/Lmod/files/Lmod-8.4.11-ldflags.patch
new file mode 100644
index 000000000..afd652142
--- /dev/null
+++ b/sys-cluster/Lmod/files/Lmod-8.4.11-ldflags.patch
@@ -0,0 +1,26 @@
+diff --git a/pkgs/luafilesystem/Makefile b/pkgs/luafilesystem/Makefile
+index 9beaf12..7926e29 100644
+--- a/pkgs/luafilesystem/Makefile
++++ b/pkgs/luafilesystem/Makefile
+@@ -28,7 +28,7 @@ $(SONAME):
+ ln -s $(SONAMEV) $@
+
+ $(LIBRARY): $(OBJ)
+- $(CC) $(CFLAGS) $(LIB_OPTION) -o $(LIBRARY) $(OBJ) -lc
++ $(CC) $(CFLAGS) $(LIB_OPTION) -o $(LIBRARY) $(OBJ) $(LDFLAGS) -lc
+
+ install: $(LIB) all
+ cp -a *.so* $(LIB)
+diff --git a/pkgs/tcl2lua/Makefile b/pkgs/tcl2lua/Makefile
+index dbce85e..be42a85 100644
+--- a/pkgs/tcl2lua/Makefile
++++ b/pkgs/tcl2lua/Makefile
+@@ -25,7 +25,7 @@ $(SONAME):
+ ln -s $(SONAMEV) $@
+
+ $(LIBRARY): $(OBJ)
+- $(CC) $(CFLAGS) $(LIB_OPTION) -o $(LIBRARY) $(OBJ) -lc $(LIBS)
++ $(CC) $(CFLAGS) $(LIB_OPTION) -o $(LIBRARY) $(OBJ) $(LDFLAGS) -lc
$(LIBS)
+
+ install: all
+ cp -a *.so* $(LIB)
