commit: 03f7c95ca1774e34eea3317956ca80c297eff38b Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Sat Feb 20 19:31:20 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Feb 20 19:31:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03f7c95c
sys-cluster/wulfware: Apply gcc-10 workaround Closes: https://bugs.gentoo.org/771030 Closes: https://bugs.gentoo.org/728164 Closes: https://bugs.gentoo.org/677316 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Signed-off-by: David Seifert <soap <AT> gentoo.org> .../files/wulfware-2.6.0-opts_and_strip.patch | 25 +++++++++------------- sys-cluster/wulfware/metadata.xml | 2 +- sys-cluster/wulfware/wulfware-2.6.0.ebuild | 19 ++++++++-------- 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/sys-cluster/wulfware/files/wulfware-2.6.0-opts_and_strip.patch b/sys-cluster/wulfware/files/wulfware-2.6.0-opts_and_strip.patch index bc26b7baa99..2db707d6a30 100644 --- a/sys-cluster/wulfware/files/wulfware-2.6.0-opts_and_strip.patch +++ b/sys-cluster/wulfware/files/wulfware-2.6.0-opts_and_strip.patch @@ -1,6 +1,5 @@ -diff -ur wulfware-2.6.0.orig/libwulf/Makefile.am wulfware-2.6.0/libwulf/Makefile.am ---- wulfware-2.6.0.orig/libwulf/Makefile.am 2007-07-12 00:58:25.000000000 +0300 -+++ wulfware-2.6.0/libwulf/Makefile.am 2008-05-22 16:25:18.000000000 +0300 +--- a/libwulf/Makefile.am ++++ b/libwulf/Makefile.am @@ -48,14 +48,14 @@ # Define parameters and directives needed in compile/link steps. #======================================================================== @@ -28,9 +27,8 @@ diff -ur wulfware-2.6.0.orig/libwulf/Makefile.am wulfware-2.6.0/libwulf/Makefile install -d $(includedir)/wulfware; \ install -m 644 ../include/wulfware/*.h $(includedir)/wulfware; \ install -d $(prefix)/share/man/man3; \ -diff -ur wulfware-2.6.0.orig/wulf2html/Makefile.am wulfware-2.6.0/wulf2html/Makefile.am ---- wulfware-2.6.0.orig/wulf2html/Makefile.am 2007-07-12 00:58:25.000000000 +0300 -+++ wulfware-2.6.0/wulf2html/Makefile.am 2008-05-22 12:52:36.000000000 +0300 +--- a/wulf2html/Makefile.am ++++ b/wulf2html/Makefile.am @@ -62,8 +62,7 @@ echo "Clean does nothing" @@ -41,9 +39,8 @@ diff -ur wulfware-2.6.0.orig/wulf2html/Makefile.am wulfware-2.6.0/wulf2html/Make install -m 755 $(PROGRAM) $(prefix)/bin; \ install -d $(sysconfdir); \ install -d $(sysconfdir)/init.d; \ -diff -ur wulfware-2.6.0.orig/wulflogger/Makefile.am wulfware-2.6.0/wulflogger/Makefile.am ---- wulfware-2.6.0.orig/wulflogger/Makefile.am 2007-07-12 00:58:25.000000000 +0300 -+++ wulfware-2.6.0/wulflogger/Makefile.am 2008-05-22 16:25:14.000000000 +0300 +--- a/wulflogger/Makefile.am ++++ b/wulflogger/Makefile.am @@ -54,13 +54,13 @@ # Define parameters and directives needed in compile/link steps. #======================================================================== @@ -71,9 +68,8 @@ diff -ur wulfware-2.6.0.orig/wulflogger/Makefile.am wulfware-2.6.0/wulflogger/Ma install -m 755 $(PROGRAM) $(prefix)/bin; \ install -d $(prefix)/share/man/man1; \ gzip -c -9 $(PROGRAM).1 > $(PROGRAM).1.gz; \ -diff -ur wulfware-2.6.0.orig/wulfstat/Makefile.am wulfware-2.6.0/wulfstat/Makefile.am ---- wulfware-2.6.0.orig/wulfstat/Makefile.am 2007-07-12 00:58:25.000000000 +0300 -+++ wulfware-2.6.0/wulfstat/Makefile.am 2008-05-22 16:23:57.000000000 +0300 +--- a/wulfstat/Makefile.am ++++ b/wulfstat/Makefile.am @@ -54,13 +54,13 @@ # Define parameters and directives needed in compile/link steps. #======================================================================== @@ -101,9 +97,8 @@ diff -ur wulfware-2.6.0.orig/wulfstat/Makefile.am wulfware-2.6.0/wulfstat/Makefi install -m 755 $(PROGRAM) $(prefix)/bin; \ install -d $(prefix)/share/man/man1; \ gzip -c -9 $(PROGRAM).1 > $(PROGRAM).1.gz; \ -diff -ur wulfware-2.6.0.orig/xmlsysd/Makefile.am wulfware-2.6.0/xmlsysd/Makefile.am ---- wulfware-2.6.0.orig/xmlsysd/Makefile.am 2007-07-12 00:58:25.000000000 +0300 -+++ wulfware-2.6.0/xmlsysd/Makefile.am 2008-05-22 16:28:30.000000000 +0300 +--- a/xmlsysd/Makefile.am ++++ b/xmlsysd/Makefile.am @@ -60,13 +60,13 @@ # Define parameters and directives needed in compile/link steps. #======================================================================== diff --git a/sys-cluster/wulfware/metadata.xml b/sys-cluster/wulfware/metadata.xml index 6f49eba8f49..7a38bb90096 100644 --- a/sys-cluster/wulfware/metadata.xml +++ b/sys-cluster/wulfware/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/sys-cluster/wulfware/wulfware-2.6.0.ebuild b/sys-cluster/wulfware/wulfware-2.6.0.ebuild index 1d6812f51d5..995fea33c95 100644 --- a/sys-cluster/wulfware/wulfware-2.6.0.ebuild +++ b/sys-cluster/wulfware/wulfware-2.6.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools toolchain-funcs +inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="Applications to monitor on a beowulf- or GRID-style clusters" HOMEPAGE="http://www.phy.duke.edu/~rgb/Beowulf/wulfware.php"; @@ -12,18 +12,15 @@ SRC_URI="http://www.phy.duke.edu/~rgb/Beowulf/${PN}/${P}.tgz"; LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND=" dev-libs/libxml2:= sys-libs/ncurses:0= - sys-libs/zlib:= -" + sys-libs/zlib:=" DEPEND=" ${RDEPEND} !sys-cluster/wulfstat - !sys-cluster/xmlsysd -" + !sys-cluster/xmlsysd" PATCHES=( "${FILESDIR}"/${P}-opts_and_strip.patch @@ -37,6 +34,7 @@ src_prepare() { src_configure() { tc-export CC + append-cflags -fcommon econf } @@ -45,14 +43,17 @@ src_compile() { } src_install() { - emake prefix="${D}/usr" libdir="${D}/usr/$(get_libdir)" \ - includedir="${D}/usr/include" sysconfdir="${D}/etc" \ + emake prefix="${ED}"/usr libdir="${ED}"/usr/$(get_libdir) \ + includedir="${ED}"/usr/include sysconfdir="${ED}"/etc \ install dodoc AUTHORS ChangeLog NEWS NOTES README xmlsysd/DESIGN # FIXME: Update to Gentoo style init script. rm -r "${ED}"/etc/init.d/wulf2html || die + + dosym libwulf.so.2.6.0 /usr/lib64/libwulf.so.2 + gunzip "${ED}"/usr/share/man/man?/*.gz || die } pkg_postinst() {
