packages/Lmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!7 Update to version 8.7.24

Browse Source 
From: @wang--ge 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-05-12 09:53:47 +00:00 committed by Gitee
commit e937e09431
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 7 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Lmod-8.7.4.tar.gz → 8.7.24.tar.gz
View File

Binary file not shown.

10
Lmod.spec
View File

@ -1,13 +1,14 @@
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
%global debug_package %{nil}
Name: Lmod
Version: 8.7.4
Release: 2
Version: 8.7.24
Release: 1
Summary: Environmental Modules System in Lua
License: MIT and LGPLv2
URL: https://github.com/TACC/Lmod
Source0: https://github.com/TACC/Lmod/archive/%{version}.tar.gz#/Lmod-%{version}.tar.gz
Source0: https://github.com/TACC/Lmod/archive/refs/tags/%{version}.tar.gz
Source1: macros.%{name}
# redirect echo stmts to stderr in init/bash.in
@ -98,6 +99,9 @@ install -Dpm 644 %{SOURCE1} %{buildroot}/%{macrosdir}/macros.%{name}
%changelog
* Fri May 05 2023 Ge Wang <wang__ge@126.com> - 8.7.24-1
- Update to 8.7.24
* Thu Mar 02 2023 xu_ping <xuping33@h-partners.com> - 8.7.4-2
- Add debug package to add strip.

28
Support-for-lua-5.4-added.patch
View File

@ -1,28 +0,0 @@
diff -up Lmod-8.3.17/configure.ac.lua54 Lmod-8.3.17/configure.ac
--- Lmod-8.3.17/configure.ac.lua54 2020-07-01 07:36:21.485611936 -0400
+++ Lmod-8.3.17/configure.ac 2020-07-01 07:36:42.517262553 -0400
@@ -667,8 +667,8 @@ fi
IntLuaV=$( $luaprog -e "_,_,M,m=_VERSION:gsub('Lua%s+',''):find('(%d+)%.(%d)'); print(math.floor(tonumber(M)*1000+tonumber(m)))")
-if test $IntLuaV -lt 5001 -o $IntLuaV -gt 5003; then
- echo "Error: Lmod requires versions 5.1 or 5.2 or 5.3, You have: $LuaV"
+if test $IntLuaV -lt 5001 -o $IntLuaV -gt 5004; then
+ echo "Error: Lmod requires versions 5.1 or 5.2 or 5.3 or 5.4, You have: $LuaV"
rm -f makefile
exit 1
fi
diff -up Lmod-8.3.17/configure.lua54 Lmod-8.3.17/configure
--- Lmod-8.3.17/configure.lua54 2020-07-01 07:37:35.882376092 -0400
+++ Lmod-8.3.17/configure 2020-07-01 07:37:48.545165732 -0400
@@ -4942,8 +4942,8 @@ fi
IntLuaV=$( $luaprog -e "_,_,M,m=_VERSION:gsub('Lua%s+',''):find('(%d+)%.(%d)'); print(math.floor(tonumber(M)*1000+tonumber(m)))")
-if test $IntLuaV -lt 5001 -o $IntLuaV -gt 5003; then
- echo "Error: Lmod requires versions 5.1 or 5.2 or 5.3, You have: $LuaV"
+if test $IntLuaV -lt 5001 -o $IntLuaV -gt 5004; then
+ echo "Error: Lmod requires versions 5.1 or 5.2 or 5.3 or 5.4, You have: $LuaV"
rm -f makefile
exit 1
fi

20
lmod-8.1.17-echo_stderr.patch
View File

@ -1,20 +0,0 @@
--- Lmod-8.1.17/init/bash.in 2019-12-11 11:20:35.213144077 -0800
+++ Lmod-8.1.17/init/bash.in.new 2019-12-11 11:17:24.024473520 -0800
@@ -18,7 +18,7 @@
export LMOD_PKG=@PKGV@
if [ -n "${__lmod_vx:-}" ]; then
- echo "Shell debugging temporarily silenced: export LMOD_SH_DBG_ON=1 for this output ($LMOD_PKG/init/bash)"
+ echo "Shell debugging temporarily silenced: export LMOD_SH_DBG_ON=1 for this output ($LMOD_PKG/init/bash)" 1>&2
fi
export LMOD_DIR=$LMOD_PKG/libexec
@@ -163,7 +163,7 @@
# Restoring XTRACE and VERBOSE states.
if [ -n "${__lmod_vx:-}" ]; then
- echo "Shell debugging restarted"
+ echo "Shell debugging restarted" 1>&2
set -$__lmod_vx;
unset __lmod_vx;
fi;