Use HOST_GLIB for packages

diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index 84b13738880d69bc048269860839ac02b6e94842..38fc3749b937e0d7d5528eaf18d6176717c4b077 100644 (file)
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -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)

diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index baa75bc9effe73bbce343364969a9cbbed62be57..60a34a1aefb19f2bc14ec7dd33fdf76ae3597a49 100644 (file)
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -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

diff --git a/package/gtk2-engines/gtk2-engines.mk b/package/gtk2-engines/gtk2-engines.mk
index 3e3dd6e73f3de33302caf0bacdf82b42b25d6ccd..65dd6bb1f0b9019abcbdd0ce46be93b409b0a00c 100644 (file)
--- a/package/gtk2-engines/gtk2-engines.mk
+++ b/package/gtk2-engines/gtk2-engines.mk
@@ -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
 
 

diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 9daa23b1c702fd6296742277049f2abc91fa68ad..e91a2bd0f34a4b122aa590f963ca7efa022dc5e7 100644 (file)
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -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) \

diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 88de74ddeda8810b80e624230a17d238e56a7da6..996b5bf932e0ceec59b3f407150f9f631e92fd3f 100644 (file)
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -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)
 
 

diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk
index 96d88772f7be9065a1b4e69a0ae69ee986886f14..25fc5e4c255757cecaeba029fba5feca6dd8f8fa 100644 (file)
--- a/package/metacity/metacity.mk
+++ b/package/metacity/metacity.mk
@@ -96,7 +96,7 @@ $(METACITY_DIR)/.configured: $(METACITY_DIR)/.unpacked
                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 \
                --target=$(GNU_TARGET_NAME) \
                --host=$(GNU_TARGET_NAME) \
                --build=$(GNU_HOST_NAME) \

diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index 1afca1ef8948ad671ef3661cf2830dc2783ffee1..d84bbeda3abf3a515de6ed5cafa7a48086c8b343 100644 (file)
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -40,7 +40,7 @@ PANGO_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 PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \
-               ac_cv_path_GLIB_GENMARSHAL=/usr/bin/glib-genmarshal ac_cv_path_FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config 
+               ac_cv_path_GLIB_GENMARSHAL=$(HOST_GLIB)/bin/glib-genmarshal ac_cv_path_FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config 
                
 ifneq ($(BR2_PACKAGE_XSERVER_none),y)
         PANGO_CONF_OPT_X = --with-x \

diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index 3bbe34372249d28023a645203d1f01e9a4909475..c297e87bff08d07c3cdf5bb238ae4841bfd3190a 100644 (file)
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -13,7 +13,7 @@ WEBKIT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install
 
 WEBKIT_AUTORECONF = YES
 WEBKIT_DEPENDENCIES = icu curl libxml2 libxslt xserver_xorg-server libgtk2 sqlite
-WEBKIT_MAKE_OPT = GLIB_GENMARSHAL=/usr/bin/glib-genmarshal GLIB_MKENUMS=/usr/bin/glib-mkenums
+WEBKIT_MAKE_OPT = GLIB_GENMARSHAL=$(HOST_GLIB)/bin/glib-genmarshal GLIB_MKENUMS=$(HOST_GLIB)/bin/glib-mkenums
 
 $(eval $(call AUTOTARGETS,package,webkit))