diff options
Diffstat (limited to 'dev-lang/swi-prolog')
| -rw-r--r-- | dev-lang/swi-prolog/Manifest | 3 | ||||
| -rw-r--r-- | dev-lang/swi-prolog/files/swi-prolog-9.1.2-configure-clang16.patch | 61 | ||||
| -rw-r--r-- | dev-lang/swi-prolog/swi-prolog-9.1.2-r1.ebuild (renamed from dev-lang/swi-prolog/swi-prolog-9.1.2.ebuild) | 5 |
3 files changed, 68 insertions, 1 deletions
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest index d488b00fea2e..2ad60fdbc171 100644 --- a/dev-lang/swi-prolog/Manifest +++ b/dev-lang/swi-prolog/Manifest @@ -1,3 +1,4 @@ +AUX swi-prolog-9.1.2-configure-clang16.patch 2605 BLAKE2B c0e547c31c5d613659d92cebd66a1a67ce12fe97f8609116eccc294e5515170521a7c266a88655040da75e126b7314ea7a05f7d35e5d30e010e8df0998fe6945 SHA512 6863b15a7e9aa313ef06a98a6a3a8e4a5c494684c212ba8995a7995e07d1679b7d8b5b0a271209344cd6a858d4a65e462083e9e450396017148c0ee220c89fc0 DIST swipl-8.4.1.tar.gz 11386908 BLAKE2B bd53355abe63ffde348ed38b0e7fee4bcba4e74128c73904a72ca3ba2021a8b650d08480a643ea3336f3fc6d1d7bcf7651deb1d32608581ce43bc118288df6da SHA512 22806d8abd0b729e27a6d7bbbd0df37af8af21bb186a8de58ec5f9a1d32c9a477838fd10155ff21998737fcc2aaf4711d1d4d5457ce5d62e328d5da032474ee5 DIST swipl-8.5.11.tar.gz 11480652 BLAKE2B eb812a272d3fbcb181c5cee0dd033f6b7ffdee467bf37c645a98a34ce455189ded7b7c678482e992918477160a6a585ea07dcc38a4aa123eb5f4e04a35dc20d0 SHA512 00387d25548198e0d738cc210a0769130a6ad6fb0596dec04539b1fb85ab8d660a73fec1fe5f5d01878b90e8736018dbb0c8cfd240e1d6b2b62c0bb892f0826c DIST swipl-8.5.12.tar.gz 11489072 BLAKE2B 1c8ce7a0386c20be8e2eeac9d31df5862adf78ce0341e31b1ebcc42a923403c28707da12b88ba0773f5ebfdd61efe5a8d38a99f8f20aa47672fd51cdc4fbfb8e SHA512 d530fb7048cd80fa0f07b7b026279915cbb58dd7b8199daafe13c22659c5ffeac62168bcc9208c7bbd72616f54d453f5161c1fc08bf5497ba87abc12e5e8e7df @@ -5,5 +6,5 @@ DIST swipl-9.1.2.tar.gz 11827220 BLAKE2B e4bf40d1b4d0c48af5e630728208ca849b9a3d0 EBUILD swi-prolog-8.4.1.ebuild 3177 BLAKE2B 2c3984b0a9aff83643922c5d8ad4beaab21a6ddcf6cd4090e23ad4a770d104e6d3f2f75c9d4bf910e720e23eb5e1f73ae999c5dc7012c2b0ddd660171478f9c2 SHA512 488763c483a760a468319742bca8df6135dbb8f754176dfc21b337d051c48f42d7ceddb210bddaaa3a599d5b162a474694bfbb8a68f16d146496d1d087ec9c29 EBUILD swi-prolog-8.5.11.ebuild 3191 BLAKE2B 4a7e883cb444a54f71acd8fa37bdef88b900c0dcaa948a9429ea1d320cb650c1fa381a0780570f69e96eeb341f20d54ec4715700aa645255c5d140c6dcc798bd SHA512 efb05a84a5876bda9c55970f98b3a0195fa34a495e1c7b16d6058d18c9ac1091e01e975f0fc00d3416b84bcfdc086268e5e3c206fdbcf49e546a921bcbf47785 EBUILD swi-prolog-8.5.12.ebuild 3249 BLAKE2B a0fee95fa73564d28ca8fdba9293ab89d6abb64c029f9166a181aee4c4adf0afba0bda99cac671b1b61c564f0cb4fac2cc8941010e38384cc63dfdef37fe82da SHA512 df2624efb0fc37a7a445860c62599bbc615eb4b3e90b172b0721985be178e851e0ff81ee0c8dd1adab061a122ab9bdd5408b0d5be13e821ca73e14bc1c5fd847 -EBUILD swi-prolog-9.1.2.ebuild 3906 BLAKE2B a5516b51984baee69a69d22466a78b1cefd17d872a6928c53b9f5b2b7d2a708bb0cf7d8446b54d80598006df6cd693cd044e3b8d5f09caad96214ed80d1a4038 SHA512 3e70f0d51650b829b7c442c80cbe6a069cf72bc7447cbdece7923ef8e5ae0e38418836dc136bde166f4a6ee6ff89a6490411aaedf5be1d61f9c2978773c3ba6f +EBUILD swi-prolog-9.1.2-r1.ebuild 3987 BLAKE2B c1570e0a13b210a33ddb26bde6cc625a0264a2ee6e579542d78d3e69394dde53fd4f27bcff2ae2dc928d58d9b3c2c4fc8c19b585eac517f19c6fd23fbe65901b SHA512 7005356296d384afee8454a4967afe3a3eb87d62d3dd097f754898542abd45ee3e2a4ee65411715094527d711c2303e139e8876bd98971777e8963729f3cc6fd MISC metadata.xml 835 BLAKE2B 74eb565d22c6f7767dcb593fddff34fefff136f81558f674d62ce259d0988b15294c9947fff4b594e800108906a7f024c36c0b52d2ce090e86da0cb88cde163c SHA512 5f337a4020d75a08af811b76661c6e0206be0765f3a3a467947465217676665c5ba8f19d1914435d072e1d12383405801696342259984e2a0e72e80ad5073dd6 diff --git a/dev-lang/swi-prolog/files/swi-prolog-9.1.2-configure-clang16.patch b/dev-lang/swi-prolog/files/swi-prolog-9.1.2-configure-clang16.patch new file mode 100644 index 000000000000..292728269526 --- /dev/null +++ b/dev-lang/swi-prolog/files/swi-prolog-9.1.2-configure-clang16.patch @@ -0,0 +1,61 @@ +https://bugs.gentoo.org/879657 +https://github.com/SWI-Prolog/swipl-devel/commit/2328d9d54c8aa368a4bf0165b1b811d1f31ba0f7 +https://github.com/SWI-Prolog/swipl-devel/commit/0d1088443348b71a3624835a19469e2b6cc7e284 + +From 2328d9d54c8aa368a4bf0165b1b811d1f31ba0f7 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Tue, 10 Jan 2023 14:08:04 +0100 +Subject: [PATCH] cmake: Fix C99 compatibility issues in GCC built-in detection + +Future compilers may not support implicit ints or implicit +function declarations, so avoid them, by using an explicit int +type and including <alloca.h> for the alloca function. +--- a/cmake/GCCBuiltins.cmake ++++ b/cmake/GCCBuiltins.cmake +@@ -22,7 +22,7 @@ check_c_source_compiles( + "volatile int i=0; int main() { return 0; }" + HAVE_VOLATILE) + check_c_source_compiles( +- "static inline foo() { return 0; } int main() { return foo(); }" ++ "static inline int foo() { return 0; } int main() { return foo(); }" + HAVE_INLINE) + check_c_source_compiles( + "int main() { void *p = &&lbl; goto *p; lbl: return 0; }" +@@ -45,7 +45,7 @@ check_visibility() + # Builtin functions that lead to conflicts + + check_c_source_compiles( +- "int main() { char *s = alloca(10); return s!=0; }" ++ "#include <alloca.h>\nint main() { char *s = alloca(10); return s!=0; }" + HAVE_ALLOCA) + check_c_source_compiles( + "#include <math.h>\nint main() { double x; return signbit(x); }" + +From 0d1088443348b71a3624835a19469e2b6cc7e284 Mon Sep 17 00:00:00 2001 +From: Jan Wielemaker <J.Wielemaker@vu.nl> +Date: Wed, 11 Jan 2023 13:30:34 +0100 +Subject: [PATCH] Cleanup some no longer used GCC __builtin checks. + +--- a/cmake/GCCBuiltins.cmake ++++ b/cmake/GCCBuiltins.cmake +@@ -9,12 +9,6 @@ check_c_source_compiles( + check_c_source_compiles( + "int i=0; int main() { return __builtin_expect(i, 0) ? 0 : 1; }" + HAVE___BUILTIN_EXPECT) +-check_c_source_compiles( +- "int i=0; struct {int x[10];} st; int main() { return __builtin_choose_expr(1, i, st); }" +- HAVE___BUILTIN_CHOOSE_EXPR) +-check_c_source_compiles( +- "int i=0; int main() { return __builtin_types_compatible_p(typeof(i), int); }" +- HAVE___BUILTIN_TYPES_COMPATIBLE_P) + check_c_source_compiles( + "__thread int i=0; int main() { return 0; }" + HAVE___THREAD) +@@ -48,5 +42,5 @@ check_c_source_compiles( + "#include <alloca.h>\nint main() { char *s = alloca(10); return s!=0; }" + HAVE_ALLOCA) + check_c_source_compiles( +- "#include <math.h>\nint main() { double x; return signbit(x); }" ++ "#include <math.h>\nint main() { double x = 0.0; return signbit(x); }" + HAVE_SIGNBIT) + diff --git a/dev-lang/swi-prolog/swi-prolog-9.1.2.ebuild b/dev-lang/swi-prolog/swi-prolog-9.1.2-r1.ebuild index 5449898d6a02..7cee8edc9d51 100644 --- a/dev-lang/swi-prolog/swi-prolog-9.1.2.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-9.1.2-r1.ebuild @@ -73,6 +73,11 @@ DEPEND="${COMMON_DEPEND} " BDEPEND="virtual/pkgconfig" +PATCHES=( + # Upstream in >= 9.1.3 + "${FILESDIR}"/${P}-configure-clang16.patch +) + pkg_setup() { java-pkg-opt-2_pkg_setup } |