* [gentoo-commits] repo/proj/prefix:master commit in: app-arch/bzip2/
@ 2020-12-26 13:24 Fabian Groffen
0 siblings, 0 replies; 9+ messages in thread
From: Fabian Groffen @ 2020-12-26 13:24 UTC (permalink / raw
To: gentoo-commits
commit: 96ba653936d43e55b15c436e3ab3eed0fed26e31
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 26 13:07:28 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 13:07:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=96ba6539
app-arch/bzip2: drop ~m68k-mint
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
app-arch/bzip2/bzip2-1.0.6-r10.ebuild | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
index ccd13a7ad5..afd2cbacec 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="BZIP2"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="static static-libs"
PATCHES=(
@@ -83,10 +83,6 @@ multilib_src_compile() {
# FWIW, #504648 like for .so below
ln -sf libbz2.${PV}.dylib libbz2.dylib
;;
- *-mint*)
- # do nothing, no shared libraries
- :
- ;;
*)
bemake -f "${S}"/Makefile-libbz2_so all
# Make sure we link against the shared lib #504648
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: app-arch/bzip2/
@ 2022-12-31 14:38 Fabian Groffen
0 siblings, 0 replies; 9+ messages in thread
From: Fabian Groffen @ 2022-12-31 14:38 UTC (permalink / raw
To: gentoo-commits
commit: 9e0c9cfea7698608fc671bd231a2636b85bf64f8
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 31 14:38:11 2022 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Dec 31 14:38:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9e0c9cfe
app-arch/bzip2: sync with gx86
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
app-arch/bzip2/bzip2-1.0.8-r1.ebuild | 142 ---------------------
...bzip2-1.0.8-r3.ebuild => bzip2-1.0.8-r4.ebuild} | 31 +++--
2 files changed, 20 insertions(+), 153 deletions(-)
diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
deleted file mode 100644
index 2ba7042d39..0000000000
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2021 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
-
-inherit toolchain-funcs multilib-minimal usr-ldscript prefix
-
-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"
-
-LICENSE="BZIP2"
-SLOT="0/1" # subslot = SONAME
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="static static-libs"
-
-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
-
- hprefixify -w "/^PATH=/" bz{diff,grep,more}
- # this a makefile for Darwin, which already "includes" saneso
- cp "${FILESDIR}"/${P}-Makefile-libbz2_dylib Makefile-libbz2_dylib || die
-
- if [[ ${CHOST} == *-cygwin* ]] ; then
- sed -i -e "s/-o libbz2\.so\.${PV}/-Wl,--out-implib=libbz2$(get_libname ${PV})/" \
- -e "s/-Wl,-soname -Wl,libbz2\.so\.1/-o cygbz2-${PV%%.*}.dll/" \
- -e "s/libbz2\.so/libbz2$(get_libname)/g" \
- Makefile-libbz2_so
- fi
-}
-
-bemake() {
- emake \
- VPATH="${S}" \
- CC="$(tc-getCC)" \
- AR="$(tc-getAR)" \
- RANLIB="$(tc-getRANLIB)" \
- "$@"
-}
-
-multilib_src_compile() {
- local checkopts=
- case "${CHOST}" in
- *-darwin*)
- bemake PREFIX="${EPREFIX}"/usr -f "${S}"/Makefile-libbz2_dylib all
- ;;
- *)
- bemake -f "${S}"/Makefile-libbz2_so all
- ;;
- esac
- # Make sure we link against the shared lib #504648
- ln -sf libbz2$(get_libname ${PV}) libbz2$(get_libname) || die
- bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')"
-}
-
-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$(get_libname ${PV})
- [[ ${CHOST} == *-cygwin* ]] && dobin cygbz2-${PV%%.*}.dll
- local v
- for v in libbz2$(get_libname) libbz2$(get_libname ${PV%%.*}) libbz2$(get_libname ${PV%.*}) ; do
- dosym libbz2$(get_libname ${PV}) /usr/$(get_libdir)/${v}
- done
-
- # Install libbz2.so.1.0 due to accidental soname change in 1.0.7.
- # Reference: 98da0ad82192d21ad74ae52366ea8466e2acea24.
- # OK to remove one year after 2020-04-11.
- if [[ ! -L "${ED}/usr/$(get_libdir)/libbz2$(get_libname 1.0)" ]]; then
- dosym libbz2.so.${PV} "/usr/$(get_libdir)/libbz2$(get_libname 1.0)"
- fi
-
- use static-libs && dolib.a libbz2.a
-
- if multilib_is_native_abi ; then
- gen_usr_ldscript -a bz2
-
- dobin bzip2recover
- into /
- dobin bzip2
- 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 *.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
-
- local x
- for x in bunzip2 bzcat bzip2recover ; do
- dosym bzip2.1 /usr/share/man/man1/${x}.1
- done
- for x in bz{e,f}grep ; do
- dosym bzgrep /usr/bin/${x}
- dosym bzgrep.1 /usr/share/man/man1/${x}.1
- done
-
- einstalldocs
-
- # move "important" bzip2 binaries to /bin and use the shared libbz2.so
- dosym bzip2 /bin/bzcat
- dosym bzip2 /bin/bunzip2
-}
diff --git a/app-arch/bzip2/bzip2-1.0.8-r3.ebuild b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
similarity index 87%
rename from app-arch/bzip2/bzip2-1.0.8-r3.ebuild
rename to app-arch/bzip2/bzip2-1.0.8-r4.ebuild
index 1c2b65d3b8..6608999730 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r3.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
@@ -19,9 +19,12 @@ SLOT="0/1" # subslot = SONAME
KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="static static-libs"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bzip2 )"
-RDEPEND="!app-arch/lbzip2[symlink(-)]
- !app-arch/pbzip2[symlink(-)]"
+BDEPEND="
+ verify-sig? ( sec-keys/openpgp-keys-bzip2 )
+"
+PDEPEND="
+ app-alternatives/bzip2
+"
PATCHES=(
"${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
@@ -101,7 +104,7 @@ multilib_src_install() {
dobin bzip2recover
into /
- dobin bzip2
+ newbin bzip2 bzip2-reference
fi
}
@@ -112,7 +115,8 @@ multilib_src_install_all() {
doins bzlib.h
into /usr
dobin bz{diff,grep,more}
- doman *.1
+ 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
@@ -120,18 +124,23 @@ multilib_src_install_all() {
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 bunzip2 bzcat bzip2recover ; do
- dosym bzip2.1 /usr/share/man/man1/${x}.1
- done
for x in bz{e,f}grep ; do
dosym bzgrep /usr/bin/${x}
dosym bzgrep.1 /usr/share/man/man1/${x}.1
done
einstalldocs
+}
- # move "important" bzip2 binaries to /bin and use the shared libbz2.so
- dosym bzip2 /bin/bzcat
- dosym bzip2 /bin/bunzip2
+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 "${EROOT}/bin/${x}" || die
+ fi
+ done
}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: app-arch/bzip2/
@ 2022-09-07 19:35 Fabian Groffen
0 siblings, 0 replies; 9+ messages in thread
From: Fabian Groffen @ 2022-09-07 19:35 UTC (permalink / raw
To: gentoo-commits
commit: 59698abcabd93bfcc95244f65009b4345182c1c7
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 7 19:34:19 2022 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Sep 7 19:34:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=59698abc
app-arch/bzip2-1.0.8-r3: revision bump
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
app-arch/bzip2/Manifest | 2 +-
...zip2-1.0.6-r10.ebuild => bzip2-1.0.8-r3.ebuild} | 39 +++++++++++-----------
2 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 03ffea8912..099151807c 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -1,2 +1,2 @@
-DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
+DIST bzip2-1.0.8.tar.gz.sig 310 BLAKE2B 0d702dcb19f7738da9f05ee9d719f5cd3653540365e78db143404e599ea54bc6f9d5e6a38cdf5cdd3c6550243d34266343467c6b1db9d5d3c134f9353b00f395 SHA512 4a4a3fa0ec1c10a704b9870e8e629fd007cca55184423c6bfc3049a702fb41e4aeb73bfe9ca7442c27d32d278f1f34f27523a6be67d35b37896acdded12bf40d
diff --git a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild b/app-arch/bzip2/bzip2-1.0.8-r3.ebuild
similarity index 78%
rename from app-arch/bzip2/bzip2-1.0.6-r10.ebuild
rename to app-arch/bzip2/bzip2-1.0.8-r3.ebuild
index 990d3c1c6e..1c2b65d3b8 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r3.ebuild
@@ -1,33 +1,36 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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=6
+EAPI=7
-inherit toolchain-funcs multilib-minimal prefix
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bzip2.gpg
+inherit toolchain-funcs multilib-minimal usr-ldscript verify-sig prefix
DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
HOMEPAGE="https://sourceware.org/bzip2/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+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="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="static static-libs"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bzip2 )"
+RDEPEND="!app-arch/lbzip2[symlink(-)]
+ !app-arch/pbzip2[symlink(-)]"
+
PATCHES=(
"${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
- "${FILESDIR}"/${PN}-1.0.6-saneso.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.4-POSIX-shell.patch #193365
- "${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573
- "${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch
- "${FILESDIR}"/${PN}-1.0.6-CVE-2016-3189.patch #620466
- "${FILESDIR}"/${PN}-1.0.6-ubsan-error.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 )
@@ -48,13 +51,6 @@ src_prepare() {
hprefixify -w "/^PATH=/" bz{diff,grep,more}
# this a makefile for Darwin, which already "includes" saneso
cp "${FILESDIR}"/${P}-Makefile-libbz2_dylib Makefile-libbz2_dylib || die
-
- if [[ ${CHOST} == *-cygwin* ]] ; then
- sed -i -e "s/-o libbz2\.so\.${PV}/-Wl,--out-implib=libbz2$(get_libname ${PV})/" \
- -e "s/-Wl,-soname -Wl,libbz2\.so\.1/-o cygbz2-${PV%%.*}.dll/" \
- -e "s/libbz2\.so/libbz2$(get_libname)/g" \
- Makefile-libbz2_so
- fi
}
bemake() {
@@ -67,7 +63,6 @@ bemake() {
}
multilib_src_compile() {
- local checkopts=
case "${CHOST}" in
*-darwin*)
bemake PREFIX="${EPREFIX}"/usr -f "${S}"/Makefile-libbz2_dylib all
@@ -77,10 +72,15 @@ multilib_src_compile() {
;;
esac
# Make sure we link against the shared lib #504648
- ln -sf libbz2$(get_libname ${PV}) libbz2$(get_libname)
+ ln -sf libbz2$(get_libname ${PV}) libbz2$(get_libname) || 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
@@ -89,7 +89,6 @@ multilib_src_install() {
# .x.x - SONAME some distros use #338321
# .x - SONAME Gentoo uses
dolib.so libbz2$(get_libname ${PV})
- [[ ${CHOST} == *-cygwin* ]] && dobin cygbz2-${PV%%.*}.dll
local v
for v in libbz2$(get_libname) libbz2$(get_libname ${PV%%.*}) libbz2$(get_libname ${PV%.*}) ; do
dosym libbz2$(get_libname ${PV}) /usr/$(get_libdir)/${v}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: app-arch/bzip2/
@ 2021-01-06 11:56 Fabian Groffen
0 siblings, 0 replies; 9+ messages in thread
From: Fabian Groffen @ 2021-01-06 11:56 UTC (permalink / raw
To: gentoo-commits
commit: a962683e666ad5c4b8a7b9f9d8e493dd306cfa3c
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 6 11:55:58 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan 6 11:55:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a962683e
app-arch/bzip2: drop x86-macos
Package-Manager: Portage-3.0.12.0.2-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
app-arch/bzip2/bzip2-1.0.6-r10.ebuild | 4 ++--
app-arch/bzip2/bzip2-1.0.8-r1.ebuild | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
index c41ed39dff..990d3c1c6e 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="BZIP2"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="static static-libs"
PATCHES=(
diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
index ee1d4cd81a..2ba7042d39 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"
LICENSE="BZIP2"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="static static-libs"
PATCHES=(
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: app-arch/bzip2/
@ 2020-12-27 10:25 Fabian Groffen
0 siblings, 0 replies; 9+ messages in thread
From: Fabian Groffen @ 2020-12-27 10:25 UTC (permalink / raw
To: gentoo-commits
commit: 19b5e7f05524f7788c35cc0e13f437358ca43f1c
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 10:25:11 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 10:25:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=19b5e7f0
app-arch/bzip2: drop one more mint remnant
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
app-arch/bzip2/bzip2-1.0.6-r10.ebuild | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
index 7a3d83fdd5..c41ed39dff 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
@@ -71,16 +71,13 @@ multilib_src_compile() {
case "${CHOST}" in
*-darwin*)
bemake PREFIX="${EPREFIX}"/usr -f "${S}"/Makefile-libbz2_dylib all
- # FWIW, #504648 like for .so below
- ln -sf libbz2.${PV}.dylib libbz2.dylib
;;
*)
bemake -f "${S}"/Makefile-libbz2_so all
- # Make sure we link against the shared lib #504648
- [[ $(get_libname) != $(get_libname ${PV}) ]] &&
- ln -sf libbz2$(get_libname ${PV}) libbz2$(get_libname)
;;
esac
+ # Make sure we link against the shared lib #504648
+ ln -sf libbz2$(get_libname ${PV}) libbz2$(get_libname)
bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')"
}
@@ -94,7 +91,6 @@ multilib_src_install() {
dolib.so libbz2$(get_libname ${PV})
[[ ${CHOST} == *-cygwin* ]] && dobin cygbz2-${PV%%.*}.dll
local v
- [[ $(get_libname) != $(get_libname ${PV}) ]] &&
for v in libbz2$(get_libname) libbz2$(get_libname ${PV%%.*}) libbz2$(get_libname ${PV%.*}) ; do
dosym libbz2$(get_libname ${PV}) /usr/$(get_libdir)/${v}
done
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: app-arch/bzip2/
@ 2020-12-27 10:14 Fabian Groffen
0 siblings, 0 replies; 9+ messages in thread
From: Fabian Groffen @ 2020-12-27 10:14 UTC (permalink / raw
To: gentoo-commits
commit: 3b6cfa78aeff9555090651627b7f488661fd6afe
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 10:14:01 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 10:14:01 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3b6cfa78
app-arch/bzip2: drop AIX, HPUX, FreeMiNT remnants
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
app-arch/bzip2/bzip2-1.0.6-r10.ebuild | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
index afd2cbacec..7a3d83fdd5 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
@@ -28,8 +28,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch
"${FILESDIR}"/${PN}-1.0.6-CVE-2016-3189.patch #620466
"${FILESDIR}"/${PN}-1.0.6-ubsan-error.patch
-
- "${FILESDIR}"/${PN}-1.0.6-r7-checkenv.patch # for AIX, Darwin?
)
DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
@@ -51,13 +49,6 @@ src_prepare() {
# this a makefile for Darwin, which already "includes" saneso
cp "${FILESDIR}"/${P}-Makefile-libbz2_dylib Makefile-libbz2_dylib || die
- if [[ ${CHOST} == *-hpux* ]] ; then
- sed -i -e 's,-soname,+h,' Makefile-libbz2_so || die "cannot replace -soname with +h"
- if [[ ${CHOST} == hppa*-hpux* && ${CHOST} != hppa64*-hpux* ]] ; then
- sed -i -e '/^SOEXT/s,so,sl,' Makefile-libbz2_so || die "cannot replace so with sl"
- sed -i -e '/^SONAME/s,=,=${EPREFIX}/lib/,' Makefile-libbz2_so || die "cannt set soname"
- fi
- fi
if [[ ${CHOST} == *-cygwin* ]] ; then
sed -i -e "s/-o libbz2\.so\.${PV}/-Wl,--out-implib=libbz2$(get_libname ${PV})/" \
-e "s/-Wl,-soname -Wl,libbz2\.so\.1/-o cygbz2-${PV%%.*}.dll/" \
@@ -96,8 +87,6 @@ multilib_src_compile() {
multilib_src_install() {
into /usr
- if ! tc-is-static-only; then
-
# Install the shared lib manually. We install:
# .x.x.x - standard shared lib behavior
# .x.x - SONAME some distros use #338321
@@ -110,8 +99,6 @@ multilib_src_install() {
dosym libbz2$(get_libname ${PV}) /usr/$(get_libdir)/${v}
done
- fi # tc-is-static-only
-
use static-libs && dolib.a libbz2.a
if multilib_is_native_abi ; then
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: app-arch/bzip2/
@ 2020-12-15 19:26 Fabian Groffen
0 siblings, 0 replies; 9+ messages in thread
From: Fabian Groffen @ 2020-12-15 19:26 UTC (permalink / raw
To: gentoo-commits
commit: 1f0fb78d68b1ce7f257f5256a257946b5ec3d5c1
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 19:03:55 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 19:03:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1f0fb78d
app-arch/bzip2: drop ~ppc-aix
Bug: https://bugs.gentoo.org/760057
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
app-arch/bzip2/bzip2-1.0.6-r10.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
index ee2e4b825a..ccd13a7ad5 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 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
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="BZIP2"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="static static-libs"
PATCHES=(
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: app-arch/bzip2/
@ 2017-11-19 12:44 Fabian Groffen
0 siblings, 0 replies; 9+ messages in thread
From: Fabian Groffen @ 2017-11-19 12:44 UTC (permalink / raw
To: gentoo-commits
commit: 9fbf7589d45aa09df2007ffd817dba72c37b94da
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 12:40:56 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 12:40:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9fbf7589
app-arch/bzip2: fix install on Darwin, bug #637966
Bug: https://bugs.gentoo.org/637966
Package-Manager: Portage-2.3.13-prefix, Repoman-2.3.4
app-arch/bzip2/bzip2-1.0.6-r8.ebuild | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
index eeb7f85da2..498b5bb32c 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
@@ -73,9 +73,24 @@ bemake() {
}
multilib_src_compile() {
- bemake -f "${S}"/Makefile-libbz2_so all
- # Make sure we link against the shared lib #504648
- ln -sf libbz2.so.${PV} libbz2.so
+ local checkopts=
+ case "${CHOST}" in
+ *-darwin*)
+ bemake PREFIX="${EPREFIX}"/usr -f "${S}"/Makefile-libbz2_dylib all
+ # FWIW, #504648 like for .so below
+ ln -sf libbz2.${PV}.dylib libbz2.dylib
+ ;;
+ *-mint*)
+ # do nothing, no shared libraries
+ :
+ ;;
+ *)
+ bemake -f "${S}"/Makefile-libbz2_so all
+ # Make sure we link against the shared lib #504648
+ [[ $(get_libname) != $(get_libname ${PV}) ]] &&
+ ln -sf libbz2$(get_libname ${PV}) libbz2$(get_libname)
+ ;;
+ esac
bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')"
}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: app-arch/bzip2/
@ 2016-04-28 15:07 Michael Haubenwallner
0 siblings, 0 replies; 9+ messages in thread
From: Michael Haubenwallner @ 2016-04-28 15:07 UTC (permalink / raw
To: gentoo-commits
commit: 5306100a4e38cf250329ccbcbfaf94502c39913a
Author: Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer <DOT> com>
AuthorDate: Thu Apr 28 15:05:31 2016 +0000
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 15:05:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5306100a
bzip2-1.0.6-r7: Cygwin port
app-arch/bzip2/bzip2-1.0.6-r7.ebuild | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
index d07ed3d..23a6674 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
@@ -55,6 +55,12 @@ src_prepare() {
sed -i -e '/^SONAME/s,=,=${EPREFIX}/lib/,' Makefile-libbz2_so || die "cannt set soname"
fi
fi
+ if [[ ${CHOST} == *-cygwin* ]] ; then
+ sed -i -e "s/-o libbz2\.so\.${PV}/-Wl,--out-implib=libbz2$(get_libname ${PV})/" \
+ -e "s/-Wl,-soname -Wl,libbz2\.so\.1/-o cygbz2-${PV%%.*}.dll/" \
+ -e "s/libbz2\.so/libbz2$(get_libname)/g" \
+ Makefile-libbz2_so
+ fi
}
bemake() {
@@ -81,7 +87,8 @@ multilib_src_compile() {
*)
bemake -f "${S}"/Makefile-libbz2_so all
# Make sure we link against the shared lib #504648
- ln -sf libbz2.so.${PV} libbz2.so
+ [[ $(get_libname) != $(get_libname ${PV}) ]] &&
+ ln -sf libbz2$(get_libname ${PV}) libbz2$(get_libname)
;;
esac
bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')"
@@ -97,7 +104,9 @@ multilib_src_install() {
# .x.x - SONAME some distros use #338321
# .x - SONAME Gentoo uses
dolib.so libbz2$(get_libname ${PV})
+ [[ ${CHOST} == *-cygwin* ]] && dobin cygbz2-${PV%%.*}.dll
local v
+ [[ $(get_libname) != $(get_libname ${PV}) ]] &&
for v in libbz2$(get_libname) libbz2$(get_libname ${PV%%.*}) libbz2$(get_libname ${PV%.*}) ; do
dosym libbz2$(get_libname ${PV}) /usr/$(get_libdir)/${v}
done
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-12-31 14:38 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-26 13:24 [gentoo-commits] repo/proj/prefix:master commit in: app-arch/bzip2/ Fabian Groffen
-- strict thread matches above, loose matches on Subject: below --
2022-12-31 14:38 Fabian Groffen
2022-09-07 19:35 Fabian Groffen
2021-01-06 11:56 Fabian Groffen
2020-12-27 10:25 Fabian Groffen
2020-12-27 10:14 Fabian Groffen
2020-12-15 19:26 Fabian Groffen
2017-11-19 12:44 Fabian Groffen
2016-04-28 15:07 Michael Haubenwallner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox