From d4e15e5f261caab774bab44038d39eeb5f9994e3 Mon Sep 17 00:00:00 2001 From: midipix Date: Fri, 11 Jun 2021 15:18:42 +0000 Subject: build system: configure, ccenv: added --pkgconf[if] support and integration. --- sofort/ccenv/ccenv.in | 2 ++ sofort/ccenv/ccenv.sh | 2 +- sofort/ccenv/ccenv.vars | 2 ++ sofort/config/config.vars | 6 ++++++ 4 files changed, 11 insertions(+), 1 deletion(-) (limited to 'sofort') diff --git a/sofort/ccenv/ccenv.in b/sofort/ccenv/ccenv.in index bfbb563..441f8ab 100644 --- a/sofort/ccenv/ccenv.in +++ b/sofort/ccenv/ccenv.in @@ -77,6 +77,8 @@ DLLTOOL = @ccenv_dlltool@ WINDMC = @ccenv_windmc@ WINDRC = @ccenv_windrc@ +PKGCONF = @ccenv_pkgconf@ + # @ccenv_cfgtype@ secondary tools # note: the direct use of $(@ccenv_makevar_prefix@LD) is highly discouraged AS = @ccenv_as@ diff --git a/sofort/ccenv/ccenv.sh b/sofort/ccenv/ccenv.sh index e66614a..26270f4 100644 --- a/sofort/ccenv/ccenv.sh +++ b/sofort/ccenv/ccenv.sh @@ -181,7 +181,7 @@ ccenv_set_primary_tools() { ccenv_core_tools="ar nm objdump ranlib size strip strings objcopy" ccenv_hack_tools="addr2line cov elfedit readelf readobj otool" - ccenv_peep_tools="perk mdso dlltool windmc windres" + ccenv_peep_tools="perk mdso dlltool windmc windres pkgconf" for __tool in $(printf '%s' "$ccenv_core_tools $ccenv_hack_tools $ccenv_peep_tools"); do ccenv_tool_prolog "$__tool" diff --git a/sofort/ccenv/ccenv.vars b/sofort/ccenv/ccenv.vars index 6cdd547..41eb327 100644 --- a/sofort/ccenv/ccenv.vars +++ b/sofort/ccenv/ccenv.vars @@ -80,6 +80,8 @@ ccenv_dlltool= ccenv_windmc= ccenv_windrc= +ccenv_pkgconf= + # cflags ccenv_cflags_os= ccenv_cflags_pic= diff --git a/sofort/config/config.vars b/sofort/config/config.vars index d8a5b2b..0c01a29 100644 --- a/sofort/config/config.vars +++ b/sofort/config/config.vars @@ -56,6 +56,9 @@ freestanding cross_compile shell +pkgconf +pkgconfig + prefix exec_prefix bindir @@ -126,6 +129,9 @@ native_cfghost native_cflags native_ldflags +native_pkgconf +native_pkgconfig + native_pe_subsystem native_pe_image_base -- cgit v1.2.3