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?= 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?= 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 " @@ -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