Commit 1a75be4d authored by Ulf Samuelsson's avatar Ulf Samuelsson
Browse files

Use HOST_GLIB for packages

parent 50cbb4a1

package/atk/atk.mk

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,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=/usr/bin/glib-genmarshal \

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

		ac_cv_prog_F77=no ac_cv_prog_CXX=no 



ifneq ($(BR2_PACKAGE_XSERVER_none),y)

package/cairo/cairo.mk

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ CAIRO_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=/usr/bin/glib-genmarshal 

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



ifeq ($(BR2_PACKAGE_DIRECTFB),y)

	CAIRO_CONF_OPT = --disable-xlib --without-x --enable-directfb

package/gtk2-engines/gtk2-engines.mk

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 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=/usr/bin/glib-genmarshal \

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

		ac_cv_path_CUPS_CONFIG=no

package/libglib2/libglib2.mk

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ LIBGLIB2_CONF_ENV = $(TARGET_CONFIGURE_OPTS) $(TARGET_CONFIGURE_ARGS) \ 
		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=/usr/bin/glib-genmarshal ac_cv_prog_F77=no \

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

		ac_cv_prog_CXX=no ac_cv_func_posix_getgrgid_r=no 



LIBGLIB2_CONF_OPT =	--target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \

package/libgtk2/libgtk2.mk

+4 −4
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ LIBGTK2_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=/usr/bin/glib-genmarshal \

		ac_cv_path_GTK_UPDATE_ICON_CACHE=/usr/bin/gtk-update-icon-cache \

		ac_cv_path_GDK_PIXBUF_CSOURCE=/usr/bin/gdk-pixbuf-csource \

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

		ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_GLIB)/bin/gtk-update-icon-cache \

		ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_GLIB)/bin/gdk-pixbuf-csource \

		ac_cv_prog_F77=no ac_cv_prog_CXX=no ac_cv_path_CUPS_CONFIG=no 



LIBGTK2_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
@@ -55,7 +55,7 @@ LIBGTK2_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \ 
		--infodir=/usr/info --enable-shared \

		--enable-static \

		--disable-glibtest --enable-explicit-deps=no \

		--disable-debug PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \

		--disable-debug \

		$(LIBGTK2_CONF_OPT_X)  $(LIBGTK2_CONF_OPT_DFB)