From abfda297c4fe560ec1a620a0aa44dbb27d9be97a Mon Sep 17 00:00:00 2001 From: lovedheart Date: Sun, 11 Mar 2018 14:44:37 -0700 Subject: [PATCH] [fontconfig] upgrade to 2.13.0, fix libdir (#1980) * [fontconfig] upgrade to 2.13.0, fix libdir wrong libdir causes build issue for x86_64 architecture. * Update fontconfig.rb --- packages/fontconfig.rb | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/packages/fontconfig.rb b/packages/fontconfig.rb index 2f5827879d..dd79c3a636 100644 --- a/packages/fontconfig.rb +++ b/packages/fontconfig.rb @@ -3,21 +3,15 @@ require 'package' class Fontconfig < Package description 'Fontconfig is a library for configuring and customizing font access.' homepage 'https://www.freedesktop.org/software/fontconfig/front.html' - version '2.12.4-1' - source_url 'https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.12.4.tar.bz2' - source_sha256 '668293fcc4b3c59765cdee5cee05941091c0879edcc24dfec5455ef83912e45c' + version '2.13.0' + source_url 'https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.0.tar.gz' + source_sha256 'a6ca290637d8b2c4e1dd40549b179202977593f7481ec83ddfb1765ad90037ba' binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/fontconfig-2.12.4-1-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/fontconfig-2.12.4-1-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/fontconfig-2.12.4-1-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/fontconfig-2.12.4-1-chromeos-x86_64.tar.xz', + }) binary_sha256 ({ - aarch64: '34f5212e583b5c6c993ccdf4d2f0252e276a18328492a336a483c066f640dd55', - armv7l: '34f5212e583b5c6c993ccdf4d2f0252e276a18328492a336a483c066f640dd55', - i686: '9ab6f59b64fd27f81b2d30d01da4b29c94bf1e60a0e4d87f8ca1cda5f22b9386', - x86_64: 'dc136fe2a61688e9ec461682627c6475b7918bcc0f6584e5ff27649791629e8f', + }) depends_on 'expat' @@ -26,8 +20,11 @@ class Fontconfig < Package depends_on 'freetype' def self.build - system './configure CFLAGS=" -fPIC" --localstatedir=/usr/local/cache' - system 'make' + system "./configure \ + --prefix=#{CREW_PREFIX} \ + --libdir=#{CREW_LIB_PREFIX} \ + --localstatedir=#{CREW_PREFIX}/cache" + system 'make' end def self.install