[gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile-zlib/
commit: 81e2f85bf3be7de84e8f74b152a8cd6fe4a24fbb
Author: Maciej Barć gentoo org>
AuthorDate: Wed Feb 28 20:26:38 2024 +
Commit: Maciej Barć gentoo org>
CommitDate: Wed Feb 28 21:21:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81e2f85b
dev-scheme/guile-zlib: add missing pkgconfig dependencies
as also declared inside this pkg guix.scm
Signed-off-by: Maciej Barć gentoo.org>
.../{guile-zlib-0.1.0-r2.ebuild => guile-zlib-0.1.0-r3.ebuild} | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dev-scheme/guile-zlib/guile-zlib-0.1.0-r2.ebuild
b/dev-scheme/guile-zlib/guile-zlib-0.1.0-r3.ebuild
similarity index 94%
rename from dev-scheme/guile-zlib/guile-zlib-0.1.0-r2.ebuild
rename to dev-scheme/guile-zlib/guile-zlib-0.1.0-r3.ebuild
index 6a0b2a379b87..b9ab27ef9a39 100644
--- a/dev-scheme/guile-zlib/guile-zlib-0.1.0-r2.ebuild
+++ b/dev-scheme/guile-zlib/guile-zlib-0.1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -30,6 +30,9 @@ RDEPEND="
DEPEND="
${RDEPEND}
"
+BDEPEND="
+ virtual/pkgconfig
+"
DOCS=( AUTHORS ChangeLog HACKING NEWS README.org )
PATCHES=( "${FILESDIR}/${PN}-0.1.0-gentoo.patch" )
[gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile-zlib/
commit: 0011cfe79cc62c70148f90026adbbe6f3367f6fc
Author: Maciej Barć gentoo org>
AuthorDate: Wed Feb 28 08:39:33 2024 +
Commit: Maciej Barć gentoo org>
CommitDate: Wed Feb 28 08:46:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0011cfe7
dev-scheme/guile-zlib: let pkg-config find zlib dir
See-also:
https://github.com/trofi/nix-guix-gentoo/commit/30bafb179db756c568ee498856a1f137cfa50530
Bug: https://github.com/trofi/nix-guix-gentoo/issues/23
Closes: https://bugs.gentoo.org/877383
Signed-off-by: Maciej Barć gentoo.org>
...-0.1.0-r1.ebuild => guile-zlib-0.1.0-r2.ebuild} | 29 +-
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/dev-scheme/guile-zlib/guile-zlib-0.1.0-r1.ebuild
b/dev-scheme/guile-zlib/guile-zlib-0.1.0-r2.ebuild
similarity index 68%
rename from dev-scheme/guile-zlib/guile-zlib-0.1.0-r1.ebuild
rename to dev-scheme/guile-zlib/guile-zlib-0.1.0-r2.ebuild
index 46d194b84e7f..6a0b2a379b87 100644
--- a/dev-scheme/guile-zlib/guile-zlib-0.1.0-r1.ebuild
+++ b/dev-scheme/guile-zlib/guile-zlib-0.1.0-r2.ebuild
@@ -7,21 +7,32 @@ inherit autotools
DESCRIPTION="GNU Guile library providing bindings to zlib"
HOMEPAGE="https://notabug.org/guile-zlib/guile-zlib/;
-SRC_URI="https://notabug.org/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}
+
+if [[ "${PV}" == ** ]] ; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://notabug.org/${PN}/${PN}.git;
+else
+ SRC_URI="https://notabug.org/${PN}/${PN}/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+ S="${WORKDIR}/${PN}"
+
+ KEYWORDS="~amd64 ~x86"
+fi
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
RDEPEND="
>=dev-scheme/guile-2.0.0:=
- sys-libs/zlib
+ >=sys-libs/zlib-1.3-r4
+"
+DEPEND="
+ ${RDEPEND}
"
-DEPEND="${RDEPEND}"
DOCS=( AUTHORS ChangeLog HACKING NEWS README.org )
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=( "${FILESDIR}/${PN}-0.1.0-gentoo.patch" )
# guile generates ELF files without use of C or machine code
# It's a portage's false positive. bug #677600
@@ -36,12 +47,6 @@ src_prepare() {
eautoreconf
}
-src_configure() {
- # Gentoo installs zlib to /${libdir} and to /usr/${libdir}.
- # We need /${libdir} with shared library here.
- econf LIBZ_LIBDIR="${EPREFIX}/$(get_libdir)"
-}
-
src_install() {
default
[gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile-zlib/
commit: 30fe460e5275811feac4ac68c024c1e4ba1cae54
Author: Maciej Barć gentoo org>
AuthorDate: Tue May 16 11:43:57 2023 +
Commit: Maciej Barć gentoo org>
CommitDate: Tue May 16 11:50:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30fe460e
dev-scheme/guile-zlib: do not strip guile bytecode
Bug: https://bugs.gentoo.org/905898
Signed-off-by: Maciej Barć gentoo.org>
.../{guile-zlib-0.1.0.ebuild => guile-zlib-0.1.0-r1.ebuild}| 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/dev-scheme/guile-zlib/guile-zlib-0.1.0.ebuild
b/dev-scheme/guile-zlib/guile-zlib-0.1.0-r1.ebuild
similarity index 82%
rename from dev-scheme/guile-zlib/guile-zlib-0.1.0.ebuild
rename to dev-scheme/guile-zlib/guile-zlib-0.1.0-r1.ebuild
index fb293dfdba44..46d194b84e7f 100644
--- a/dev-scheme/guile-zlib/guile-zlib-0.1.0.ebuild
+++ b/dev-scheme/guile-zlib/guile-zlib-0.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -41,3 +41,11 @@ src_configure() {
# We need /${libdir} with shared library here.
econf LIBZ_LIBDIR="${EPREFIX}/$(get_libdir)"
}
+
+src_install() {
+ default
+
+ # Workaround llvm-strip problem of mangling guile ELF debug
+ # sections: https://bugs.gentoo.org/905898
+ dostrip -x "/usr/$(get_libdir)/guile"
+}
[gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile-zlib/files/, dev-scheme/guile-zlib/
commit: be71396de3829ddab171ade3d31f196c905341f4
Author: Maciej Barć gentoo org>
AuthorDate: Sun Oct 16 23:54:13 2022 +
Commit: Maciej Barć gentoo org>
CommitDate: Mon Oct 17 00:12:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be71396d
dev-scheme/guile-zlib: new package; add 0.1.0
Bug: https://github.com/trofi/nix-guix-gentoo/issues/24
Signed-off-by: Maciej Barć gentoo.org>
dev-scheme/guile-zlib/Manifest | 1 +
.../guile-zlib/files/guile-zlib-0.1.0-gentoo.patch | 13 +++
dev-scheme/guile-zlib/guile-zlib-0.1.0.ebuild | 43 ++
dev-scheme/guile-zlib/metadata.xml | 12 ++
4 files changed, 69 insertions(+)
diff --git a/dev-scheme/guile-zlib/Manifest b/dev-scheme/guile-zlib/Manifest
new file mode 100644
index ..b45debe18ed0
--- /dev/null
+++ b/dev-scheme/guile-zlib/Manifest
@@ -0,0 +1 @@
+DIST guile-zlib-0.1.0.tar.gz 14652 BLAKE2B
10f0c4d312b07415f3846927a3a1d59aa62106bf0e4a4446ba6764486104053da544fc994491af6611154edb459bba7c55e79095695b90c28ce4237e24e3b98b
SHA512
bf9201c7c01324a44ae86a673f4d1b92fd6f346d0be9d5a6390cc8be11d79d00a1cdee88c28ceb7fc5b99215198cf3ac368884381933e40babc85a21cbd300e3
diff --git a/dev-scheme/guile-zlib/files/guile-zlib-0.1.0-gentoo.patch
b/dev-scheme/guile-zlib/files/guile-zlib-0.1.0-gentoo.patch
new file mode 100644
index ..9d63512f8499
--- /dev/null
+++ b/dev-scheme/guile-zlib/files/guile-zlib-0.1.0-gentoo.patch
@@ -0,0 +1,13 @@
+Not upstreamable hack. Gentoo installs /usr/${libdir}/libz.so
+linker script that redirects to /${libdir}/libz.so.1
+
+Let's use ELF file directly. It also requires guile to support
+direct loading and enforces >=guile-3.
+--- a/zlib/config.scm.in
b/zlib/config.scm.in
+@@ -20,4 +20,4 @@
+ #:export (%libz))
+
+ (define %libz
+- "@LIBZ_LIBDIR@/libz")
++ "@LIBZ_LIBDIR@/libz.so.1")
diff --git a/dev-scheme/guile-zlib/guile-zlib-0.1.0.ebuild
b/dev-scheme/guile-zlib/guile-zlib-0.1.0.ebuild
new file mode 100644
index ..fb293dfdba44
--- /dev/null
+++ b/dev-scheme/guile-zlib/guile-zlib-0.1.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="GNU Guile library providing bindings to zlib"
+HOMEPAGE="https://notabug.org/guile-zlib/guile-zlib/;
+SRC_URI="https://notabug.org/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=dev-scheme/guile-2.0.0:=
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README.org )
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_PREBUILT='*[.]go'
+
+src_prepare() {
+ default
+
+ # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
+ find "${S}" -name "*.scm" -exec touch {} + || die
+
+ eautoreconf
+}
+
+src_configure() {
+ # Gentoo installs zlib to /${libdir} and to /usr/${libdir}.
+ # We need /${libdir} with shared library here.
+ econf LIBZ_LIBDIR="${EPREFIX}/$(get_libdir)"
+}
diff --git a/dev-scheme/guile-zlib/metadata.xml
b/dev-scheme/guile-zlib/metadata.xml
new file mode 100644
index ..fdc4b2dc1015
--- /dev/null
+++ b/dev-scheme/guile-zlib/metadata.xml
@@ -0,0 +1,12 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+
+
+sch...@gentoo.org
+Gentoo Scheme Project
+
+
+https://notabug.org/guile-zlib/guile-zlib/
+
+
