diff --git a/packages/devel/glib/package.mk b/packages/devel/glib/package.mk index 26043f9edd..1befd7dd08 100644 --- a/packages/devel/glib/package.mk +++ b/packages/devel/glib/package.mk @@ -37,10 +37,6 @@ have_c99_snprintf=false growing_stack=false va_val_copy=false" -pre_configure_target() { - LDFLAGS+=" -lz" -} - post_makeinstall_target() { rm -rf $INSTALL/usr/bin rm -rf $INSTALL/usr/lib/gdbus-2.0 diff --git a/packages/devel/glib/patches/001_drop-build-tests.patch b/packages/devel/glib/patches/001_drop-build-tests.patch new file mode 100644 index 0000000000..dd0b5cb501 --- /dev/null +++ b/packages/devel/glib/patches/001_drop-build-tests.patch @@ -0,0 +1,54 @@ +diff -Naur glib-2.61.1.org/gio/meson.build glib-2.61.1/gio/meson.build +--- glib-2.61.1.org/gio/meson.build 2019-05-24 19:00:33.000000000 +0200 ++++ glib-2.61.1/gio/meson.build 2019-08-26 09:21:14.893507207 +0200 +@@ -994,8 +994,3 @@ + endif + + subdir('fam') +-# Don’t build the tests unless we can run them (either natively or in an exe wrapper) +-build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper()) +-if build_tests +- subdir('tests') +-endif +\ Kein Zeilenumbruch am Dateiende. +diff -Naur glib-2.61.1.org/glib/meson.build glib-2.61.1/glib/meson.build +--- glib-2.61.1.org/glib/meson.build 2019-05-24 19:00:33.000000000 +0200 ++++ glib-2.61.1/glib/meson.build 2019-08-26 09:21:22.941561248 +0200 +@@ -459,8 +459,3 @@ + install : true) + endif + +-# Don’t build the tests unless we can run them (either natively or in an exe wrapper) +-build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper()) +-if build_tests +- subdir('tests') +-endif +\ Kein Zeilenumbruch am Dateiende. +diff -Naur glib-2.61.1.org/gobject/meson.build glib-2.61.1/gobject/meson.build +--- glib-2.61.1.org/gobject/meson.build 2019-05-24 19:00:33.000000000 +0200 ++++ glib-2.61.1/gobject/meson.build 2019-08-26 09:21:28.981601802 +0200 +@@ -166,8 +166,3 @@ + install : true) + endif + +-# Don’t build the tests unless we can run them (either natively or in an exe wrapper) +-build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper()) +-if build_tests +- subdir('tests') +-endif +\ Kein Zeilenumbruch am Dateiende. +diff -Naur glib-2.61.1.org/meson.build glib-2.61.1/meson.build +--- glib-2.61.1.org/meson.build 2019-05-24 19:00:33.000000000 +0200 ++++ glib-2.61.1/meson.build 2019-08-26 09:21:08.029461110 +0200 +@@ -2045,11 +2045,6 @@ + subdir('gmodule') + subdir('gio') + subdir('fuzzing') +-# Don’t build the tests unless we can run them (either natively or in an exe wrapper) +-build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper()) +-if build_tests +- subdir('tests') +-endif + + # xgettext is optional (on Windows for instance) + if find_program('xgettext', required : get_option('nls')).found()