gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

sys-cluster/lmod: Fix another make failure

Browse Source 
Closes: https://bugs.gentoo.org/882095
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
This commit is contained in:
Alfredo Tupone
2026-04-14 15:58:33 +02:00
parent 82bcc6ba46
commit 32590d14df
5 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sys-cluster/lmod/files/lmod-8.6.14-r1-make.patch
View File

@@ -1,6 +1,6 @@
--- a/Makefile.in 2026-04-14 14:24:02.212885947 +0200
+++ b/Makefile.in 2026-04-14 14:28:17.943984410 +0200
@@ -203,7 +203,8 @@
@@ -203,13 +203,15 @@
$(RM) -rf $(DESTDIR)$(MY_PKG_PACKAGE)
@echo "If you added lmod files to /etc/profile.d please remove them."
@@ -10,3 +10,11 @@
lmod_install_targets: $(PKGS) lmodrc_init shell_init startup libexec \
Inst_Tools Inst_Shells Inst_Settarg Inst_Lmod_MF other_tools \
man_pages messageFns i18n spiderCacheSupport ksh_funcs
-install: pre-install zsh_tab_funcs fish_tab_funcs
+install: pre-install
+ $(MAKE) zsh_tab_funcs fish_tab_funcs
$(MAKE) PKGV=$(PKG) shell_init startup
@if test "$(SITE_CONTROLLED_PREFIX)" = "no" ; then \
echo $(RM) $(DESTDIR)$(PKG); \

21
sys-cluster/lmod/files/lmod-8.7.55-make.patch Normal file
View File

@@ -0,0 +1,21 @@
--- a/Makefile.in 2026-04-14 14:24:02.212885947 +0200
+++ b/Makefile.in 2026-04-14 14:28:17.943984410 +0200
@@ -227,14 +227,16 @@
$(RM) -rf $(DESTDIR)$(MY_PKG_PACKAGE)
@echo "If you added lmod files to /etc/profile.d please remove them."
-pre-install: $(DIRLIST) lmod_install_targets
+pre-install: $(DIRLIST)
+ $(MAKE) lmod_install_targets
lmod_install_targets: $(PKGS) lmodrc_init shell_init startup libexec VersionSrc \
Inst_Tools Inst_Shells Inst_Settarg Inst_Lmod_MF other_tools \
man_pages messageFns i18n spiderCacheSupport ksh_funcs \
STVersionSrc
-install: pre-install zsh_tab_funcs fish_tab_funcs
+install: pre-install
+ $(MAKE) zsh_tab_funcs fish_tab_funcs
$(MAKE) PKGV=$(PKG) shell_init startup
@if test "$(SITE_CONTROLLED_PREFIX)" = "no" ; then \
echo $(RM) $(DESTDIR)$(PKG); \

2
sys-cluster/lmod/lmod-8.7.55.ebuild
View File

@@ -47,7 +47,7 @@ BDEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-8.4.19-no-libsandbox.patch
"${FILESDIR}"/${PN}-8.6.14-r1-make.patch
"${FILESDIR}"/${PN}-8.7.55-make.patch
"${FILESDIR}"/${P}-fix-bashism-in-configure-script.patch
)

2
sys-cluster/lmod/lmod-8.7.60.ebuild
View File

@@ -47,7 +47,7 @@ BDEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-8.4.19-no-libsandbox.patch
"${FILESDIR}"/${PN}-8.6.14-r1-make.patch
"${FILESDIR}"/${PN}-8.7.55-make.patch
)
pkg_pretend() {

2
sys-cluster/lmod/lmod-9999.ebuild
View File

@@ -47,7 +47,7 @@ BDEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-8.4.19-no-libsandbox.patch
"${FILESDIR}"/${PN}-8.6.14-r1-make.patch
"${FILESDIR}"/${PN}-8.7.55-make.patch
)
pkg_pretend() {