diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-03-18 21:22:17 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-03-18 21:22:17 +0000 |
| commit | 99334cde2b45b81d6995b9a37645fd04311342ab (patch) | |
| tree | 78b3bec5c4e4b7e584d533e80df4678539c40f5e | |
| parent | 689c10faea3d8a9f1784043e9a1109ca073c6a86 (diff) | |
libgtk2: build host version, use it for build time binaries
| -rw-r--r-- | package/libgtk2/libgtk2.mk | 55 |
1 files changed, 52 insertions, 3 deletions
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index a259fff4a..10d1704f3 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -67,8 +67,8 @@ LIBGTK2_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=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_GTK_UPDATE_ICON_CACHE=/usr/bin/gtk-update-icon-cache \ - ac_cv_path_GDK_PIXBUF_CSOURCE=/usr/bin/gdk-pixbuf-csource \ + ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/usr/bin/gtk-update-icon-cache \ + ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/usr/bin/gdk-pixbuf-csource \ ac_cv_prog_F77=no \ ac_cv_path_CUPS_CONFIG=no @@ -78,7 +78,7 @@ LIBGTK2_CONF_OPT = --enable-shared \ --enable-explicit-deps=no \ --disable-debug -LIBGTK2_DEPENDENCIES = host-pkgconfig libglib2 cairo pango atk +LIBGTK2_DEPENDENCIES = host-pkgconfig host-libgtk2 libglib2 cairo pango atk ifeq ($(BR2_PACKAGE_DIRECTFB),y) LIBGTK2_CONF_OPT += --with-gdktarget=directfb @@ -131,3 +131,52 @@ $(LIBGTK2_HOOK_POST_INSTALL): $(INSTALL) -m 755 package/libgtk2/S26libgtk2 $(TARGET_DIR)/etc/init.d/ rm -rf $(TARGET_DIR)/usr/share/gtk-2.0/demo $(TARGET_DIR)/usr/bin/gtk-demo touch $@ + +# libgtk2 for the host +LIBGTK2_HOST_DIR:=$(BUILD_DIR)/libgtk2-$(LIBGTK2_VERSION)-host +LIBGTK2_HOST_BINARY:=$(HOST_DIR)/usr/bin/gdk-pixbuf-csource + +$(LIBGTK2_HOST_DIR)/.unpacked: $(DL_DIR)/$(LIBGTK2_SOURCE) + mkdir -p $(@D) + $(INFLATE$(suffix $(LIBGTK2_SOURCE))) $< | \ + $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) - + touch $@ + +$(LIBGTK2_HOST_DIR)/.configured: $(LIBGTK2_HOST_DIR)/.unpacked $(PKGCONFIG_HOST_BINARY) $(CAIRO_HOST_BINARY) $(LIBGLIB2_HOST_BINARY) $(PANGO_HOST_BINARY) $(ATK_HOST_BINARY) + (cd $(@D); rm -rf config.cache; \ + $(HOST_CONFIGURE_OPTS) \ + CFLAGS="$(HOST_CFLAGS)" \ + LDFLAGS="$(HOST_LDFLAGS)" \ + $(@D)/configure \ + --prefix=$(HOST_DIR)/usr \ + --sysconfdir=$(HOST_DIR)/etc \ + --disable-static \ + --disable-glibtest \ + --without-libtiff \ + --without-libpng \ + --without-libjpeg \ + --with-x \ + --with-gdktarget=x11 \ + --disable-cups \ + --disable-debug \ + ) + touch $@ + +$(LIBGTK2_HOST_DIR)/.compiled: $(LIBGTK2_HOST_DIR)/.configured + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) + touch $@ + +$(LIBGTK2_HOST_BINARY): $(LIBGTK2_HOST_DIR)/.compiled + $(HOST_MAKE_ENV) $(MAKE) -C $(<D) install + +host-libgtk2: $(LIBGTK2_HOST_BINARY) + +host-libgtk2-source: libgtk2-source + +host-libgtk2-clean: + rm -f $(addprefix $(LIBGTK2_HOST_DIR)/,.unpacked .configured .compiled) + -$(MAKE) -C $(LIBGTK2_HOST_DIR) uninstall + -$(MAKE) -C $(LIBGTK2_HOST_DIR) clean + +host-libgtk2-dirclean: + rm -rf $(LIBGTK2_HOST_DIR) |