[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/
Date: Tue,  6 Feb 2024 22:49:54 +0000 (UTC)	[thread overview]
Message-ID: <1707259769.8e743d1447aae739cde59171911ed75d6cf09f7e.sam@gentoo> (raw)

commit:     8e743d1447aae739cde59171911ed75d6cf09f7e
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Feb  6 05:54:35 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb  6 22:49:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e743d14

app-arch/bzip2: remove usr-ldscript support

Per news item 2024-01-05-usr-initramfs, we no longer support this use
case. It is fragile and hacky and leads to bizarre forms of load errors.

The functionality is, despite being called "split-usr", not really about
split-usr at all.

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r5.ebuild | 133 +++++++++++++++++++++++++++++++++++
 1 file changed, 133 insertions(+)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r5.ebuild b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
new file mode 100644
index 000000000000..5a099bc96f1d
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
+#      (since we're building shared libs) ...
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bzip2.gpg
+inherit toolchain-funcs multilib multilib-minimal verify-sig
+
+DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
+HOMEPAGE="https://sourceware.org/bzip2/"
+SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
+
+LICENSE="BZIP2"
+SLOT="0/1" # subslot = SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
+IUSE="static static-libs"
+
+BDEPEND="
+	verify-sig? ( sec-keys/openpgp-keys-bzip2 )
+"
+PDEPEND="
+	app-alternatives/bzip2
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.0.8-saneso.patch
+	"${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
+	"${FILESDIR}"/${PN}-1.0.6-progress.patch
+	"${FILESDIR}"/${PN}-1.0.3-no-test.patch
+	"${FILESDIR}"/${PN}-1.0.8-mingw.patch #393573
+	"${FILESDIR}"/${PN}-1.0.8-out-of-tree-build.patch
+)
+
+DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
+HTML_DOCS=( manual.html )
+
+src_prepare() {
+	default
+
+	# - Use right man path
+	# - Generate symlinks instead of hardlinks
+	# - pass custom variables to control libdir
+	sed -i \
+		-e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
+		-e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
+		-e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
+		Makefile || die
+}
+
+bemake() {
+	emake \
+		VPATH="${S}" \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		"$@"
+}
+
+multilib_src_compile() {
+	bemake -f "${S}"/Makefile-libbz2_so all
+	# Make sure we link against the shared lib #504648
+	ln -s libbz2.so.${PV} libbz2.so || die
+	bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')"
+}
+
+multilib_src_test() {
+	cp "${S}"/sample* "${BUILD_DIR}" || die
+	bemake -f "${S}"/Makefile check
+}
+
+multilib_src_install() {
+	into /usr
+
+	# Install the shared lib manually.  We install:
+	#  .x.x.x - standard shared lib behavior
+	#  .x.x   - SONAME some distros use #338321
+	#  .x     - SONAME Gentoo uses
+	dolib.so libbz2.so.${PV}
+	local v
+	for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
+		dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
+	done
+
+	use static-libs && dolib.a libbz2.a
+
+	if multilib_is_native_abi ; then
+		dobin bzip2recover$(get_exeext)
+		into /
+		newbin bzip2$(get_exeext) bzip2-reference$(get_exeext)
+	fi
+}
+
+multilib_src_install_all() {
+	# `make install` doesn't cope with out-of-tree builds, nor with
+	# installing just non-binaries, so handle things ourselves.
+	insinto /usr/include
+	doins bzlib.h
+	into /usr
+	dobin bz{diff,grep,more}
+	doman bz{diff,grep,more}.1
+	newman bzip2.1 bzip2-reference.1
+
+	dosym bzdiff /usr/bin/bzcmp
+	dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
+
+	dosym bzmore /usr/bin/bzless
+	dosym bzmore.1 /usr/share/man/man1/bzless.1
+
+	dosym bzip2-reference.1 /usr/share/man/man1/bzip2recover.1
+	local x
+	for x in bz{e,f}grep ; do
+		dosym bzgrep /usr/bin/${x}
+		dosym bzgrep.1 /usr/share/man/man1/${x}.1
+	done
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	# ensure to preserve the symlinks before app-alternatives/bzip2
+	# is installed
+	local x
+	for x in bzip2 bunzip2 bzcat; do
+		if [[ ! -h ${EROOT}/bin/${x} ]]; then
+			ln -s bzip2-reference$(get_exeext) "${EROOT}/bin/${x}$(get_exeext)" || die
+		fi
+	done
+}

next             reply	other threads:[~2024-02-06 22:49 UTC|newest]

Thread overview: 70+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-06 22:49 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-04-12 16:34 [gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/ Sam James
2025-01-03 13:19 Sam James
2025-01-03 12:53 Sam James
2024-05-18 17:06 Sam James
2024-03-19  3:42 Ionen Wolkens
2024-03-03  2:32 Sam James
2024-03-02 22:17 Sam James
2024-03-01 18:41 Sam James
2024-02-27 23:57 Sam James
2024-02-27 23:39 Jakov Smolić
2024-02-27 23:21 Sam James
2024-02-27 23:04 Sam James
2023-06-28 16:32 Sam James
2023-02-24 18:36 Sam James
2022-12-28  0:33 Sam James
2022-12-27 19:53 Sam James
2022-12-27 13:40 Sam James
2022-12-27 11:31 Sam James
2022-12-01  1:39 Sam James
2022-10-29 21:32 Sam James
2022-09-23  5:41 Sam James
2022-09-23  5:41 Sam James
2022-09-06 16:10 Mike Gilbert
2022-09-05 21:32 Mike Gilbert
2022-05-17  6:45 Sam James
2022-04-06 23:34 Sam James
2022-02-18 19:38 Mike Gilbert
2021-03-26 12:01 Agostino Sarubbo
2021-03-16 22:33 Sam James
2021-03-16 18:10 Sergei Trofimovich
2021-03-15  3:50 Sam James
2021-03-15  2:26 Sam James
2021-03-15  1:40 Thomas Deutschmann
2021-03-15  0:51 Sam James
2021-03-15  0:51 Sam James
2020-04-11 17:46 Mike Gilbert
2020-04-11 17:46 Mike Gilbert
2020-04-11 17:26 Mike Gilbert
2019-06-26 17:47 Mike Gilbert
2019-06-26  8:02 Lars Wendler
2019-05-03 23:17 Andreas K. Hüttel
2018-08-10 20:23 Thomas Deutschmann
2018-07-15 17:41 Mikle Kolyada
2018-07-15 17:41 Mikle Kolyada
2018-06-24 10:02 Jeroen Roovers
2018-06-22  9:50 Mikle Kolyada
2018-06-19 14:32 Tobias Klausmann
2018-05-30 16:30 Markus Meier
2018-05-26 10:06 Mart Raudsepp
2018-05-24  6:19 Sergei Trofimovich
2018-05-23 20:54 Mikle Kolyada
2018-05-23 19:17 Sergei Trofimovich
2017-10-02  9:11 Thomas Deutschmann
2017-10-02  9:11 Thomas Deutschmann
2017-09-09 21:07 Lars Wendler
2017-09-09 20:02 Sergei Trofimovich
2017-06-21 11:57 Agostino Sarubbo
2017-06-08  5:09 Markus Meier
2017-06-04 19:38 Sergei Trofimovich
2017-06-04 19:20 Tobias Klausmann
2017-06-04 10:42 Agostino Sarubbo
2017-06-04 10:34 Agostino Sarubbo
2017-01-19 14:14 Mike Frysinger
2017-01-17 16:23 Lars Wendler
2016-06-04  4:49 Markus Meier
2016-05-27 12:46 Lars Wendler
2016-05-26 20:05 Lars Wendler
2016-05-25  6:29 Matt Turner
2016-05-25  5:25 Jeroen Roovers

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:5a099bc96f1 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1707259769.8e743d1447aae739cde59171911ed75d6cf09f7e.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox