diff --git a/projects/gnome.org/gdk-pixbuf/package.yml b/projects/gnome.org/gdk-pixbuf/package.yml index 6e888f4c..0016357a 100644 --- a/projects/gnome.org/gdk-pixbuf/package.yml +++ b/projects/gnome.org/gdk-pixbuf/package.yml @@ -29,6 +29,7 @@ build: meson \ --buildtype=release \ --prefix={{prefix}} \ + --libdir={{prefix}}/lib \ -Dman=false \ .. ninja diff --git a/projects/gnome.org/glib/package.yml b/projects/gnome.org/glib/package.yml index edb7af85..1cdf2b70 100644 --- a/projects/gnome.org/glib/package.yml +++ b/projects/gnome.org/glib/package.yml @@ -31,12 +31,14 @@ build: GT='${prefix}/../../../gnu.org/gettext/v{{ deps.gnu.org/gettext.version.major }}' cd {{prefix}}/lib/pkgconfig + sed -i.bak -e \ 's|Libs: -L${libdir} -lglib-2.0 -lintl|Libs: -L${libdir} -lglib-2.0'\ -L$GT/lib\ -lintl\| \ ./glib-2.0.pc sed -i.bak -e \ 's|Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include|Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include'\ -I$GT/include\| \ ./glib-2.0.pc + rm *.bak #REF https://github.com/Homebrew/homebrew-core/blob/d0e65698ccd502335bea68ce879ae02e1735db0d/Formula/glib.rb#L66-L67 @@ -44,6 +46,7 @@ build: env: ARGS: - --prefix={{prefix}} + - --libdir={{prefix}}/lib - --wrap-mode=nofallback - --buildtype=release # tests fail to build with `error: target emulation unknown: -m or at least one .o file required` @@ -54,15 +57,17 @@ test: tea.xyz/gx/cc: c99 freedesktop.org/pkg-config: ^0.29 script: | + sh - <