diff options
| author | Tony Theodore <tonyt@logyst.com> | 2013-05-18 18:13:12 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2013-05-18 18:13:12 (GMT) |
| commit | 0da25956012856bbee217f4096be26f8c126748b (patch) | |
| tree | 4f1da9be6661ed1c8d2a482365f63aa00ac35c93 | |
| parent | ceeaa8ef00b2bd83fb6549c582ef4577acedd800 (diff) | |
| download | mxe-0da25956012856bbee217f4096be26f8c126748b.zip mxe-0da25956012856bbee217f4096be26f8c126748b.tar.gz mxe-0da25956012856bbee217f4096be26f8c126748b.tar.bz2 | |
packages icu4c harfbuzz pango: really fix linking
| -rw-r--r-- | src/harfbuzz-1-fixes.patch | 3 | ||||
| -rw-r--r-- | src/icu4c.mk | 1 | ||||
| -rw-r--r-- | src/pango.mk | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/harfbuzz-1-fixes.patch b/src/harfbuzz-1-fixes.patch index 8280edc..3bce659 100644 --- a/src/harfbuzz-1-fixes.patch +++ b/src/harfbuzz-1-fixes.patch @@ -191,11 +191,12 @@ diff --git a/harfbuzz.pc.in b/harfbuzz.pc.in index e92319e..2a49f2e 100644 --- a/harfbuzz.pc.in +++ b/harfbuzz.pc.in -@@ -8,4 +8,5 @@ Description: Text shaping library +@@ -8,4 +8,6 @@ Description: Text shaping library Version: @VERSION@ Libs: -L${libdir} -lharfbuzz +Libs.private: -lusp10 -lgdi32 ++Requires.private: icu-le cairo-ft glib-2.0 Cflags: -I${includedir}/harfbuzz -- 1.8.2.2 diff --git a/src/icu4c.mk b/src/icu4c.mk index f680573..5e76f76 100644 --- a/src/icu4c.mk +++ b/src/icu4c.mk @@ -18,6 +18,7 @@ define $(PKG)_BUILD mkdir '$(1).native' && cd '$(1).native' && '$(1)/source/configure' $(MAKE) -C '$(1).native' -j '$(JOBS)' + $(SED) -i 's,\(baselibs.*\),\1 -lstdc++,' '$(1)/source/config/icu.pc.in' mkdir '$(1).cross' && cd '$(1).cross' && '$(1)/source/configure' \ --host='$(TARGET)' \ --build="`config.guess`" \ diff --git a/src/pango.mk b/src/pango.mk index 7607118..489917c 100644 --- a/src/pango.mk +++ b/src/pango.mk @@ -27,7 +27,6 @@ define $(PKG)_BUILD --enable-explicit-deps \ --with-included-modules \ --without-dynamic-modules \ - CXX='$(TARGET)-g++' \ - LIBS='-lstdc++' + CXX='$(TARGET)-g++' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef |