[PR PATCH] Z3 split

[PR PATCH] Z3 split

[Calandracas606]

[-- Attachment #1: Type: text/plain, Size: 1341 bytes --]

There is a new pull request by Calandracas606 against master on the void-packages repository

https://github.com/Calandracas606/void-packages z3-split
https://github.com/void-linux/void-packages/pull/51553

Z3 split
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

This prevents libllvm pulling in python3 dependencies.

Don't rebuild llvm, as it isn't needed.

A patch file from https://github.com/void-linux/void-packages/pull/51553.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-z3-split-51553.patch --]
[-- Type: text/x-diff, Size: 3881 bytes --]

From 8573c3793f84319b69937b5ed2d720ca2b9fa8e4 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Tue, 30 Jul 2024 14:48:50 -0400
Subject: [PATCH 1/2] z3: split into z3, libz3, z3-devel

---
 common/shlibs       |  2 +-
 srcpkgs/libz3       |  1 +
 srcpkgs/z3-devel    |  1 +
 srcpkgs/z3/template | 22 ++++++++++++++++++----
 4 files changed, 21 insertions(+), 5 deletions(-)
 create mode 120000 srcpkgs/libz3
 create mode 120000 srcpkgs/z3-devel

diff --git a/common/shlibs b/common/shlibs
index 5cfafa2be55b75..45d3571fcfbe1c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3274,7 +3274,7 @@ libKF6TextEmoticonsCore.so.1 ktextaddons-1.5.3_2
 libKF6TextGrammarCheck.so.1 ktextaddons-1.5.3_2
 libKF6TextTranslator.so.1 ktextaddons-1.5.3_2
 libKF6TextUtils.so.1 ktextaddons-1.5.3_2
-libz3.so z3-4.6.0_2
+libz3.so libz3-4.13.0_2
 libngspice.so.0 ngspice-35_1
 libvulkan.so.1 vulkan-loader-1.0.57.0_1
 libembb_mtapi_cpp.so embb-1.0.0_3
diff --git a/srcpkgs/libz3 b/srcpkgs/libz3
new file mode 120000
index 00000000000000..e6b37640d809df
--- /dev/null
+++ b/srcpkgs/libz3
@@ -0,0 +1 @@
+z3
\ No newline at end of file
diff --git a/srcpkgs/z3-devel b/srcpkgs/z3-devel
new file mode 120000
index 00000000000000..e6b37640d809df
--- /dev/null
+++ b/srcpkgs/z3-devel
@@ -0,0 +1 @@
+z3
\ No newline at end of file
diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index 82946d3139e872..a0cb8966b022db 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,14 +1,14 @@
 # Template file for 'z3'
 pkgname=z3
 version=4.13.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"
 make_build_args="-C build all examples"
 make_install_args="-C build install"
 hostmakedepends="python3 which $(vopt_if ocaml 'ocaml ocaml-findlib')"
 makedepends="libgomp-devel gmp-devel $(vopt_if ocaml 'ocaml-zarith ncurses-devel')"
-depends="python3 python3-setuptools"
+depends="libz3 python3 python3-setuptools"
 short_desc="Z3 theorem prover and SMT solver (command line + Python3 module)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
@@ -19,8 +19,7 @@ checksum=01bcc61c8362e37bb89fd2430f7e3385e86df7915019bd2ce45de9d9bd934502
 build_options="ocaml"
 desc_option_ocaml="Enable support for OCaml bindings"
 
-shlib_provides="libz3.so"
-subpackages="$(vopt_if ocaml z3-ocaml)"
+subpackages="$(vopt_if ocaml z3-ocaml) libz3 z3-devel"
 
 if [ -z "$CROSS_BUILD" ]; then
 	case "$XBPS_TARGET_MACHINE" in
@@ -50,3 +49,18 @@ z3-ocaml_package() {
 		vmove usr/lib/ocaml
 	}
 }
+
+libz3_package() {
+	short_desc+=" - runtime library"
+	pkg_install() {
+		vmove usr/lib/libz3.so
+	}
+}
+
+z3-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+	}
+}

From fd785484bb9d6398cd8a9318661723452104a338 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Tue, 30 Jul 2024 14:49:23 -0400
Subject: [PATCH 2/2] llvm18: use z3-devel (no rebuild)

---
 srcpkgs/llvm18/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/llvm18/template b/srcpkgs/llvm18/template
index 1bdc9710f00874..1311ecf6fc60b9 100644
--- a/srcpkgs/llvm18/template
+++ b/srcpkgs/llvm18/template
@@ -36,7 +36,7 @@ hostmakedepends="perl python3 zlib-devel libffi-devel swig python3-Sphinx
  python3-recommonmark python3-sphinx-automodapi git python3-sphinx-markdown-tables python3-yaml pkg-config
  python3-mdit-py-plugins python3-MyST-Parser python3-markdown-it $(vopt_if graphviz graphviz)"
 makedepends="python3-devel zlib-devel elfutils-devel libffi-devel libedit-devel
- libxml2-devel binutils-devel z3"
+ libxml2-devel binutils-devel z3-devel"
 short_desc="LLVM Compiler Infrastructure Project - Version 18"
 maintainer="Daniel Martinez <danielmartinez@cock.li>"
 license="Apache-2.0"

Re: [PR PATCH] [Updated] Z3 split

[Calandracas606]

