diff options
Diffstat (limited to 'package/libgtk2/libgtk2.mk')
| -rw-r--r-- | package/libgtk2/libgtk2.mk | 80 |
1 files changed, 42 insertions, 38 deletions
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index 78845973c..8c3384b23 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -10,22 +10,7 @@ LIBGTK2_CAT:=$(BZCAT) LIBGTK2_DIR:=$(BUILD_DIR)/gtk+-$(LIBGTK2_VERSION) LIBGTK2_BINARY:=libgtk-x11-2.0.a - -$(DL_DIR)/$(LIBGTK2_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBGTK2_SITE)/$(LIBGTK2_SOURCE) - -libgtk2-source: $(DL_DIR)/$(LIBGTK2_SOURCE) - -$(LIBGTK2_DIR)/.unpacked: $(DL_DIR)/$(LIBGTK2_SOURCE) - $(LIBGTK2_CAT) $(DL_DIR)/$(LIBGTK2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(LIBGTK2_DIR) package/libgtk2/ \*.patch* - $(CONFIG_UPDATE) $(LIBGTK2_DIR) - touch $(LIBGTK2_DIR)/.unpacked - -$(LIBGTK2_DIR)/.configured: $(LIBGTK2_DIR)/.unpacked - (cd $(LIBGTK2_DIR); rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) \ - GLIB_CONFIG=$(STAGING_DIR)/bin/glib-config \ +LIBGTK2_BUILD_ENV=$(TARGET_CONFIGURE_OPTS) \ ac_cv_func_mmap_fixed_mapped=yes \ ac_cv_func_posix_getpwuid_r=yes \ glib_cv_stack_grows=no \ @@ -84,7 +69,28 @@ $(LIBGTK2_DIR)/.configured: $(LIBGTK2_DIR)/.unpacked ac_use_included_regex=no \ gl_cv_c_restrict=no \ ac_cv_path_GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \ - ac_cv_path_CUPS_CONFIG=no \ + ac_cv_path_CUPS_CONFIG=no + + +$(DL_DIR)/$(LIBGTK2_SOURCE): + $(WGET) -P $(DL_DIR) $(LIBGTK2_SITE)/$(LIBGTK2_SOURCE) + +libgtk2-source: $(DL_DIR)/$(LIBGTK2_SOURCE) + +$(LIBGTK2_DIR)/.unpacked: $(DL_DIR)/$(LIBGTK2_SOURCE) + $(LIBGTK2_CAT) $(DL_DIR)/$(LIBGTK2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(LIBGTK2_DIR) package/libgtk2/ \*.patch* + $(CONFIG_UPDATE) $(LIBGTK2_DIR) + touch $(LIBGTK2_DIR)/.unpacked + +$(LIBGTK2_DIR)/.configured: $(LIBGTK2_DIR)/.unpacked + # The following is an truely evil hack! + # I dont yet understand why configure is not doing this right + # TODO: also remove 'odd-include-problem.patch' when this is fixed + $(SED) "s,^GDK_DEP_CFLAGS=.*,GDK_DEP_CFLAGS=\'-pthread -I$(STAGING_DIR)/include/glib-2.0 -I$(STAGING_DIR)/lib/glib-2.0/include -I$(STAGING_DIR)/include/pango-1.0 -I$(STAGING_DIR)/include/cairo\',g" $(LIBGTK2_DIR)/configure + $(SED) "s,^GDK_DEP_LIBS=.*,GDK_DEP_LIBS=\'-L/home/andersen/SVN/buildroot/build_i686/staging_dir/lib -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lfontconfig -lXext -lXrender -lX11 -lXinerama -lXrandr -lXcursor -lXfixes -lXft -lm\',g" $(LIBGTK2_DIR)/configure + (cd $(LIBGTK2_DIR); rm -rf config.cache; \ + $(LIBGTK2_BUILD_ENV) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ @@ -104,37 +110,20 @@ $(LIBGTK2_DIR)/.configured: $(LIBGTK2_DIR)/.unpacked --enable-shared \ --enable-static \ --with-x \ - --x-includes=$(STAGING_DIR)/usr/X11R6/include \ - --x-libraries=$(STAGING_DIR)/usr/X11R6/lib \ + --x-includes=$(STAGING_DIR)/include \ + --x-libraries=$(STAGING_DIR)/lib \ --disable-glibtest \ --enable-explicit-deps=no \ --disable-debug \ - --disable-glibtest \ - --disable-xim \ - --with-gdktarget=x11 \ ); touch $(LIBGTK2_DIR)/.configured $(LIBGTK2_DIR)/gtk/.libs/$(LIBGTK2_BINARY): $(LIBGTK2_DIR)/.configured - $(MAKE) CC=$(TARGET_CC) -C $(LIBGTK2_DIR) + $(LIBGTK2_BUILD_ENV) $(MAKE) CC=$(TARGET_CC) -C $(LIBGTK2_DIR) touch -c $(LIBGTK2_DIR)/gtk/.libs/$(LIBGTK2_BINARY) $(STAGING_DIR)/lib/$(LIBGTK2_BINARY): $(LIBGTK2_DIR)/gtk/.libs/$(LIBGTK2_BINARY) - $(MAKE) prefix=$(STAGING_DIR) \ - exec_prefix=$(STAGING_DIR) \ - bindir=$(STAGING_DIR)/bin \ - sbindir=$(STAGING_DIR)/sbin \ - libexecdir=$(STAGING_DIR)/bin \ - datadir=$(STAGING_DIR)/share \ - sysconfdir=$(STAGING_DIR)/etc \ - sharedstatedir=$(STAGING_DIR)/com \ - localstatedir=$(STAGING_DIR)/var \ - libdir=$(STAGING_DIR)/lib \ - includedir=$(STAGING_DIR)/include \ - oldincludedir=$(STAGING_DIR)/include \ - infodir=$(STAGING_DIR)/info \ - mandir=$(STAGING_DIR)/man \ - -C $(LIBGTK2_DIR) install; + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBGTK2_DIR) install; touch -c $(STAGING_DIR)/lib/$(LIBGTK2_BINARY) $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0: $(STAGING_DIR)/lib/$(LIBGTK2_BINARY) @@ -144,6 +133,21 @@ $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0: $(STAGING_DIR)/lib/$(LIBGTK2_BINARY) cp -a $(STAGING_DIR)/lib/libgdk*-2.0.so.0* $(TARGET_DIR)/lib/ $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0* $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgdk*-2.0.so.0* + mkdir -p $(TARGET_DIR)/lib/gtk-2.0/2.10.0/engines + cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/engines/*.so \ + $(TARGET_DIR)/lib/gtk-2.0/2.10.0/engines/ + mkdir -p $(TARGET_DIR)/lib/gtk-2.0/2.10.0/printbackends + cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/printbackends/*.so \ + $(TARGET_DIR)/lib/gtk-2.0/2.10.0/printbackends/ + mkdir -p $(TARGET_DIR)/lib/gtk-2.0/2.10.0/immodules + cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/immodules/*.so \ + $(TARGET_DIR)/lib/gtk-2.0/2.10.0/immodules/ + mkdir -p $(TARGET_DIR)/lib/gtk-2.0/2.10.0/loaders + cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/loaders/*.so \ + $(TARGET_DIR)/lib/gtk-2.0/2.10.0/loaders/ + mkdir -p $(TARGET_DIR)/etc/gtk-2.0 + cp package/libgtk2/gdk-pixbuf.loaders $(TARGET_DIR)/etc/gtk-2.0 + cp package/libgtk2/gtk.immodules $(TARGET_DIR)/etc/gtk-2.0 touch -c $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0 libgtk2: uclibc png jpeg tiff xorg libglib2 \ |