From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] musl: allow libraries in /usr/local/lib to override system ones.
Date: Sun, 25 Jul 2021 04:49:17 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32182@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1847 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages sys_path
https://github.com/void-linux/void-packages/pull/32182
musl: allow libraries in /usr/local/lib to override system ones.
This was already possible by setting an RPATH, using LD_LIBRARY_PATH or
/etc/ld-musl-$ARCH.path. However, none of these should be necessary,
since that should be the default behavior.
@void-linux/pkg-committers
<!-- 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/32182.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sys_path-32182.patch --]
[-- Type: text/x-diff, Size: 1880 bytes --]
From b659c67d56062e91c0749ec49fff5b6f7bfbd98c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 24 Jul 2021 23:47:47 -0300
Subject: [PATCH] musl: allow libraries in /usr/local/lib to override system
ones.
This was already possible by setting an RPATH, using LD_LIBRARY_PATH or
/etc/ld-musl-$ARCH.path. However, none of these should be necessary,
since that should be the default behavior.
---
srcpkgs/musl/patches/default-sys_path.patch | 17 +++++++++++++++++
srcpkgs/musl/template | 2 +-
2 files changed, 18 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/patches/default-sys_path.patch
diff --git a/srcpkgs/musl/patches/default-sys_path.patch b/srcpkgs/musl/patches/default-sys_path.patch
new file mode 100644
index 000000000000..a4c4abb37e76
--- /dev/null
+++ b/srcpkgs/musl/patches/default-sys_path.patch
@@ -0,0 +1,17 @@
+Since Void implements usrmerge, /lib is a symlink to /usr/lib. musl's default,
+here, makes it so the libraries under /usr/local/lib won't override the system
+ones, which is not the desired behavior.
+
+diff --git a/ldso/dynlink.c b/ldso/dynlink.c
+index 5b9c8be4..f6532968 100644
+--- a/ldso/dynlink.c
++++ b/ldso/dynlink.c
+@@ -1095,7 +1095,7 @@ static struct dso *load_library(const char *name, struct dso *needed_by)
+ sys_path = "";
+ }
+ }
+- if (!sys_path) sys_path = "/lib:/usr/local/lib:/usr/lib";
++ if (!sys_path) sys_path = "/usr/local/lib:/usr/lib";
+ fd = path_open(name, sys_path, buf, sizeof buf);
+ }
+ pathname = buf;
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index a429ccaf999a..d30c99a563a0 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=8
+revision=9
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
next reply other threads:[~2021-07-25 2:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-25 2:49 ericonr [this message]
2021-08-03 3:36 ` [PR PATCH] [Updated] " ericonr
2022-05-31 2:13 ` github-actions
2022-06-14 2:13 ` [PR PATCH] [Closed]: " github-actions
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-32182@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).