Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] musl: allow libraries in /usr/local/lib to override system ones.
@ 2021-07-25  2:49 ericonr
  2021-08-03  3:36 ` [PR PATCH] [Updated] " ericonr
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: ericonr @ 2021-07-25  2:49 UTC (permalink / raw)
  To: ml

[-- 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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Updated] musl: allow libraries in /usr/local/lib to override system ones.
  2021-07-25  2:49 [PR PATCH] musl: allow libraries in /usr/local/lib to override system ones ericonr
@ 2021-08-03  3:36 ` ericonr
  2022-05-31  2:13 ` github-actions
  2022-06-14  2:13 ` [PR PATCH] [Closed]: " github-actions
  2 siblings, 0 replies; 4+ messages in thread
From: ericonr @ 2021-08-03  3:36 UTC (permalink / raw)
  To: ml

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

There is an updated 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: 1881 bytes --]

From dcffa31a62097f1157cd3122bf6618629c101fff 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 d30c99a563a0..5bdc5c48e623 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=9
+revision=10
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: musl: allow libraries in /usr/local/lib to override system ones.
  2021-07-25  2:49 [PR PATCH] musl: allow libraries in /usr/local/lib to override system ones ericonr
  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
  2 siblings, 0 replies; 4+ messages in thread
From: github-actions @ 2022-05-31  2:13 UTC (permalink / raw)
  To: ml

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/32182#issuecomment-1141597436

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Closed]: musl: allow libraries in /usr/local/lib to override system ones.
  2021-07-25  2:49 [PR PATCH] musl: allow libraries in /usr/local/lib to override system ones ericonr
  2021-08-03  3:36 ` [PR PATCH] [Updated] " ericonr
  2022-05-31  2:13 ` github-actions
@ 2022-06-14  2:13 ` github-actions
  2 siblings, 0 replies; 4+ messages in thread
From: github-actions @ 2022-06-14  2:13 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

musl: allow libraries in /usr/local/lib to override system ones.
https://github.com/void-linux/void-packages/pull/32182

Description:
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
-->


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-06-14  2:13 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-25  2:49 [PR PATCH] musl: allow libraries in /usr/local/lib to override system ones ericonr
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

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).