diff options
Diffstat (limited to 'dev-lang/xsb')
-rw-r--r-- | dev-lang/xsb/Manifest | 3 | ||||
-rw-r--r-- | dev-lang/xsb/files/0001-modern-C-fix-for-implicit-int.patch | 25 | ||||
-rw-r--r-- | dev-lang/xsb/xsb-4.0.0-r1.ebuild (renamed from dev-lang/xsb/xsb-4.0.0.ebuild) | 19 |
3 files changed, 42 insertions, 5 deletions
diff --git a/dev-lang/xsb/Manifest b/dev-lang/xsb/Manifest index 7e006e60c2f0..74b208b64e84 100644 --- a/dev-lang/xsb/Manifest +++ b/dev-lang/xsb/Manifest @@ -1,7 +1,8 @@ +AUX 0001-modern-C-fix-for-implicit-int.patch 998 BLAKE2B 4a9212fc68098914ac12593e2007c7444eb6d7b8f9461640ecc50c8c8c30631475c9e0663808df450b168d8156c346807454eb8795b11e43ac7f4abfa08475e0 SHA512 cb857bdd2bd496531c96a30fb2f4b84f894614adcaed7b6b4f809c3e9e256366e06218e0553c7c15af2b718653f2be3d2a45393849392650550c8d61a7b6bf60 DIST XSB-4-0-0.tar.gz 15340635 BLAKE2B 4832185a64c6c5786ae78e111c25cd3a5ffc2f80aec9c0c83f030ead482868c77b0d7abbfdf0d113b56fea395eb7e69ca2970a82ea70004fb78c0bf4de258a9d SHA512 fed1e0db4874db2508e0c1e716be20cbfbc4f7ed4c16e0b220750cfb3dfceb78bbdce0f8564b68c400af1bc2b8f9e3b35014e8849bba1705bddfab824f41e816 DIST XSB38.tar.gz 13830570 BLAKE2B 60a6ab38435348d09e2d08bc65ca62c06b38495b72f40a6f3f10fe8d23949bfed0c580c9be0c8304d8a88a53b227bb695870b558d67f33a47543de6c1529180f SHA512 457c691450afcf3ed4e2fffc28deaef0949ef4bbf6fd69b504acc6507fbb144f2c6e427a25da2b6346b15b82e803c02d1b6962af698d16c1fcb9a3d56160ea30 DIST xsb-3.8.0-gentoo-patchset-5.tar.gz 7748 BLAKE2B 291beb7a2bf567708119eb200e06fd0d6ac976b5eaea9646d9b5fe9fe67908e01f48b1e55e36fc98f7fe75ee4b654422bc0f9c565e00ac75fe36cccd0439bc2b SHA512 cd3762545bb0b0c5532607741f5946658cacf062c21913c8261988a2162ab848d860ae5a0d11d7a4b8b36994f7fbc91c6e6b4fa607e8cc6ebed434dbf421dec1 DIST xsb-4.0.0-gentoo-patchset-3.tar.gz 10487 BLAKE2B 37253b8e5bfd36cdf51f231e75215ea31d50f121e3c8b1126adfbc8998622f2a4ebdb976b3c67c13738095fd4b23b35e166a895c4ee038b1cae7ad962684ce86 SHA512 51738e5dd64711f42e5c8d831c955c533dbe900a129cc0e7eb5d393ef13d7b6206e5e9fc0e90b1422adb2d8c00ec870a50164d420a02da23770ba0ad3350b10b EBUILD xsb-3.8.0.ebuild 3684 BLAKE2B f3cb8e31a72ba410cbd38ca3da137097bca0fa5bce2799d47b848a12c32dbd4918cbdc440df570833ff377b85c565ff8417d7d244a7421989508df4ae2c837a3 SHA512 bec9a89c10256988a9ab42ebd75ee25fab4acf0eb3cf08614e6644e6dee8c49e3d95c77095fcd31fbd017b3c53a337d30efa418a4129570b8d2c2268704d8250 -EBUILD xsb-4.0.0.ebuild 4193 BLAKE2B 6f8ca08d69f02672c62c42607cf6b8f3002211eab29df515a6b75f6dee1c19b1a956d1c9306e7440ca87eea531ed22fa0b718512f385f9e4751cf17d563aa11f SHA512 dc4751a7bf7c9cdcfd16f0a8a2055c068ec5220174aabdc50fe42088645cdcf02aa590edb01c0aa6bed1b2302b258111eb9342fd795668977859764c3a8731a6 +EBUILD xsb-4.0.0-r1.ebuild 4520 BLAKE2B a85b4ca2f2912984c0eeb173c578fc69698ef01f66399ccc062b23c55998d5bfa57a96eafed35e9913b52e0768bdfe332e49092964edf34742f5762bb90e38c9 SHA512 9f4ad90c5686f5b4c8a91ecad0a0abc3892d0e3ff8981d99e1aeaa594f8c9b3d5038592d6dc1ed15cab082f414f487240feebd61e1db83fbfa9decacc0a52488 MISC metadata.xml 407 BLAKE2B bf2a1312d435a5b31fcc0536849ded569d7512ec8e2e7471c253586bc866e7ffb915311725efeef8f2c7d227a82ba615a5fa69380454efb654e719177e35a67e SHA512 87aa031c2a64c878f24be293a3e4cdf391b696a7ef96faa4f209fcfeb56db74f29a1e3de7ad845f84eca86d8b81944ecae6e4ea1119699b72bfcf125735a0c03 diff --git a/dev-lang/xsb/files/0001-modern-C-fix-for-implicit-int.patch b/dev-lang/xsb/files/0001-modern-C-fix-for-implicit-int.patch new file mode 100644 index 000000000000..d70019db4b5f --- /dev/null +++ b/dev-lang/xsb/files/0001-modern-C-fix-for-implicit-int.patch @@ -0,0 +1,25 @@ +From 3dd24018e4f5c48c382588dd9d8da5b80056a55b Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Thu, 14 Mar 2024 20:28:31 -0400 +Subject: [PATCH] modern C fix for implicit-int + +--- + build/configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/configure.in b/build/configure.in +index d51bfeb..6999565 100644 +--- a/build/configure.in ++++ b/build/configure.in +@@ -1346,7 +1346,7 @@ LDFLAGS="-Wl,-export-dynamic" + AC_MSG_CHECKING([whether loader understands -Wl,-export-dynamic]) + # Ideally we should use AC_LINK_IFELSE instead of the obsolete AC_TRY_LINK + #AC_TRY_LINK([],[], __export_dynamic=yes, __export_dynamic=no) +-AC_LINK_IFELSE([AC_LANG_SOURCE([[main(){return 0;}]])], __export_dynamic=yes, __export_dynamic=no) ++AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(){return 0;}]])], __export_dynamic=yes, __export_dynamic=no) + AC_MSG_RESULT($__export_dynamic) + LDFLAGS=$TEMP_LDFLAGS + ####### End of test for -export-dynamic option of ld +-- +2.43.2 + diff --git a/dev-lang/xsb/xsb-4.0.0.ebuild b/dev-lang/xsb/xsb-4.0.0-r1.ebuild index 6739cc6695c0..bf99d5d3efb6 100644 --- a/dev-lang/xsb/xsb-4.0.0.ebuild +++ b/dev-lang/xsb/xsb-4.0.0-r1.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PATCHSET_VER="3" -inherit autotools java-pkg-opt-2 +inherit autotools flag-o-matic java-pkg-opt-2 DESCRIPTION="XSB is a logic programming and deductive database system" -HOMEPAGE="http://xsb.sourceforge.net" +HOMEPAGE="https://xsb.sourceforge.net" SRC_URI="https://downloads.sourceforge.net/xsb/XSB-$(ver_rs 1-3 -).tar.gz https://dev.gentoo.org/~keri/distfiles/xsb/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" @@ -30,7 +30,12 @@ DEPEND="${RDEPEND}" S="${WORKDIR}"/XSB -PATCHES=( "${WORKDIR}/${PV}" ) +PATCHES=( + "${WORKDIR}/${PV}" + # https://bugs.gentoo.org/870970 + # https://sourceforge.net/p/xsb/bugs/265/ + "${FILESDIR}"/0001-modern-C-fix-for-implicit-int.patch +) src_prepare() { default @@ -50,6 +55,12 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing, -Werror=lto-type-mismatch + # https://bugs.gentoo.org/855659 + # https://sourceforge.net/p/xsb/bugs/264/ + append-flags -fno-strict-aliasing + filter-lto + cd "${S}"/build econf \ |