Commit 01bcd032 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

libglib2: build host version for build-time binaries 

Build host version of glib in HOST_DIR and use the build-time binaries
from there instead of relying on what is installed on the host.
parent fe202a6f

package/atk/atk.mk

+1 −4
Original line number Diff line number Diff line
@@ -38,8 +38,7 @@ ATK_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes \ 
		am_cv_func_working_getline=yes gl_cv_func_mkdir_trailing_slash_bug=no \

		gl_cv_func_mkstemp_limitations=no ac_cv_func_working_mktime=yes \

		jm_cv_func_working_re_compile_pattern=yes ac_use_included_regex=no \

		gl_cv_c_restrict=no ac_cv_path_GLIB_GENMARSHAL=$(HOST_GLIB)/bin/glib-genmarshal \

		ac_cv_prog_F77=no

		gl_cv_c_restrict=no ac_cv_prog_F77=no



ifneq ($(BR2_PACKAGE_XSERVER_none),y)

ATK_CONF_OPT_X = --with-x \
@@ -54,8 +53,6 @@ ATK_CONF_OPT = --enable-shared \ 
		--disable-glibtest --enable-explicit-deps=no \

		--disable-debug



ATK_MAKE_OPT = GLIB_GENMARSHAL=$(HOST_GLIB)/bin/glib-genmarshal GLIB_MKENUMS=$(HOST_GLIB)/bin/glib-mkenums



ATK_DEPENDENCIES = libglib2 pkgconfig



$(eval $(call AUTOTARGETS,package,atk))

package/cairo/cairo.mk

+1 −3
Original line number Diff line number Diff line
@@ -38,9 +38,7 @@ CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ 
		am_getline_needs_run_time_check=no am_cv_func_working_getline=yes \

		gl_cv_func_mkdir_trailing_slash_bug=no gl_cv_func_mkstemp_limitations=no \

		ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \

		ac_use_included_regex=no gl_cv_c_restrict=no \

		ac_cv_path_GLIB_GENMARSHAL=$(HOST_GLIB)/bin/glib-genmarshal



		ac_use_included_regex=no gl_cv_c_restrict=no



CAIRO_DEPENDENCIES = uclibc pkgconfig fontconfig pixman

package/gtk2-engines/gtk2-engines.mk

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ GTK2_ENGINES_BUILD_ENV= \ 
		jm_cv_func_working_re_compile_pattern=yes \

		ac_use_included_regex=no \

		gl_cv_c_restrict=no \

		ac_cv_path_GLIB_GENMARSHAL=$(HOST_GLIB)/bin/glib-genmarshal \

		ac_cv_path_CUPS_CONFIG=no

package/java/jamvm/jamvm.mk

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ JAMVM_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ 
		gl_cv_func_mkdir_trailing_slash_bug=no gl_cv_func_mkstemp_limitations=no \

		ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \

		ac_use_included_regex=no gl_cv_c_restrict=no \

		ac_cv_path_GLIB_GENMARSHAL=$(HOST_GLIB)/glib-genmarshal \

		ac_cv_prog_F77=no ac_cv_prog_CXX=no ac_cv_path_CUPS_CONFIG=no



JAMVM_CONF_OPT = \

package/libglib2/libglib2-pkgconfig-cc.patch

+18 −6
Original line number Diff line number Diff line 
--- a/glib-2.0.pc.in	2007-01-16 18:24:39.000000000 -0500

+++ b/glib-2.0.pc.in	2008-02-09 09:25:28.000000000 -0500

@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@

glib2: prefix glib binaries in pkgconfig file with BIN_DIR



Make sure the host versions of the glib binaries are used.

---

 glib-2.0.pc.in |    7 ++++---

 1 file changed, 4 insertions(+), 3 deletions(-)



Index: glib-2.18.4/glib-2.0.pc.in

===================================================================

--- glib-2.18.4.orig/glib-2.0.pc.in

+++ glib-2.18.4/glib-2.0.pc.in

@@ -1,11 +1,12 @@

+BIN_DIR=

 prefix=@prefix@

 exec_prefix=@exec_prefix@

 libdir=@libdir@

 includedir=@includedir@

 

-glib_genmarshal=glib-genmarshal

-gobject_query=gobject-query

-glib_mkenums=glib-mkenums

+glib_genmarshal=/usr/bin/glib-genmarshal

+gobject_query=/usr/bin/gobject-query

+glib_mkenums=/usr/bin/glib-mkenums

+glib_genmarshal=${BIN_DIR}glib-genmarshal

+gobject_query=$(BIN_DIR}gobject-query

+glib_mkenums=${BIN_DIR}glib-mkenums

 

 Name: GLib

 Description: C Utility Library