Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[le10] Fixes to meson: unknown options are now always fatal #5834

Merged
merged 4 commits into from
Oct 30, 2021
Merged

[le10] Fixes to meson: unknown options are now always fatal #5834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d4d5c2e
chrome-libxkbcommon: correct meson build options
heitbaum Oct 30, 2021
6e2fb59
at-spi2-core: correct meson build options
heitbaum Oct 30, 2021
9551583
pango: correct meson build options
heitbaum Oct 30, 2021
44f22cf
gdk-pixbuf: correct meson build options
heitbaum Oct 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ PKG_URL="https://ftp.gnome.org/pub/gnome/sources/at-spi2-core/${PKG_VERSION:0:4}
PKG_DEPENDS_TARGET="toolchain atk dbus glib libXtst"
PKG_LONGDESC="Protocol definitions and daemon for D-Bus at-spi."

PKG_MESON_OPTS_TARGET="-Denable_docs=false \
-Denable-introspection=no \
PKG_MESON_OPTS_TARGET="-Ddocs=false \
-Dintrospection=no \
-Ddbus_daemon=/usr/bin/dbus-daemon"

pre_configure_target() {
Expand Down
4 changes: 0 additions & 4 deletions packages/addons/addon-depends/chrome-depends/chrome-libxkbcommon/package.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ PKG_URL=""
PKG_DEPENDS_UNPACK+=" libxkbcommon"
PKG_BUILD_FLAGS="-sysroot"

PKG_MESON_OPTS_TARGET="${PKG_MESON_OPTS_TARGET} \
-Denable-static=false \
-Denable-shared=true"

unpack() {
mkdir -p ${PKG_BUILD}
tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.xz -C ${PKG_BUILD}
Expand Down
2 changes: 1 addition & 1 deletion packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ PKG_DEPENDS_CONFIG="shared-mime-info"
PKG_LONGDESC="GdkPixbuf is a a GNOME library for image loading and manipulation."

PKG_MESON_OPTS_TARGET="-Ddocs=false \
-Dgir=false \
-Dintrospection=disabled \
-Dman=false \
-Drelocatable=false"
4 changes: 2 additions & 2 deletions packages/addons/addon-depends/chrome-depends/pango/package.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ PKG_LONGDESC="The Pango library for layout and rendering of internationalized te
PKG_TOOLCHAIN="meson"
PKG_BUILD_FLAGS="-sysroot"

PKG_MESON_OPTS_TARGET="-Denable_docs=false \
-Dgir=false"
PKG_MESON_OPTS_TARGET="-Dgtk_doc=false \
-Dintrospection=disabled"