glib: drop build test and LDFLAGS, not needed in cross-compile and with meson

This commit is contained in:
Sascha Kuehndel (InuSasha) 2019-08-27 10:39:07 +02:00
parent 266f0932c8
commit 69f0cd5b48
No known key found for this signature in database
GPG Key ID: 109697069529A6DC
2 changed files with 54 additions and 4 deletions

View File

@ -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

View File

@ -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')
-# Dont 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
-# Dont 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
-# Dont 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')
-# Dont 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()