* [gentoo-commits] repo/gentoo:master commit in: dev-lang/swi-prolog/files/, dev-lang/swi-prolog/
@ 2023-02-11 4:26 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-02-11 4:26 UTC (permalink / raw
To: gentoo-commits
commit: 3cc10101043aa2994d613ddd371323275a7beb42
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 03:57:32 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 04:18:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cc10101
dev-lang/swi-prolog: fix configure w/ clang 16
Closes: https://bugs.gentoo.org/879657
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/swi-prolog-9.1.2-configure-clang16.patch | 61 ++++++++++++++++++++++
...log-9.1.2.ebuild => swi-prolog-9.1.2-r1.ebuild} | 5 ++
2 files changed, 66 insertions(+)
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
similarity index 97%
rename from dev-lang/swi-prolog/swi-prolog-9.1.2.ebuild
rename to 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
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/swi-prolog/files/, dev-lang/swi-prolog/
@ 2025-03-30 21:54 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2025-03-30 21:54 UTC (permalink / raw
To: gentoo-commits
commit: 78e188cc7a6aae78915d848fb235fb5279bfe168
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 30 19:28:11 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 30 21:53:38 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78e188cc
dev-lang/swi-prolog: drop 9.1.2-r1
Bug: https://bugs.gentoo.org/952936
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-lang/swi-prolog/Manifest | 1 -
.../files/swi-prolog-9.1.2-configure-clang16.patch | 61 -------
dev-lang/swi-prolog/swi-prolog-9.1.2-r1.ebuild | 177 ---------------------
3 files changed, 239 deletions(-)
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 9f5fb8d5d200..80307ba64351 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -1,2 +1 @@
-DIST swipl-9.1.2.tar.gz 11827220 BLAKE2B e4bf40d1b4d0c48af5e630728208ca849b9a3d0f4129c827b98cd8d666b934218bbbee4c357b67cdd72b9e15046b70a873ffd9e31eaacac620a9aba6a7aec7fd SHA512 d47375c21ed33a2822b9df294a709141fc2e1f0aa61a297bd51a504f6f7859a1deb0ea6705d30b6f8198c71f440b176c7259bd83bff1ac5393ced77fdfbf564a
DIST swipl-9.3.9.tar.gz 12302913 BLAKE2B fb657c58673a250a5a0563a2efd164b491eba15402c4442a0751f2fd3dd176337fc3f8eac828014c8341b852b6546a56c755fa0488daf211329bc8ff02fb67a5 SHA512 6e7247871b6379801b52df7da22d808dd823bc3f42ec1212bd3c3f61d0363dc05135ab389ea08143b99a8b3b356bfed52a749a32a45bb434d8aa6e3514c521b9
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
deleted file mode 100644
index 292728269526..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-9.1.2-configure-clang16.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-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-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-9.1.2-r1.ebuild
deleted file mode 100644
index a776f624d4cb..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-9.1.2-r1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop flag-o-matic java-pkg-opt-2 toolchain-funcs xdg
-
-PATCHSET_VER="0"
-
-MY_P="swipl-${PV}"
-DESCRIPTION="Versatile implementation of the Prolog programming language"
-HOMEPAGE="https://www.swi-prolog.org/"
-SRC_URI="https://www.swi-prolog.org/download/devel/src/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="X archive berkdb +cli debug doc +gmp gui +ipc java minimal odbc pcre pgo qt6 ssl test yaml"
-RESTRICT="!test? ( test )"
-
-# See cmake/PackageSelection.cmake and cmake/DocDepends.cmake
-REQUIRED_USE="
- doc? ( archive )
- minimal? ( !archive !doc !ipc !ssl !test )
-"
-
-COMMON_DEPEND="
- sys-libs/ncurses:=
- sys-libs/zlib:=
- virtual/libcrypt:=
- X? (
- media-libs/freetype:2
- media-libs/fontconfig:1.0
- media-libs/libjpeg-turbo:=
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXft
- x11-libs/libXinerama
- x11-libs/libXpm
- x11-libs/libXt
- )
- archive? ( app-arch/libarchive:= )
- berkdb? ( >=sys-libs/db-4:= )
- cli? (
- dev-libs/libedit
- sys-libs/readline:=
- )
- gmp? ( dev-libs/gmp:0= )
- gui? (
- !qt6? (
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- qt6? ( dev-qt/qtbase:6[gui,widgets] )
- )
- !minimal? ( dev-libs/ossp-uuid )
- odbc? ( dev-db/unixODBC )
- pcre? ( dev-libs/libpcre )
- ssl? ( dev-libs/openssl:0= )
- yaml? ( dev-libs/libyaml )
-"
-RDEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jre-1.8:* )
-"
-DEPEND="${COMMON_DEPEND}
- X? ( x11-base/xorg-proto )
- java? (
- >=virtual/jdk-1.8:*
- test? ( dev-java/junit:4 )
- )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- # Upstream in >= 9.1.3
- "${FILESDIR}"/${P}-configure-clang16.patch
-)
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- if [[ -d "${WORKDIR}"/${PV} ]] ; then
- eapply "${WORKDIR}"/${PV}
- fi
-
- sed \
- -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" \
- -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1 $(get_libdir)/|" \
- -i CMakeLists.txt || die
-
- sed "s/ -Werror//g" \
- -i cmake/GCCBuiltins.cmake \
- -i cmake/Config.cmake \
- -i packages/ssl/CMakeLists.txt || die
-
- local ncurses_lib_flags=$($(tc-getPKG_CONFIG) --libs ncurses)
- sed -i "/project(SWI-Prolog)/a set(CMAKE_REQUIRED_LIBRARIES \${CMAKE_REQUIRED_LIBRARIES} ${ncurses_lib_flags})" CMakeLists.txt || die
- sed -i "s:\${CURSES_LIBRARIES}:${ncurses_lib_flags}:" src/CMakeLists.txt || die
-
- java-pkg-opt-2_src_prepare
- cmake_src_prepare
-}
-
-src_configure() {
- # Lots of UB, see https://gcc.gnu.org/PR113521
- filter-lto
- append-flags -fno-strict-aliasing
- use debug && append-flags -DO_DEBUG
-
- if use pgo; then
- CMAKE_BUILD_TYPE="PGO"
- append-flags -Wno-error=coverage-mismatch
- fi
-
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test)
- -DINSTALL_DOCUMENTATION=$(usex doc)
- -DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
- -DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
- -DSWIPL_PACKAGES_BASIC=$(usex !minimal)
- -DSWIPL_PACKAGES_BDB=$(usex berkdb)
- -DSWIPL_PACKAGES_JAVA=$(usex java)
- -DSWIPL_PACKAGES_ODBC=$(usex odbc)
- -DSWIPL_PACKAGES_PCRE=$(usex pcre)
- -DSWIPL_PACKAGES_SSL=$(usex ssl)
- -DSWIPL_PACKAGES_TERM=$(usex cli)
- -DSWIPL_PACKAGES_TIPC=$(usex ipc)
- -DSWIPL_PACKAGES_X=$(usex X)
- -DSWIPL_PACKAGES_YAML=$(usex yaml)
- -DUSE_GMP=$(usex gmp)
- -DUSE_TCMALLOC=OFF
- )
-
- if use gui; then
- mycmakeargs+=(
- -DSWIPL_PACKAGES_QT=yes
- $(cmake_use_find_package qt6 Qt6)
- )
- else
- mycmakeargs+=( -DSWIPL_PACKAGES_QT=no )
- fi
-
- if use test && use java; then
- mycmakeargs+=( -DJUNIT_JAR="${ESYSROOT}"/usr/share/junit-4/lib/junit.jar )
- fi
-
- export XDG_CONFIG_DIRS="${HOME}"
- export XDG_DATA_DIRS="${HOME}"
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use gui; then
- doicon "${S}"/snap/gui/swipl.png
- make_desktop_entry swipl-win "SWI-Prolog" swipl "Development"
- fi
-}
-
-pkg_preinst() {
- java-pkg-opt-2_pkg_preinst
- use gui && xdg_pkg_preinst
-}
-
-pkg_postinst() {
- use gui && xdg_pkg_postinst
-}
-
-pkg_postrm() {
- use gui && xdg_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-03-30 21:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-11 4:26 [gentoo-commits] repo/gentoo:master commit in: dev-lang/swi-prolog/files/, dev-lang/swi-prolog/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-03-30 21:54 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox