Add pkgconfig component

Author: Filippo Cremonese

.orchestra/config/components/toolchain/arch/win32.yml

@@ -15,6 +15,7 @@ extra_gcc_configure_options:
   - --disable-libssp
   - --disable-shared
 dynamic: "0"
+custom_pkgconfig: true
 #@ end
 
 #@overlay/match by=overlay.all, expects=1

.orchestra/config/components/toolchain/arch/win64.yml

@@ -16,6 +16,7 @@ extra_gcc_configure_options:
   - --disable-shared
 extra_gcc_stage2_configure_options: " --enable-threads=posix --enable-libstdcxx-threads=yes"
 dynamic: "0"
+custom_pkgconfig: true
 #@ end
 
 #@overlay/match by=overlay.all, expects=1

.orchestra/config/components/toolchain/lib/gcc.lib.yml

@@ -9,7 +9,7 @@
 
 #@yaml/text-templated-strings
 ---
-#@ def gcc_dependencies(stage, toolchain_name, musl_version, uclibc_version, linux_version, mingw64_version):
+#@ def gcc_dependencies(stage, toolchain_name, musl_version, uclibc_version, linux_version, mingw64_version, custom_pkgconfig):
 #@ if stage == 1:
 #@   suffixes = ["-headers"]
 #@   mingw_suffixes = ["-headers"]
@@ -45,6 +45,10 @@
 
 #@ if linux_version:
 - toolchain/(@= toolchain_name @)/linux-headers
+
+#@ if/end custom_pkgconfig:
+- toolchain/(@= toolchain_name @)/pkgconfig
+
 #@ end
 
 #@ end
@@ -80,6 +84,7 @@
 #@    gcc_sysroot = None,
 #@    extra_gcc_make_variables = "",
 #@    binutils_version = None,
+#@    custom_pkgconfig = False,
 #@  ):
 
 #@    source_url = "https://ftp.gnu.org/gnu/gcc/gcc-" + gcc_version + "/gcc-" + gcc_version + ".tar.gz"
@@ -94,7 +99,7 @@
 #@ else:
 #@   fail("GCC stage must be 1 or 2")
 #@ end
-#@ dependencies = gcc_dependencies(stage, toolchain_name, musl_version, uclibc_version, linux_version, mingw64_version) or []
+#@ dependencies = gcc_dependencies(stage, toolchain_name, musl_version, uclibc_version, linux_version, mingw64_version, custom_pkgconfig) or []
 #@ build_dependencies = gcc_build_dependencies(stage, toolchain_name) or []
 
 #@ if "win" in toolchain_name:

.orchestra/config/components/toolchain/lib/pkgconfig.lib.yml

@@ -0,0 +1,30 @@
+#@yaml/text-templated-strings
+
+#@ load("/lib/fn_args.lib.yml", "mandatory")
+#@ load("/lib/create_component.lib.yml", "single_build_component")
+
+#@yaml/text-templated-strings
+---
+#@ def pkgconfig_args(
+#@        triple=mandatory,
+#@ ):
+configure: |
+  mkdir -p "$BUILD_DIR"
+  # Nothing else to do
+install: |
+  mkdir -p "${TMP_ROOT}${ORCHESTRA_ROOT}/(@= triple @)/bin"
+  cat >> "${TMP_ROOT}${ORCHESTRA_ROOT}/(@= triple @)/bin/(@= triple @)-pkg-config" << EOF
+  #!/bin/bash
+  DIR="\$( cd "\$( dirname "\${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+  export PKG_CONFIG_PATH="\$DIR/../lib/pkgconfig"
+  exec pkg-config "\$@"
+  EOF
+  chmod +x "${TMP_ROOT}${ORCHESTRA_ROOT}/(@= triple @)/bin/(@= triple @)-pkg-config"
+add_to_path:
+  - $ORCHESTRA_ROOT/(@= triple @)/bin
+#@ end
+
+---
+#@ def create_pkgconfig_component(toolchain_name=mandatory, triple=mandatory):
+#@ return single_build_component(**pkgconfig_args(triple=triple))
+#@ end

.orchestra/config/components/toolchain/lib/toolchain.lib.yml

@@ -11,6 +11,7 @@
 #@ load("/components/toolchain/lib/coreutils.lib.yml", "create_coreutils_component")
 #@ load("/components/toolchain/lib/mingw64.lib.yml", "create_mingw64_components")
 #@ load("/components/toolchain/lib/spec.lib.yml", "create_spec_components")
+#@ load("/components/toolchain/lib/pkgconfig.lib.yml", "create_pkgconfig_component")
 
 #@yaml/text-templated-strings
 ---
@@ -35,6 +36,7 @@
 #@    extra_gcc_make_variables="",
 #@    dynamic=None,
 #@    spec=False,
+#@    custom_pkgconfig=False,
 #@ ):
 
 #@ if/end binutils_version:
@@ -47,7 +49,7 @@
 (@= "toolchain/" + toolchain_name + "/linux-headers" @): #@ create_linux_headers_component(triple=triple, linux_version=linux_version, arch_name=linux_arch_name)
 
 #@ if/end gcc_version:
-(@= "toolchain/" + toolchain_name + "/gcc" @): #@ create_gcc_component(toolchain_name=toolchain_name, triple=triple, gcc_sysroot=gcc_sysroot, gcc_version=gcc_version, extra_gcc_configure_options=extra_gcc_configure_options, extra_gcc_stage2_configure_options=extra_gcc_stage2_configure_options, extra_gcc_make_variables=extra_gcc_make_variables, musl_version=musl_version, uclibc_version=uclibc_version, linux_version=linux_version, mingw64_version=mingw64_version, binutils_version=binutils_version)
+(@= "toolchain/" + toolchain_name + "/gcc" @): #@ create_gcc_component(toolchain_name=toolchain_name, triple=triple, gcc_sysroot=gcc_sysroot, gcc_version=gcc_version, extra_gcc_configure_options=extra_gcc_configure_options, extra_gcc_stage2_configure_options=extra_gcc_stage2_configure_options, extra_gcc_make_variables=extra_gcc_make_variables, musl_version=musl_version, uclibc_version=uclibc_version, linux_version=linux_version, mingw64_version=mingw64_version, binutils_version=binutils_version, custom_pkgconfig=custom_pkgconfig)
 
 #@ if/end mingw64_version:
 _: #@ template.replace(create_mingw64_components(toolchain_name=toolchain_name, triple=triple, mingw64_version=mingw64_version, gcc_version=gcc_version))
@@ -64,4 +66,7 @@ _: #@ template.replace(create_uclibc_components(triple=triple, toolchain_name=to
 #@ if/end spec:
 _: #@ template.replace(create_spec_components(triple=triple, toolchain_name=toolchain_name))
 
+#@ if/end custom_pkgconfig:
+toolchain/(@= toolchain_name @)/pkgconfig: #@ create_pkgconfig_component(triple=triple, toolchain_name=toolchain_name)
+
 #@ end