Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] libtool: stop put /usr/lib{32,64} into RPATH
@ 2021-02-20 10:25 sgn
  2021-02-20 10:26 ` [PR PATCH] [Updated] " sgn
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: sgn @ 2021-02-20 10:25 UTC (permalink / raw)
  To: ml

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

There is a new 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: 1488 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] 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

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

* Re: [PR PATCH] [Updated] libtool: stop put /usr/lib{32,64} into RPATH
  2021-02-20 10:25 [PR PATCH] libtool: stop put /usr/lib{32,64} into RPATH sgn
@ 2021-02-20 10:26 ` sgn
  2021-02-20 11:48 ` sgn
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: sgn @ 2021-02-20 10:26 UTC (permalink / raw)
  To: ml

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

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

* Re: [PR PATCH] [Updated] libtool: stop put /usr/lib{32,64} into RPATH
  2021-02-20 10:25 [PR PATCH] libtool: stop put /usr/lib{32,64} into RPATH sgn
  2021-02-20 10:26 ` [PR PATCH] [Updated] " sgn
@ 2021-02-20 11:48 ` sgn
  2021-02-20 11:51 ` sgn
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: sgn @ 2021-02-20 11:48 UTC (permalink / raw)
  To: ml

[-- 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: 3045 bytes --]

From 074b7c6366e7c2721d2e33cda746a8b9523de4ad 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 18:42:27 +0700
Subject: [PATCH 1/2] libtool: don't set /usr/lib{32,64} into RPATH

libtool will insert RPATH if $libdir not in sys_lib_dlsearch_path_spec.
configure will parse /etc/ld.so.conf for this value.

We need to set this value in global autoconf_cache, in order to help
those packages that doesn't run autoreconf pick up this change.

Without this change the original value is:

- glibc: /lib /usr/lib /usr/lib32 /usr/local/lib
- musl: /lib /usr/lib
---
 common/environment/configure/autoconf_cache/common-linux | 3 +++
 srcpkgs/libtool/template                                 | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/environment/configure/autoconf_cache/common-linux b/common/environment/configure/autoconf_cache/common-linux
index 718c2c36d79..932f7cea49d 100644
--- a/common/environment/configure/autoconf_cache/common-linux
+++ b/common/environment/configure/autoconf_cache/common-linux
@@ -165,6 +165,9 @@ ac_cv_so_sndtimeo_works=yes
 # libtar
 compat_cv_func_makedev_three_args=no
 
+# libtool will insert RPATH for anything not in sys_lib_dlsearch_path_spec
+lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
+
 # exo
 ac_cv_strftime_extensions=yes
 
diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index d8533aac5b6..b9972df7034 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"

From 05b53e5031785dd32fc4a692e3a87d0873d2a22f 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

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

* Re: libtool: stop put /usr/lib{32,64} into RPATH
  2021-02-20 10:25 [PR PATCH] libtool: stop put /usr/lib{32,64} into RPATH sgn
  2021-02-20 10:26 ` [PR PATCH] [Updated] " sgn
  2021-02-20 11:48 ` sgn
@ 2021-02-20 11:51 ` sgn
  2021-02-20 12:17 ` sgn
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: sgn @ 2021-02-20 11:51 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/28919#issuecomment-782613448

Comment:
Or we may put `/usr/lib$XBPS_WORD_SIZE` in `/etc/ld.so.conf` unconditionally and be good.

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

* Re: libtool: stop put /usr/lib{32,64} into RPATH
  2021-02-20 10:25 [PR PATCH] libtool: stop put /usr/lib{32,64} into RPATH sgn
                   ` (2 preceding siblings ...)
  2021-02-20 11:51 ` sgn
@ 2021-02-20 12:17 ` sgn
  2021-02-20 12:20 ` [PR PATCH] [Updated] " sgn
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: sgn @ 2021-02-20 12:17 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/28919#issuecomment-782619454

Comment:
Adding:
```sh
lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
```
into common-linux wouldn't work, because that file will be sourced in cross-compilation only.

Even if we source it in native, it wouldn't work because `./configure` may be run in `do_build` (`libtool` package does that).

I think there are 2 possible solutions:
- export from `common/xbps-src/libexec/build.sh`
- Put `/usr/lib32` into `/etc/ld.so.conf.d/*` unconditionally, add `/usr/lib64` for 64 bit system, add `/etc/ld.so.conf` into `base-files` for `musl` (to avoid rebuilding cross compiler).

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

* Re: [PR PATCH] [Updated] libtool: stop put /usr/lib{32,64} into RPATH
  2021-02-20 10:25 [PR PATCH] libtool: stop put /usr/lib{32,64} into RPATH sgn
                   ` (3 preceding siblings ...)
  2021-02-20 12:17 ` sgn
@ 2021-02-20 12:20 ` sgn
  2021-02-20 14:02 ` ericonr
  2021-02-21  0:44 ` [PR PATCH] [Merged]: " sgn
  6 siblings, 0 replies; 8+ messages in thread
From: sgn @ 2021-02-20 12:20 UTC (permalink / raw)
  To: ml

[-- 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: 2482 bytes --]

From e3f46f7b8ca44f7fd25d6b9a018e16103c34c597 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
---
 common/build-style/gnu-configure.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/build-style/gnu-configure.sh b/common/build-style/gnu-configure.sh
index 177dd22c4d1..8121136cd12 100644
--- a/common/build-style/gnu-configure.sh
+++ b/common/build-style/gnu-configure.sh
@@ -4,12 +4,14 @@
 do_configure() {
 	: ${configure_script:=./configure}
 
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
 	${configure_script} ${configure_args}
 }
 
 do_build() {
 	: ${make_cmd:=make}
 
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
 	${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
 }
 

From 3bfd231244180eb44d6fbc2578d6d7dda18b1316 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

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

* Re: libtool: stop put /usr/lib{32,64} into RPATH
  2021-02-20 10:25 [PR PATCH] libtool: stop put /usr/lib{32,64} into RPATH sgn
                   ` (4 preceding siblings ...)
  2021-02-20 12:20 ` [PR PATCH] [Updated] " sgn
@ 2021-02-20 14:02 ` ericonr
  2021-02-21  0:44 ` [PR PATCH] [Merged]: " sgn
  6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2021-02-20 14:02 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28919#issuecomment-782674554

Comment:
Can we consider a switch to something other than libtool after this is merged? It solves a problem that simply doesn't exist on Linux with musl or glibc, so having a dummy stand-in for it that does just enough for `libltdl` to work would make everything better. There are a few alternatives written in C (so easy to bootstrap as well), I will try to take a look if they can be shoved into where we use libtool.

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

* Re: [PR PATCH] [Merged]: libtool: stop put /usr/lib{32,64} into RPATH
  2021-02-20 10:25 [PR PATCH] libtool: stop put /usr/lib{32,64} into RPATH sgn
                   ` (5 preceding siblings ...)
  2021-02-20 14:02 ` ericonr
@ 2021-02-21  0:44 ` sgn
  6 siblings, 0 replies; 8+ messages in thread
From: sgn @ 2021-02-21  0:44 UTC (permalink / raw)
  To: ml

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

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

libtool: stop put /usr/lib{32,64} into RPATH
https://github.com/void-linux/void-packages/pull/28919

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


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

end of thread, other threads:[~2021-02-21  0:44 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-20 10:25 [PR PATCH] libtool: stop put /usr/lib{32,64} into RPATH sgn
2021-02-20 10:26 ` [PR PATCH] [Updated] " sgn
2021-02-20 11:48 ` 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

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