Skip to content

Commit 717b9dc

Browse files
committed
Simplify host-build, no longer needs pkg-config fix-ups
Following JuliaPackaging/BinaryBuilder.jl#1346 and the rebuild of Expat_jll (JuliaPackaging#9791), the workaround for pkgconfig `.pc` files containing the build `prefix` is no longer necessary. (Is there a way to actually add the compat constraint to `HostBuildDepencency`s?)
1 parent dd4dae3 commit 717b9dc

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

W/Wayland/build_tarballs.jl

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,10 @@ script = raw"""
1616
cd $WORKSPACE/srcdir/wayland-*/
1717
1818
# Build a native version of wayland-scanner
19-
20-
cat - >host_pkgconfig.meson <<EOF
21-
[binaries]
22-
pkgconfig = ['/usr/bin/pkg-config', '--define-variable=prefix=\${pcfiledir}/../..']
23-
EOF
24-
2519
PKG_CONFIG_SYSROOT_DIR='' \
2620
PKG_CONFIG_PATH="${host_libdir}/pkgconfig" \
2721
meson setup host_build . \
2822
--native-file="${MESON_HOST_TOOLCHAIN}" \
29-
--native-file=host_pkgconfig.meson \
3023
--buildtype=plain \
3124
-Ddtd_validation=false \
3225
-Dlibraries=false \
@@ -45,7 +38,6 @@ fi
4538
meson setup build . \
4639
--cross-file="${MESON_TARGET_TOOLCHAIN}" \
4740
--buildtype=release \
48-
--pkgconfig.relocatable \
4941
-Dlibraries=true \
5042
-Dscanner=true \
5143
-Ddocumentation=false \
@@ -69,7 +61,7 @@ products = [
6961

7062
# Dependencies that must be installed before this package can be built
7163
dependencies = [
72-
HostBuildDependency("Expat_jll"),
64+
HostBuildDependency("Expat_jll"#=; compat="2.6.4"=#), # fixed pkg-config prefix
7365
Dependency("Expat_jll"; compat="2.2.10"),
7466
Dependency("Libffi_jll"; compat="~3.2.2"),
7567
Dependency("XML2_jll"),

0 commit comments

Comments
 (0)