From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] libtool: stop put /usr/lib{32,64} into RPATH
Date: Sat, 20 Feb 2021 11:26:04 +0100 [thread overview]
Message-ID: <20210220102604.F55TTQ5crUKOz_k78AvwZBMXi90ZSAh3tulSZd7p0u4@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28919@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1873 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages libtool-fix-rpath
https://github.com/void-linux/void-packages/pull/28919
libtool: stop put /usr/lib{32,64} into RPATH
libtool will insert RPATH if $libdir not in sys_lib_dlsearch_path_spec.
libtool's configure will parse /etc/ld.so.conf for this value.
Without this change the original value is:
- glibc: /lib /usr/lib /usr/lib32 /usr/local/lib
- musl: /lib /usr/lib
<!-- 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/28919.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libtool-fix-rpath-28919.patch --]
[-- Type: text/x-diff, Size: 2746 bytes --]
From 763b12777d951358217776912e70d127abe1f56e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 20 Feb 2021 17:14:29 +0700
Subject: [PATCH 1/2] libtool: stop put /usr/lib{32,64} into RPATH
libtool will insert RPATH if $libdir not in sys_lib_dlsearch_path_spec.
libtool's configure will parse /etc/ld.so.conf for this value.
Without this change the original value is:
- glibc: /lib /usr/lib /usr/lib32 /usr/local/lib
- musl: /lib /usr/lib
---
srcpkgs/libtool/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index d8533aac5b6..b92daf93799 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
# Template file for 'libtool'
pkgname=libtool
version=2.4.6
-revision=5
+revision=6
build_style=gnu-configure
hostmakedepends="texinfo perl automake help2man xz"
depends="tar sed"
@@ -11,6 +11,8 @@ license="GPL-2.0-or-later"
homepage="http://www.gnu.org/software/libtool"
distfiles="${GNU_SITE}/libtool/$pkgname-$version.tar.xz"
checksum=7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f
+# libtool will insert RPATH for anything not in sys_lib_dlsearch_path_spec
+export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
pre_configure() {
touch aclocal.m4 libltdl/aclocal.m4 Makefile.am libltdl/Makefile.am Makefile.in libltdl/Makefile.in
From 3147445e4771e267cb81370adec0984dc0b695da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 20 Feb 2021 13:23:09 +0700
Subject: [PATCH 2/2] ttfautohint: fix cross-build & rpath
---
srcpkgs/ttfautohint/template | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/ttfautohint/template b/srcpkgs/ttfautohint/template
index 496ddeb92bb..6096ec06eb4 100644
--- a/srcpkgs/ttfautohint/template
+++ b/srcpkgs/ttfautohint/template
@@ -3,7 +3,8 @@ pkgname=ttfautohint
version=1.8.3
revision=1
build_style=gnu-configure
-hostmakedepends="pkg-config"
+build_helper=qmake
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake perl"
makedepends="freetype-devel harfbuzz-devel qt5-devel"
short_desc="Tools for automated hinting process and finely hand-hinting"
maintainer="Renato Aguiar <renato@renag.me>"
@@ -11,7 +12,3 @@ license="GPL-2.0-only"
homepage="https://www.freetype.org/ttfautohint/"
distfiles="http://download.savannah.gnu.org/releases/freetype/ttfautohint-${version}.tar.gz"
checksum=87bb4932571ad57536a7cc20b31fd15bc68cb5429977eb43d903fa61617cf87e
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
next prev parent reply other threads:[~2021-02-20 10:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-20 10:25 [PR PATCH] " sgn
2021-02-20 10:26 ` sgn [this message]
2021-02-20 11:48 ` [PR PATCH] [Updated] " sgn
2021-02-20 11:51 ` sgn
2021-02-20 12:17 ` sgn
2021-02-20 12:20 ` [PR PATCH] [Updated] " sgn
2021-02-20 14:02 ` ericonr
2021-02-21 0:44 ` [PR PATCH] [Merged]: " sgn
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=20210220102604.F55TTQ5crUKOz_k78AvwZBMXi90ZSAh3tulSZd7p0u4@z \
--to=sgn@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).