From 91bcb2c7d824de50c7dfedd4490e515ddb5dfc5a Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Mon, 22 Oct 2018 10:17:48 +0900 Subject: gpg-error-config: Support "auto", architecture independent script. * configure.ac (pkg_config_libdir): Set it "auto" when it looks multiarch environment. * src/gpg-error-config-new.in: Automatically detects the triplet. -- The triplet detection mechanism is not sufficient. It's up to distributions to apply more changes (in distribution specific way). Signed-off-by: NIIBE Yutaka --- src/gpg-error-config-new.in | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src') diff --git a/src/gpg-error-config-new.in b/src/gpg-error-config-new.in index 442b95a..0ccf55a 100644 --- a/src/gpg-error-config-new.in +++ b/src/gpg-error-config-new.in @@ -13,6 +13,19 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ pkg_config_libdir=${PKG_CONFIG_LIBDIR:-@pkg_config_libdir@} +if [ "$pkg_config_libdir" = auto ]; then + # "auto" supports multiarch environment + triplet="" + case "$CC" in + *-*-*) triplet=${CC%-*} ;; + *) ;; + esac + if [ -z "$triplet" ]; then + triplet=$(gcc -dumpmachine) + fi + pkg_config_libdir=@exec_prefix@/lib/$triplet/pkgconfig + unset triplet +fi PKG_CONFIG_PATH="$PKG_CONFIG_PATH${PKG_CONFIG_PATH:+:}$pkg_config_libdir" # -- cgit v1.2.3