Use HOST_GLIB for packages
This commit is contained in:
parent
50cbb4a188
commit
1a75be4d73
@ -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)
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
||||
|
@ -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) \
|
||||
|
@ -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)
|
||||
|
||||
|
||||
|
@ -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) \
|
||||
|
@ -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 \
|
||||
|
@ -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))
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user