diff options
| author | NIIBE Yutaka <[email protected]> | 2018-10-22 01:17:48 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2018-10-22 01:17:48 +0000 |
| commit | 91bcb2c7d824de50c7dfedd4490e515ddb5dfc5a (patch) | |
| tree | 5523f70543a89b00e47ecd10553d01d51d495514 | |
| parent | build: Update config.{guess,sub} to {2018-08-29,2018-08-29}. (diff) | |
| download | libgpg-error-91bcb2c7d824de50c7dfedd4490e515ddb5dfc5a.tar.gz libgpg-error-91bcb2c7d824de50c7dfedd4490e515ddb5dfc5a.zip | |
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 <[email protected]>
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/gpg-error-config-new.in | 13 |
2 files changed, 20 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index f6078ae..52966b9 100644 --- a/configure.ac +++ b/configure.ac @@ -651,7 +651,13 @@ AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests], build_tests=$enableval, build_tests=yes) AM_CONDITIONAL([BUILD_TESTS], [test "x$build_tests" != xno]) -pkg_config_libdir=$libdir/pkgconfig +if expr $libdir : "/$host\$" >/dev/null; then + # Looks like it's multiarch, then, + # let the script detect host architecture at runtime + pkg_config_libdir=auto +else + pkg_config_libdir=$libdir/pkgconfig +fi AC_SUBST(pkg_config_libdir) # # Substitution 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" # |