summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-11-23 04:24:31 +0000
committerSam James <sam@gentoo.org>2022-11-23 04:24:31 +0000
commitbac67bd1ecdf620db1b0dc03b63e66d978ff7325 (patch)
tree97da4ca699545363e0cd2c42b9579d844da9ea72 /sys-libs/zlib/zlib-1.2.13-r1.ebuild
parentdev-libs/boehm-gc: Stabilize 8.2.2-r1 arm64, #882395 (diff)
downloadgentoo-bac67bd1ecdf620db1b0dc03b63e66d978ff7325.tar.gz
gentoo-bac67bd1ecdf620db1b0dc03b63e66d978ff7325.tar.bz2
gentoo-bac67bd1ecdf620db1b0dc03b63e66d978ff7325.zip
sys-libs/zlib: fix build on sparc
Closes: https://bugs.gentoo.org/879883 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-libs/zlib/zlib-1.2.13-r1.ebuild')
-rw-r--r--sys-libs/zlib/zlib-1.2.13-r1.ebuild9
1 files changed, 8 insertions, 1 deletions
diff --git a/sys-libs/zlib/zlib-1.2.13-r1.ebuild b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
index ee60673a59b8..50b767a0ef31 100644
--- a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
# Worth keeping an eye on 'develop' branch upstream for possible backports.
AUTOTOOLS_AUTO_DEPEND="no"
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/madler.asc
-inherit autotools multilib-minimal usr-ldscript verify-sig
+inherit autotools multilib-minimal flag-o-matic usr-ldscript verify-sig
CYGWINPATCHES=(
"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> ${PN}-1.2.11-cygwin-gzopen_w.patch"
@@ -43,6 +43,9 @@ PATCHES=(
# Respect LDFLAGS during configure tests. Pending upstream
"${FILESDIR}"/${PN}-1.2.13-use-LDFLAGS-in-configure.patch
+
+ # Fix building on sparc with older binutils, we pass it in ebuild instead
+ "${FILESDIR}"/${PN}-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch
)
src_prepare() {
@@ -85,6 +88,10 @@ src_prepare() {
echoit() { echo "$@"; "$@"; }
multilib_src_configure() {
+ # We pass manually instead of relying on the configure script/makefile
+ # because it would pass it even for older binutils.
+ use sparc && append-flags $(test-flags-CCLD -Wl,--no-warn-rwx-segments)
+
case ${CHOST} in
*-mingw*|mingw*|*-cygwin*)
;;