diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/fontconfig-1-fixes.patch | 43 | ||||
| -rw-r--r-- | src/fontconfig.mk | 8 |
2 files changed, 1 insertions, 50 deletions
diff --git a/src/fontconfig-1-fixes.patch b/src/fontconfig-1-fixes.patch deleted file mode 100644 index 82ba607..0000000 --- a/src/fontconfig-1-fixes.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 - diff --git a/src/fontconfig.mk b/src/fontconfig.mk index 1f8fe1a..13ef1cc 100644 --- a/src/fontconfig.mk +++ b/src/fontconfig.mk @@ -3,7 +3,7 @@ PKG := fontconfig $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 1ab2f437c2261028ae7969892277af2d8d8db489 +$(PKG)_CHECKSUM := d47c6fa5693f91e274d655b5644dd333716c1395 $(PKG)_SUBDIR := fontconfig-$($(PKG)_VERSION) $(PKG)_FILE := fontconfig-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://fontconfig.org/release/$($(PKG)_FILE) @@ -16,18 +16,12 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && aclocal - cd '$(1)' && autoheader - cd '$(1)' && libtoolize - cd '$(1)' && automake - cd '$(1)' && autoconf cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --with-arch='$(TARGET)' \ - --with-freetype-config='$(PREFIX)/$(TARGET)/bin/freetype-config' \ --with-expat='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= |