Skip to content

Commit 0689e1f

Browse files
authored
gdk_pixbuf: Build for riscv64 (#10987)
* gdk_pixbuf: Build for riscv64 * gdk_pixbuf: Don't define variables that already exist * gdk_pixbuf: Remove introspection
1 parent 3b4637b commit 0689e1f

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

G/gdk_pixbuf/build_tarballs.jl

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ using BinaryBuilder, Pkg
44

55
name = "gdk_pixbuf"
66
version = v"2.42.12"
7+
# We bumped the version because we updated the dependencies to build for riscv64
8+
ygg_version = v"2.42.13"
79

810
# Collection of sources required to build gdk-pixbuf
911
sources = [
@@ -16,16 +18,17 @@ script = raw"""
1618
cd $WORKSPACE/srcdir/gdk-pixbuf-*
1719
mkdir build && cd build
1820
19-
FLAGS=()
20-
if [[ "${target}" == x86_64-linux-gnu ]]; then
21-
FLAGS+=(-Dintrospection=enabled)
22-
fi
21+
# Correct pkgconfig entries for host build dependencies, i.e. for
22+
# scripts that need to run at build time. These pkgconfig entries
23+
# would otherwise point to non-existing files, making meson fail.
24+
sed -i 's+glib_genmarshal=${bindir}+'"glib_genmarshal=${host_bindir}"'+' ${host_libdir}/pkgconfig/glib-2.0.pc
25+
sed -i 's+gobject_query=${bindir}+'"gobject_query=${host_bindir}"'+' ${host_libdir}/pkgconfig/glib-2.0.pc
26+
sed -i 's+glib_mkenums=${bindir}+'"glib_mkenums=${host_bindir}"'+' ${host_libdir}/pkgconfig/glib-2.0.pc
2327
2428
meson .. \
2529
-Dman=false \
2630
-Dinstalled_tests=false \
2731
-Dgio_sniffing=false \
28-
"${FLAGS[@]}" \
2932
--cross-file="${MESON_TARGET_TOOLCHAIN}"
3033
ninja -j${nproc}
3134
ninja install
@@ -48,25 +51,21 @@ products = [
4851
# Some dependencies are needed only on Linux and FreeBSD
4952
linux_freebsd = filter(p->Sys.islinux(p)||Sys.isfreebsd(p), platforms)
5053

51-
# gobject_introspection is needed only on x86_64-linux-gnu
52-
introspect_platform = filter(p -> Sys.islinux(p) && libc(p) == "glibc" && arch(p) == "x86_64", platforms)
53-
5454
# Dependencies that must be installed before this package can be built
5555
dependencies = [
5656
# Need a host gettext for msgfmt
5757
HostBuildDependency("Gettext_jll"),
5858
# Need a host glib for glib-compile-resources
59-
HostBuildDependency(PackageSpec(; name="Glib_jll", version=v"2.80.5")),
60-
Dependency("Glib_jll"; compat="2.80.5"),
61-
Dependency("JpegTurbo_jll"),
62-
Dependency("libpng_jll"),
63-
Dependency("Libtiff_jll"; compat="4.5.1"),
59+
HostBuildDependency(PackageSpec(; name="Glib_jll", version=v"2.84.0")),
60+
Dependency("Glib_jll"; compat="2.84.0"),
61+
Dependency("JpegTurbo_jll"; compat="3.1.1"),
62+
Dependency("libpng_jll"; compat="1.6.47"),
63+
Dependency("Libtiff_jll"; compat="4.7.1"),
6464
Dependency("Xorg_libX11_jll"; platforms=linux_freebsd),
6565
BuildDependency("Xorg_xproto_jll"; platforms=linux_freebsd),
6666
BuildDependency("Xorg_kbproto_jll"; platforms=linux_freebsd),
67-
BuildDependency("gobject_introspection_jll"; platforms=introspect_platform)
6867
]
6968

7069
# Build the tarballs.
71-
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies;
70+
build_tarballs(ARGS, name, ygg_version, sources, script, platforms, products, dependencies;
7271
clang_use_lld=false, julia_compat="1.6", preferred_gcc_version=v"6")

0 commit comments

Comments
 (0)