mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
pkg-config: Allow secondary arch builds
Since it hardcodes the search paths inside the binary, either we must make a secondary arch build of it for _x86 ports, either we could export a patched PKG_CONFIG_LIBDIR from haikuporter 's environment... but this seems to work anyway.
This commit is contained in:
@@ -7,28 +7,29 @@ SRC_URI="http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz"
|
||||
CHECKSUM_MD5="5392b4e3372879c5bf856173b418d6a2"
|
||||
REVISION="2"
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
|
||||
|
||||
PATCHES="pkgconfig-0.27.1.patchset"
|
||||
|
||||
PROVIDES="
|
||||
pkgconfig = $portVersion compat >= 0.27
|
||||
cmd:pkg_config = $portVersion compat >= 0.27
|
||||
pkgconfig$secondaryArchSuffix = $portVersion compat >= 0.27
|
||||
cmd:pkg_config$secondaryArchSuffix = $portVersion compat >= 0.27
|
||||
"
|
||||
REQUIRES="
|
||||
haiku >= $haikuVersion
|
||||
lib:libiconv
|
||||
haiku$secondaryArchSuffix >= $haikuVersion
|
||||
lib:libiconv$secondaryArchSuffix
|
||||
"
|
||||
BUILD_REQUIRES="
|
||||
devel:libiconv
|
||||
devel:libiconv$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
haiku_devel >= $haikuVersion
|
||||
haiku${secondaryArchSuffix}_devel >= $haikuVersion
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:automake
|
||||
cmd:autoreconf
|
||||
cmd:gcc
|
||||
cmd:ld
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:libtoolize
|
||||
cmd:make
|
||||
"
|
||||
@@ -46,7 +47,7 @@ BUILD()
|
||||
autoconf
|
||||
automake --add-missing
|
||||
|
||||
pcPathSubdir="develop/lib/pkgconfig"
|
||||
pcPathSubdir="develop/lib${secondaryArchSuffix/_//}/pkgconfig"
|
||||
pcPath="/boot/home/config/non-packaged/$pcPathSubdir"
|
||||
pcPath="$pcPath:/boot/home/config/$pcPathSubdir"
|
||||
pcPath="$pcPath:/boot/system/$pcPathSubdir"
|
||||
|
||||
Reference in New Issue
Block a user