commit: fb8013d3521d8c7d31a1d2bc3eaad9ef3faf99f8 Author: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de> AuthorDate: Sun Oct 23 07:16:58 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Oct 31 17:39:47 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb8013d3
app-misc/egads: revbump, make build clang16 compatible Bug: https://bugs.gentoo.org/312983 Closes: https://bugs.gentoo.org/870853 Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de> Closes: https://github.com/gentoo/gentoo/pull/27910 Signed-off-by: Sam James <sam <AT> gentoo.org> ...egads-0.9.5-r1.ebuild => egads-0.9.5-r2.ebuild} | 27 +++++++++++++++------- .../egads-0.9.5-make-build-work-with-clang16.patch | 16 +++++++++++++ 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/app-misc/egads/egads-0.9.5-r1.ebuild b/app-misc/egads/egads-0.9.5-r2.ebuild similarity index 74% rename from app-misc/egads/egads-0.9.5-r1.ebuild rename to app-misc/egads/egads-0.9.5-r2.ebuild index 032827037c57..521388fd56d9 100644 --- a/app-misc/egads/egads-0.9.5-r1.ebuild +++ b/app-misc/egads/egads-0.9.5-r2.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit toolchain-funcs +inherit autotools toolchain-funcs flag-o-matic DESCRIPTION="Entropy Gathering And Distribution System" -HOMEPAGE="http://www.securesoftware.com/download_egads.htm"; +HOMEPAGE="http://www.securesoftware.com"; SRC_URI="http://www.securesoftware.com/${PN}/${P}.tar.gz"; LICENSE="BSD" @@ -15,21 +15,31 @@ KEYWORDS="~amd64 ~ppc x86" EGADS_DATADIR=/var/run/egads +PATCHES=( + "${FILESDIR}"/${P}-make-build-work-with-clang16.patch +) + src_prepare() { default + + rm aclocal.m4 || die + + eautoreconf + sed -i \ -e '/^BINDIR/d' \ -e '/^LIBDIR/d' \ -e '/^INCLUDEDIR/d' \ "${S}"/Makefile.in || die "Failed to fix Makefile.in" - tc-export CC AR RANLIB } src_configure() { - econf \ - --with-egads-datadir="${EGADS_DATADIR}" \ - --with-bindir="${EPREFIX}"/usr/sbin \ - --disable-static + tc-export CC AR RANLIB + + # bug #312983 + append-flags -fno-strict-aliasing + + econf --with-egads-datadir="${EGADS_DATADIR}" } src_compile() { @@ -39,6 +49,7 @@ src_compile() { src_install() { keepdir ${EGADS_DATADIR} fperms +t ${EGADS_DATADIR} + # NOT parallel safe, and no DESTDIR support emake -j1 install \ BINDIR="${D}"/usr/sbin \ diff --git a/app-misc/egads/files/egads-0.9.5-make-build-work-with-clang16.patch b/app-misc/egads/files/egads-0.9.5-make-build-work-with-clang16.patch new file mode 100644 index 000000000000..4f1b99c8f319 --- /dev/null +++ b/app-misc/egads/files/egads-0.9.5-make-build-work-with-clang16.patch @@ -0,0 +1,16 @@ +Clang16 does not allow K&R C function declarations by default. This changes the declaration to a modern C function declaration. + +Signed-off-by: Pascal Jäger <pascal.jae...@leimstift.de> + +--- a/sha1.c ++++ b/sha1.c +@@ -131,8 +131,7 @@ void SHAInit(SHA_CTX *shsInfo) + + Note that this corrupts the shsInfo->data area */ + +-static void SHSTransform( digest, data ) +- UINT4 *digest, *data ; ++static void SHSTransform(UINT4 *digest,UINT4 *data) + { + UINT4 A, B, C, D, E; /* Local vars */ + UINT4 eData[ 16 ]; /* Expanded data */
