mirror of
https://codeberg.org/kiss-community/repo
synced 2024-07-02 14:02:27 +00:00
glib: Fix build when not installed prior. Closes #184
This commit is contained in:
parent
9ff5f5d50e
commit
520adb3e73
|
@ -22,7 +22,6 @@ meson \
|
||||||
ninja -C build
|
ninja -C build
|
||||||
ninja -C build install
|
ninja -C build install
|
||||||
|
|
||||||
|
|
||||||
# json-glib is a separate package which we build alongside
|
# json-glib is a separate package which we build alongside
|
||||||
# glib (as if they were one and the same). The upstream for
|
# glib (as if they were one and the same). The upstream for
|
||||||
# json-glib is effectively dead (only translation work) so
|
# json-glib is effectively dead (only translation work) so
|
||||||
|
@ -30,6 +29,14 @@ ninja -C build install
|
||||||
{
|
{
|
||||||
cd json-glib
|
cd json-glib
|
||||||
|
|
||||||
|
# This mess of CFLAGS, etc is needed to point json-glib to
|
||||||
|
# the freshly built glib sources instead of the system's.
|
||||||
|
export PKG_CONFIG_PATH="$1/usr/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||||
|
export PATH="$1/usr/bin:$PATH"
|
||||||
|
export CFLAGS="$CFLAGS -I$1/usr/include/glib-2.0"
|
||||||
|
export CFLAGS="$CFLAGS -I$1/usr/lib/glib-2.0/include -pthread"
|
||||||
|
export LDFLAGS="$LDFLAGS -L$1/usr/lib/"
|
||||||
|
|
||||||
meson \
|
meson \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
2.64.2 2
|
2.64.2 3
|
||||||
|
|
Loading…
Reference in New Issue
Block a user