diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2012-06-14 09:13:15 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2012-06-14 09:13:15 (GMT) |
| commit | 3c71f33b788bcb680a17b5004ba09e902502e283 (patch) | |
| tree | bf34035b07cf3dbc26f66b4568f0077ae88f1299 /src/fontconfig-1-fixes.patch | |
| parent | 091a8eec4090516946174760b9e188b4bf3ce953 (diff) | |
| download | mxe-3c71f33b788bcb680a17b5004ba09e902502e283.zip mxe-3c71f33b788bcb680a17b5004ba09e902502e283.tar.gz mxe-3c71f33b788bcb680a17b5004ba09e902502e283.tar.bz2 | |
package fontconfig: replace sed hack with upstream patch
Diffstat (limited to 'src/fontconfig-1-fixes.patch')
| -rw-r--r-- | src/fontconfig-1-fixes.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/src/fontconfig-1-fixes.patch b/src/fontconfig-1-fixes.patch new file mode 100644 index 0000000..82ba607 --- /dev/null +++ b/src/fontconfig-1-fixes.patch @@ -0,0 +1,43 @@ +From 107e1934711cd9246c03f01e0acecdede714ea73 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH <akira@tagoh.org> +Date: Thu, 14 Jun 2012 11:27:31 +0900 +Subject: [PATCH] Fix the fail of make install with --disable-shared on Win32 + (cherry picked from commit + 997a64a67b77ae7c083f4a2898670201ed618fb2) + +--- + configure.in | 1 + + src/Makefile.am | 2 ++ + 3 files changed, 4 insertions(+) + +diff --git a/configure.in b/configure.in +index da6ef95..88b6367 100644 +--- a/configure.in ++++ b/configure.in +@@ -94,6 +94,7 @@ AC_SUBST(WARN_CFLAGS) + dnl ========================================================================== + + AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) ++AM_CONDITIONAL(ENABLE_SHARED, test "$enable_shared" = "yes") + + dnl ========================================================================== + +diff --git a/src/Makefile.am b/src/Makefile.am +index a7bb73c..81562cb 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -132,9 +132,11 @@ libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT + + libfontconfig_la_DEPENDENCIES = $(fontconfig_def_dependency) + ++if ENABLE_SHARED + install-data-local: install-ms-import-lib install-libtool-import-lib + + uninstall-local: uninstall-ms-import-lib uninstall-libtool-import-lib ++endif + + PUBLIC_FILES = \ + $(top_srcdir)/fontconfig/fontconfig.h \ +-- +1.7.10.4 + |