From f29e0b04b94ddad006d93c7187179ffc7ea44102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nagy=20K=C3=A1roly=20G=C3=A1briel?= Date: Fri, 6 Nov 2015 15:00:15 +0100 Subject: [PATCH] glib: enhanced to build on stage0 without python --- base/glib/glib-no_python.diff | 36 +++++++++++++++++++++++++++++++++++ base/glib/glib.conf | 6 +++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 base/glib/glib-no_python.diff diff --git a/base/glib/glib-no_python.diff b/base/glib/glib-no_python.diff new file mode 100644 index 000000000..413f62eff --- /dev/null +++ b/base/glib/glib-no_python.diff @@ -0,0 +1,36 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../glib/glib-no_python.diff +# Copyright (C) 2015 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- glib-2.45.2.org/gio/Makefile.in ++++ glib-2.45.2/gio/Makefile.in +@@ -832,7 +832,7 @@ + *) \ + b='$*';; \ + esac +-DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue win32 . tests \ ++DIST_SUBDIRS = xdgmime inotify kqueue win32 . tests \ + fam + am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gio.rc.in \ + $(srcdir)/gnetworking.h.in $(top_srcdir)/depcomp \ +@@ -1213,7 +1213,7 @@ + @ENABLE_INSTALLED_TESTS_TRUE@ $(dist_test_scripts) $(dist_installed_test_scripts) + + @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test) +-SUBDIRS = gdbus-2.0/codegen $(am__append_15) $(am__append_19) \ ++SUBDIRS = $(am__append_15) $(am__append_19) \ + $(am__append_22) $(am__append_25) . tests $(am__append_28) + @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir) + @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib diff --git a/base/glib/glib.conf b/base/glib/glib.conf index a8edf2032..99ecef6b9 100644 --- a/base/glib/glib.conf +++ b/base/glib/glib.conf @@ -19,6 +19,7 @@ if ! atstage native; then var_append configcache ' ' 'glib_cv_uscore=no' var_append configcache ' ' 'ac_cv_func_posix_getpwuid_r=yes' var_append configcache ' ' 'ac_cv_func_posix_getgrgid_r=yes' + var_append patchfiles ' ' "$confdir/glib-no_python.diff" find-get-text() { if pkginstalled -f gettext-stub; then @@ -29,7 +30,10 @@ find-get-text() { fi } hook_add preconf 8 'find-get-text' + # very ugly hack intended to prevent rebuild of gio/Makefile.in which we patch + # to avoid python dependency on stage 0 + hook_add preconf 9 "echo true > $builddir/$xsrcdir/glib-$ver/missing" fi -hook_add preconf 9 'autoreconf -ivf' + # we never want this file var_append INSTALL_WRAPPER_FILTER "|" "sed -e 's,.*/charset.alias,/tmp/x,'"