mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-06-17 15:34:18 +08:00
Change gtk to use git, always pass --export-dynamic for glib
This commit is contained in:
parent
57aa833983
commit
112ff5f653
@ -1,8 +1,8 @@
|
||||
#TODO promote
|
||||
[source]
|
||||
tar = "https://download.gnome.org/sources/gtk+/3.24/gtk%2B-3.24.43.tar.xz"
|
||||
blake3 = "5feab2bad81e6b5906895f70ddce6227cf96a6a14b16af0ef72c79991a48ddf4"
|
||||
patches = ["redox.patch"]
|
||||
git = "https://gitlab.redox-os.org/redox-os/gtk"
|
||||
branch = "redox-3.24.43"
|
||||
shallow_clone = true
|
||||
|
||||
[build]
|
||||
dependencies = [
|
||||
@ -21,20 +21,21 @@ dependencies = [
|
||||
"libffi",
|
||||
"libiconv",
|
||||
"libjpeg",
|
||||
"liborbital",
|
||||
"libpng",
|
||||
"libpthread-stubs",
|
||||
"libwayland",
|
||||
"libx11",
|
||||
"libxau",
|
||||
# "libx11",
|
||||
# "libxau",
|
||||
"libxkbcommon",
|
||||
"libxcb",
|
||||
"libxext",
|
||||
"libxfixes",
|
||||
"libxi",
|
||||
"libxrandr",
|
||||
"libxrender",
|
||||
"libxxf86vm",
|
||||
"mesa-x11",
|
||||
# "libxcb",
|
||||
# "libxext",
|
||||
# "libxfixes",
|
||||
# "libxi",
|
||||
# "libxrandr",
|
||||
# "libxrender",
|
||||
# "libxxf86vm",
|
||||
"mesa",
|
||||
"pango",
|
||||
"pcre2",
|
||||
"pixman",
|
||||
@ -49,6 +50,7 @@ DYNAMIC_INIT
|
||||
CFLAGS="${CFLAGS} -DM_SQRT2=1.41421356237309504880"
|
||||
cookbook_meson \
|
||||
-Dexamples=false \
|
||||
-Dx11_backend=false \
|
||||
-Dintrospection=false \
|
||||
-Dtests=false
|
||||
"""
|
||||
|
||||
@ -24,3 +24,8 @@ cookbook_meson \
|
||||
-Denable-wayland=false \
|
||||
-Denable-x11=true
|
||||
"""
|
||||
|
||||
[package]
|
||||
dependencies = [
|
||||
"xkeyboard-config"
|
||||
]
|
||||
|
||||
@ -34,7 +34,7 @@ function DYNAMIC_INIT {
|
||||
)
|
||||
|
||||
# TODO: check paths for spaces
|
||||
export LDFLAGS="${USER_LDFLAGS}-Wl,-rpath-link,${COOKBOOK_SYSROOT}/lib -L${COOKBOOK_SYSROOT}/lib"
|
||||
export LDFLAGS="${USER_LDFLAGS}-Wl,-rpath-link,${COOKBOOK_SYSROOT}/lib -L${COOKBOOK_SYSROOT}/lib -Wl,--export-dynamic"
|
||||
export RUSTFLAGS="-C target-feature=-crt-static -L native=${COOKBOOK_SYSROOT}/lib -C link-arg=-Wl,-rpath-link,${COOKBOOK_SYSROOT}/lib"
|
||||
export COOKBOOK_DYNAMIC=1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user