[-- Attachment #1: Type: text/plain, Size: 1359 bytes --]

There is an updated pull request by Calandracas606 against master on the void-packages repository

https://github.com/Calandracas606/void-packages z3-split
https://github.com/void-linux/void-packages/pull/51553

Z3 split
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

This prevents libllvm pulling in python3 dependencies.

Don't rebuild llvm, as it isn't needed.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/51553.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-z3-split-51553.patch --]
[-- Type: text/x-diff, Size: 3881 bytes --]

From 0d8a13640080022c72b64bdfbeb27f3fe0316e82 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Tue, 30 Jul 2024 14:48:50 -0400
Subject: [PATCH 1/2] z3: split into z3, libz3, z3-devel

---
 common/shlibs       |  2 +-
 srcpkgs/libz3       |  1 +
 srcpkgs/z3-devel    |  1 +
 srcpkgs/z3/template | 22 ++++++++++++++++++----
 4 files changed, 21 insertions(+), 5 deletions(-)
 create mode 120000 srcpkgs/libz3
 create mode 120000 srcpkgs/z3-devel

diff --git a/common/shlibs b/common/shlibs
index 5cfafa2be55b75..45d3571fcfbe1c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3274,7 +3274,7 @@ libKF6TextEmoticonsCore.so.1 ktextaddons-1.5.3_2
 libKF6TextGrammarCheck.so.1 ktextaddons-1.5.3_2
 libKF6TextTranslator.so.1 ktextaddons-1.5.3_2
 libKF6TextUtils.so.1 ktextaddons-1.5.3_2
-libz3.so z3-4.6.0_2
+libz3.so libz3-4.13.0_2
 libngspice.so.0 ngspice-35_1
 libvulkan.so.1 vulkan-loader-1.0.57.0_1
 libembb_mtapi_cpp.so embb-1.0.0_3
diff --git a/srcpkgs/libz3 b/srcpkgs/libz3
new file mode 120000
index 00000000000000..e6b37640d809df
--- /dev/null
+++ b/srcpkgs/libz3
@@ -0,0 +1 @@
+z3
\ No newline at end of file
diff --git a/srcpkgs/z3-devel b/srcpkgs/z3-devel
new file mode 120000
index 00000000000000..e6b37640d809df
--- /dev/null
+++ b/srcpkgs/z3-devel
@@ -0,0 +1 @@
+z3
\ No newline at end of file
diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index 82946d3139e872..a0cb8966b022db 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,14 +1,14 @@
 # Template file for 'z3'
 pkgname=z3
 version=4.13.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"
 make_build_args="-C build all examples"
 make_install_args="-C build install"
 hostmakedepends="python3 which $(vopt_if ocaml 'ocaml ocaml-findlib')"
 makedepends="libgomp-devel gmp-devel $(vopt_if ocaml 'ocaml-zarith ncurses-devel')"
-depends="python3 python3-setuptools"
+depends="libz3 python3 python3-setuptools"
 short_desc="Z3 theorem prover and SMT solver (command line + Python3 module)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
@@ -19,8 +19,7 @@ checksum=01bcc61c8362e37bb89fd2430f7e3385e86df7915019bd2ce45de9d9bd934502
 build_options="ocaml"
 desc_option_ocaml="Enable support for OCaml bindings"
 
-shlib_provides="libz3.so"
-subpackages="$(vopt_if ocaml z3-ocaml)"
+subpackages="$(vopt_if ocaml z3-ocaml) libz3 z3-devel"
 
 if [ -z "$CROSS_BUILD" ]; then
 	case "$XBPS_TARGET_MACHINE" in
@@ -50,3 +49,18 @@ z3-ocaml_package() {
 		vmove usr/lib/ocaml
 	}
 }
+
+libz3_package() {
+	short_desc+=" - runtime library"
+	pkg_install() {
+		vmove usr/lib/libz3.so
+	}
+}
+
+z3-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+	}
+}

From b6b4d385264d334795b75ccaa35082f624a69633 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Tue, 30 Jul 2024 14:49:23 -0400
Subject: [PATCH 2/2] llvm18: use z3-devel (no rebuild)

---
 srcpkgs/llvm18/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/llvm18/template b/srcpkgs/llvm18/template
index 1bdc9710f00874..1311ecf6fc60b9 100644
--- a/srcpkgs/llvm18/template
+++ b/srcpkgs/llvm18/template
@@ -36,7 +36,7 @@ hostmakedepends="perl python3 zlib-devel libffi-devel swig python3-Sphinx
  python3-recommonmark python3-sphinx-automodapi git python3-sphinx-markdown-tables python3-yaml pkg-config
  python3-mdit-py-plugins python3-MyST-Parser python3-markdown-it $(vopt_if graphviz graphviz)"
 makedepends="python3-devel zlib-devel elfutils-devel libffi-devel libedit-devel
- libxml2-devel binutils-devel z3"
+ libxml2-devel binutils-devel z3-devel"
 short_desc="LLVM Compiler Infrastructure Project - Version 18"
 maintainer="Daniel Martinez <danielmartinez@cock.li>"
 license="Apache-2.0"

Re: [PR PATCH] [Closed]: Z3 split

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 1323 bytes --]

There's a closed pull request on the void-packages repository

Z3 split
https://github.com/void-linux/void-packages/pull/51553

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686
  - aarch64 (cross)
  - aarch64-musl (cross)
  - armv7l (cross)
  - armv7l-musl (cross)
  - armv6l (cross)
  - armv6l-musl (cross)

This prevents libllvm pulling in python3 dependencies.

Don't rebuild llvm, as it isn't needed.

skip ci to avoid llvm build
[ci skip]