From 431230e0ea834d611d5302921b843f0afcaed391 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 19 Nov 2021 21:52:24 +0000 Subject: Support custom pkg-config executable names When cross-compiling, it's common to have executables prefixed with the name of the architecture you're building for, e.g. aarch64-unknown-linux-musl-cc or x86_64-unknown-freebsd-pkg-config. Lots of build tools support a PKG_CONFIG environment variable to enable this use case. With this change, I was able to successfully cross-compile and run catgirl. --- configure | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 4199980..3459f94 100755 --- a/configure +++ b/configure @@ -1,6 +1,8 @@ #!/bin/sh set -eu +: ${PKG_CONFIG:=pkg-config} + cflags() { echo "CFLAGS += $*" } @@ -8,16 +10,16 @@ defstr() { cflags "-D'$1=\"$2\"'" } defvar() { - defstr "$1" "$(pkg-config --variable=$3 $2)${4:-}" + defstr "$1" "$(${PKG_CONFIG} --variable=$3 $2)${4:-}" } ldadd() { lib=$1; shift echo "LDADD.${lib} = $*" } config() { - pkg-config --print-errors "$@" - cflags $(pkg-config --cflags "$@") - for lib; do ldadd $lib $(pkg-config --libs $lib); done + ${PKG_CONFIG} --print-errors "$@" + cflags $(${PKG_CONFIG} --cflags "$@") + for lib; do ldadd $lib $(${PKG_CONFIG} --libs $lib); done } exec >config.mk -- cgit 1.4.1 h'>
path: root/compat/arc4random.h (unfollow)
Commit message (Expand)Author
2021-09-17Import LibreSSL 3.4.0June McEnroe
2021-08-24Import LibreSSL 3.3.4June McEnroe
2021-05-25Bump version to 3.3.3p1 3.3.3p1June McEnroe
2021-05-25build: Add scripts to EXTRA_DISTJune McEnroe
2021-05-25import: Add missing scripts/wrap-compiler-for-flag-checkJune McEnroe
2021-05-08Import LibreSSL 3.3.3June McEnroe
2021-04-18build: Remove added x509_verify.3 links 3.3.2June McEnroe
2021-04-18tls: Use EC_KEY_set_ex_dataJune McEnroe
2021-04-18Import LibreSSL 3.3.2June McEnroe
2021-03-05Bump version to 3.3.1p1 3.3.1p1June McEnroe
2021-03-05build: Add OpenSSL includes to libcompatJune McEnroe
2020-12-15Import LibreSSL 3.3.1June McEnroe
2020-11-24Import LibreSSL 3.3.0June McEnroe
2020-10-22Import LibreSSL 3.2.2June McEnroe
2020-09-29Import LibreSSL 3.2.1June McEnroe
2020-09-29import: Add m4/ax_add_fortify_source.m4June McEnroe
2020-08-05build: Add README.7 to EXTRA_DIST 3.2.0June McEnroe
2020-08-03doc: Indicate that only OpenSSL 1.1.1b and newer workJune McEnroe