Github messages for voidlinux
 help / color / mirror / Atom feed
From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] zlib: remove LDFLAGS workaround.
Date: Wed, 14 Jul 2021 16:30:07 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31960@inbox.vuxu.org> (raw)

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

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

https://github.com/ericonr/void-packages zlib
https://github.com/void-linux/void-packages/pull/31960

zlib: remove LDFLAGS workaround.
Added in 4d39b701666370b53a7167c00702a1d7a4213a87 without explanation as
to why.

We also revbump to rebuild the binary. On x86_64-musl, old libz.so,
built with gcc 7, is using a 2132KB RE mmap when dynamically linked,
probably because of a 0x200000 alignment required for the RE section.
After rebuilding, 96KB are used, with the actual RE mmap reduced to 56K.
The new alignment is 0x1000.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 1f84155932d254de177f628f8dcfe87a39991577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 14 Jul 2021 11:21:08 -0300
Subject: [PATCH] zlib: remove LDFLAGS workaround.

Added in 4d39b701666370b53a7167c00702a1d7a4213a87 without explanation as
to why.

We also revbump to rebuild the binary. On x86_64-musl, old libz.so,
built with gcc 7, is using a 2132KB RE mmap when dynamically linked,
probably because of a 0x200000 alignment required for the RE section.
After rebuilding, 96KB are used, with the actual RE mmap reduced to 56K.
The new alignment is 0x1000.
---
 srcpkgs/zlib/template | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index a6462e5616a2..e8c44f9bdb8b 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,9 +1,10 @@
 # Template file for 'zlib'
 pkgname=zlib
 version=1.2.11
-revision=3
+revision=4
 bootstrap=yes
 build_style=configure
+configure_args="--prefix=/usr --shared"
 short_desc="Compression/decompression Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
@@ -11,10 +12,6 @@ homepage="http://www.zlib.net"
 distfiles="$homepage/$pkgname-$version.tar.gz"
 checksum=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
 
-do_configure() {
-	LDFLAGS= LDSHAREDLIBC= ./configure --prefix=/usr --shared
-}
-
 zlib-devel_package() {
 	depends="zlib>=${version}_${revision}"
 	short_desc+=" - development files"

             reply	other threads:[~2021-07-14 14:30 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-14 14:30 ericonr [this message]
2021-07-17  3:02 ` [PR PATCH] [Merged]: " ericonr

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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31960@inbox.vuxu.org \
    --to=ericonr@users.noreply.github.com \
    --cc=ml@inbox.vuxu.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;
as well as URLs for NNTP newsgroup(s).