From ea407d0a5ec21ee37cebfedbb0cdb9698a113e65 Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz Date: Aug 25 2021 07:22:48 +0000 Subject: files/pkgconf: removed. files/pkgconf_host/bin/%[_target]-pkg-config: correctly set prefix. groups/100.native_tools.group:pkgconf:${PKG_INSTALL_FILES_V2}: updated. --- diff --git a/files/pkgconf/bin/%[_target]-pkg-config b/files/pkgconf/bin/%[_target]-pkg-config deleted file mode 100644 index dd6328f..0000000 --- a/files/pkgconf/bin/%[_target]-pkg-config +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -PREFIX=""; [ ${PREFIX:="${0%/*}"} = "${0}" ] && PREFIX="."; PREFIX="${PREFIX:+${PREFIX}/}.."; -if [ "${#}" -eq 1 ]\ -&& [ "x${1}" = "x--version" ]; then - "${PREFIX}/bin/pkgconf" --version; -else - "${PREFIX}/bin/pkgconf" --define-variable=prefix="${PREFIX%/}/" --keep-system-cflags "${@}"; -fi; diff --git a/files/pkgconf_host b/files/pkgconf_host deleted file mode 120000 index 243cd47..0000000 --- a/files/pkgconf_host +++ /dev/null @@ -1 +0,0 @@ -pkgconf \ No newline at end of file diff --git a/files/pkgconf_host/bin/%[_target]-pkg-config b/files/pkgconf_host/bin/%[_target]-pkg-config new file mode 100644 index 0000000..7351e62 --- /dev/null +++ b/files/pkgconf_host/bin/%[_target]-pkg-config @@ -0,0 +1,8 @@ +#!/bin/sh +PREFIX=""; [ ${PREFIX:="${0%/*}"} = "${0}" ] && PREFIX="."; PREFIX="${PREFIX:+${PREFIX}/}.."; +if [ "${#}" -eq 1 ]\ +&& [ "x${1}" = "x--version" ]; then + "${PREFIX}/bin/pkgconf" --version; +else + "${PREFIX}/bin/pkgconf" --define-variable=prefix="${PREFIX%/}/native" --keep-system-cflags "${@}"; +fi; diff --git a/groups/100.native_tools.group b/groups/100.native_tools.group index c8a6c13..957e4d2 100644 --- a/groups/100.native_tools.group +++ b/groups/100.native_tools.group @@ -25,8 +25,6 @@ NATIVE_TOOLS_PREFIX="${PREFIX_NATIVE}"; : ${PKG_PKGCONF_CONFIGURE_ARGS:="--prefix= --host=${DEFAULT_TARGET} --with-sysroot=${PREFIX_NATIVE}"}; : ${PKG_PKGCONF_INSTALL_FILES_V2:=" @pkgconf=bin/pkg-config - +%[_files]/bin/\%[_target]-pkg-config=bin/%[_target]-pkg-config - m0755=bin/%[_target]-pkg-config /=lib/pkgconfig"}; : ${PKG_SLIBTOOL_URLS_GIT:="slibtool=git://midipix.org/slibtool"}; : ${PKG_SLIBTOOL_CONFIGURE_ARGS:="--host=${DEFAULT_TARGET} --prefix= --target=${DEFAULT_TARGET}"};