diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-11-24 15:10:21 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-11-24 15:10:21 +0100 |
| commit | ec8e1d2e452487fa81bc480a3b20063d8d20c3a7 (patch) | |
| tree | bf7194142d7b14a3e5d8297c0c7aa6945b3bb9c9 /packages/graphics/pango/pango.mk | |
| parent | 9c107bf0c2a867a002d7df9dca9a4cacbe3d6907 (diff) | |
| parent | 4b996a7b9f4faaed5fbb44aa899f1f581edf244e (diff) | |
| download | embtoolkit-ec8e1d2e452487fa81bc480a3b20063d8d20c3a7.tar.gz embtoolkit-ec8e1d2e452487fa81bc480a3b20063d8d20c3a7.tar.bz2 embtoolkit-ec8e1d2e452487fa81bc480a3b20063d8d20c3a7.tar.xz | |
Merge branch 'master' into llvm-support
Diffstat (limited to 'packages/graphics/pango/pango.mk')
| -rw-r--r-- | packages/graphics/pango/pango.mk | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/packages/graphics/pango/pango.mk b/packages/graphics/pango/pango.mk index b7e44cb..1a8115d 100644 --- a/packages/graphics/pango/pango.mk +++ b/packages/graphics/pango/pango.mk @@ -27,7 +27,6 @@ PANGO_NAME := pango PANGO_MAJOR_VERSION := $(call embtk_get_pkgversion,pango_major) PANGO_VERSION := $(call embtk_get_pkgversion,pango) PANGO_SITE := http://ftp.gnome.org/pub/gnome/sources/pango/$(PANGO_MAJOR_VERSION) -PANGO_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror PANGO_PACKAGE := pango-$(PANGO_VERSION).tar.bz2 PANGO_SRC_DIR := $(embtk_pkgb)/pango-$(PANGO_VERSION) PANGO_BUILD_DIR := $(embtk_pkgb)/pango-$(PANGO_VERSION) @@ -45,23 +44,12 @@ PANGO_DEPS-y := $(if $(CONFIG_EMBTK_HAVE_PANGO_WITH_X), \ libx11_install) PANGO_CONFIGURE_OPTS := $(PANGO_CONFIGURE_OPTS-y) -PANGO_DEPS := glib_install fontconfig_install $(PANGO_DEPS-y) \ - cairo_install +PANGO_DEPS := glib_install fontconfig_install +PANGO_DEPS += $(PANGO_DEPS-y) cairo_install define embtk_postinstall_pango - $(Q)test -e $(PANGO_BUILD_DIR)/.patchlibtool || \ - $(MAKE) $(PANGO_BUILD_DIR)/.patchlibtool + $(Q)mkdir -p $(embtk_rootfs) + $(Q)mkdir -p $(embtk_rootfs)/usr + $(Q)mkdir -p $(embtk_rootfs)/usr/$(LIBDIR) $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/pango $(embtk_rootfs)/usr/$(LIBDIR)/ endef - -$(PANGO_BUILD_DIR)/.patchlibtool: - $(Q)PANGO_LT_FILES=`find $(embtk_sysroot)/usr/$(LIBDIR)/* -type f -name *.la`; \ - for i in $$PANGO_LT_FILES; \ - do \ - sed \ - -e "s;\/usr\/$(LIBDIR)\/libpangoft2-1.0.la ; $(embtk_sysroot)\/usr\/$(LIBDIR)\/libpangoft2-1.0.la ;" \ - -e "s;\/usr\/$(LIBDIR)\/libpango-1.0.la ; $(embtk_sysroot)\/usr\/$(LIBDIR)\/libpango-1.0.la ;" \ - < $$i > $$i.new; \ - mv $$i.new $$i; \ - done - @touch $@ |