jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

common/xbps-src: set PKG_CONFIG{,FOR_BUILD} env vars

Browse source
This commit is contained in:
John 2020-05-07 19:43:49 +02:00
parent e9974180ce
commit 82734d940c
No known key found for this signature in database
GPG key ID: 5FDE97AF468A09B7
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/build-style/meson.sh
View file

@ -52,7 +52,7 @@ ld = '${LD}'
strip = '${STRIP}' strip = '${STRIP}'
readelf = '${READELF}' readelf = '${READELF}'
objcopy = '${OBJCOPY}' objcopy = '${OBJCOPY}'
pkgconfig = 'pkg-config' pkgconfig = '${PKG_CONFIG}'
rust = 'rustc' rust = 'rustc'
g-ir-scanner = '${XBPS_CROSS_BASE}/usr/bin/g-ir-scanner' g-ir-scanner = '${XBPS_CROSS_BASE}/usr/bin/g-ir-scanner'
g-ir-compiler = '${XBPS_CROSS_BASE}/usr/bin/g-ir-compiler' g-ir-compiler = '${XBPS_CROSS_BASE}/usr/bin/g-ir-compiler'
@ -88,7 +88,6 @@ do_configure() {
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
configure_args+=" --cross-file=${meson_crossfile}" configure_args+=" --cross-file=${meson_crossfile}"
export PKG_CONFIG_FOR_BUILD="/usr/bin/pkg-config"
fi fi
${meson_cmd} \ ${meson_cmd} \

2
common/build-style/qmake.sh
View file

@ -107,7 +107,7 @@ HostLibraries=/usr/lib
Spec=${wrksrc}/.host-spec/linux-g++ Spec=${wrksrc}/.host-spec/linux-g++
TargetSpec=${wrksrc}/.target-spec/linux-g++ TargetSpec=${wrksrc}/.target-spec/linux-g++
_EOF _EOF
qmake_args="-qtconf ${wrksrc}/qt.conf PKG_CONFIG_EXECUTABLE=${XBPS_WRAPPERDIR}/pkg-config" qmake_args="-qtconf ${wrksrc}/qt.conf PKG_CONFIG_EXECUTABLE=${XBPS_WRAPPERDIR}/${PKG_CONFIG}"
${qmake} ${qmake_args} \ ${qmake} ${qmake_args} \
PREFIX=/usr \ PREFIX=/usr \
QT_INSTALL_PREFIX=/usr \ QT_INSTALL_PREFIX=/usr \

2
common/xbps-src/shutils/common.sh
View file

@ -514,6 +514,7 @@ setup_pkg() {
export CPP_FOR_BUILD="cpp" export CPP_FOR_BUILD="cpp"
export FC_FOR_BUILD="gfortran" export FC_FOR_BUILD="gfortran"
export LD_FOR_BUILD="ld" export LD_FOR_BUILD="ld"
export PKG_CONFIG_FOR_BUILD="/usr/bin/pkg-config"
export CFLAGS_FOR_BUILD="$XBPS_CFLAGS" export CFLAGS_FOR_BUILD="$XBPS_CFLAGS"
export CXXFLAGS_FOR_BUILD="$XBPS_CXXFLAGS" export CXXFLAGS_FOR_BUILD="$XBPS_CXXFLAGS"
export CPPFLAGS_FOR_BUILD="$XBPS_CPPFLAGS" export CPPFLAGS_FOR_BUILD="$XBPS_CPPFLAGS"
@ -536,6 +537,7 @@ setup_pkg() {
export OBJCOPY="${XBPS_CROSS_TRIPLET}-objcopy" export OBJCOPY="${XBPS_CROSS_TRIPLET}-objcopy"
export NM="${XBPS_CROSS_TRIPLET}-nm" export NM="${XBPS_CROSS_TRIPLET}-nm"
export READELF="${XBPS_CROSS_TRIPLET}-readelf" export READELF="${XBPS_CROSS_TRIPLET}-readelf"
export PKG_CONFIG="${XBPS_CROSS_TRIPLET}-pkg-config"
# Target tools # Target tools
export CC_target="$CC" export CC_target="$CC"
export CXX_target="$CXX" export CXX_target="$CXX"