diff options
| author | Tony Theodore <tonyt@logyst.com> | 2013-05-18 16:15:48 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2013-05-18 16:15:48 (GMT) |
| commit | ceeaa8ef00b2bd83fb6549c582ef4577acedd800 (patch) | |
| tree | 5511ca64fc6acd6c8226c735fc6aa977aa31c617 /src | |
| parent | c3330ee8ee100b8be55b98e564564ece2129278c (diff) | |
| download | mxe-ceeaa8ef00b2bd83fb6549c582ef4577acedd800.zip mxe-ceeaa8ef00b2bd83fb6549c582ef4577acedd800.tar.gz mxe-ceeaa8ef00b2bd83fb6549c582ef4577acedd800.tar.bz2 | |
packages harfbuzz pango: fix for icu enabled builds
Diffstat (limited to 'src')
| -rw-r--r-- | src/harfbuzz.mk | 10 | ||||
| -rw-r--r-- | src/pango.mk | 3 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/harfbuzz.mk b/src/harfbuzz.mk index ca407ca..894610d4 100644 --- a/src/harfbuzz.mk +++ b/src/harfbuzz.mk @@ -22,11 +22,7 @@ define $(PKG)_BUILD --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared \ - --enable-static - $(MAKE) -C '$(1)/src' -j '$(JOBS)' - # some of these tests want to be linked with g++ - # but there's no easy way to bypass the am__v_CCLD... logic - $(MAKE) -C '$(1)/test/api' -j '$(JOBS)' test-blob.exe test-buffer.exe test-common.exe test-ot-tag.exe test-set.exe test-version.exe - $(MAKE) -C '$(1)/test/api' -j '$(JOBS)' || $(MAKE) -C '$(1)/test/api' -j '$(JOBS)' CC=$(TARGET)-g++ - $(MAKE) -C '$(1)' install + --enable-static \ + LIBS='-lstdc++' + $(MAKE) -C '$(1)' -j '$(JOBS)' install endef diff --git a/src/pango.mk b/src/pango.mk index 489917c..7607118 100644 --- a/src/pango.mk +++ b/src/pango.mk @@ -27,6 +27,7 @@ define $(PKG)_BUILD --enable-explicit-deps \ --with-included-modules \ --without-dynamic-modules \ - CXX='$(TARGET)-g++' + CXX='$(TARGET)-g++' \ + LIBS='-lstdc++' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef |