Browse Source

glib: enhanced to build on stage0 without python

master
Nagy Károly Gábriel 9 years ago
parent
commit
f29e0b04b9
2 changed files with 41 additions and 1 deletions
  1. +36
    -0
      base/glib/glib-no_python.diff
  2. +5
    -1
      base/glib/glib.conf

+ 36
- 0
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

+ 5
- 1
base/glib/glib.conf

@ -19,6 +19,7 @@ if ! atstage native; then
var_append configcache ' ' 'glib_cv_uscore=no' var_append configcache ' ' 'glib_cv_uscore=no'
var_append configcache ' ' 'ac_cv_func_posix_getpwuid_r=yes' var_append configcache ' ' 'ac_cv_func_posix_getpwuid_r=yes'
var_append configcache ' ' 'ac_cv_func_posix_getgrgid_r=yes' var_append configcache ' ' 'ac_cv_func_posix_getgrgid_r=yes'
var_append patchfiles ' ' "$confdir/glib-no_python.diff"
find-get-text() { find-get-text() {
if pkginstalled -f gettext-stub; then if pkginstalled -f gettext-stub; then
@ -29,7 +30,10 @@ find-get-text() {
fi fi
} }
hook_add preconf 8 'find-get-text' 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 fi
hook_add preconf 9 'autoreconf -ivf'
# we never want this file # we never want this file
var_append INSTALL_WRAPPER_FILTER "|" "sed -e 's,.*/charset.alias,/tmp/x,'" var_append INSTALL_WRAPPER_FILTER "|" "sed -e 's,.*/charset.alias,/tmp/x,'"

Loading…
Cancel
Save