summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2015-01-01 05:56:37 +0000
committerEric Sandall2015-01-01 05:57:53 +0000
commitcc769dad2c6d2074d48b035c6cc1961a8716192b (patch)
tree7d7862979d91976f4baf74eb2289390c18d34b88
parent77f181f8062009163f6ad881843128e35e5c3b3c (diff)
texlive: Fixes Bug #630. Fix finding the path for freetype2 headers
-rwxr-xr-xlatex/texlive/BUILD2
-rwxr-xr-xlatex/texlive/DEPENDS2
-rw-r--r--latex/texlive/HISTORY4
3 files changed, 5 insertions, 3 deletions
diff --git a/latex/texlive/BUILD b/latex/texlive/BUILD
index 1e66ccb9e8..28d53c31d1 100755
--- a/latex/texlive/BUILD
+++ b/latex/texlive/BUILD
@@ -1,8 +1,6 @@
# hide warnings about unable to find it's own config files
export KPATHSEA_WARNING=0 &&
# X seems to be only there for xdvi which we use external
-export CFLAGS="-I/usr/include/freetype2 $CFLAGS" &&
-export CXXFLAGS="-I/usr/include/freetype2 $CXXFLAGS" &&
cd ${COMPILE_DIRECTORY} &&
LIBS="-lpng" $SOURCE_DIRECTORY/configure --prefix=${INSTALL_ROOT}/usr \
--sysconfdir=${INSTALL_ROOT}/etc \
diff --git a/latex/texlive/DEPENDS b/latex/texlive/DEPENDS
index 659f5945eb..ed550bab9c 100755
--- a/latex/texlive/DEPENDS
+++ b/latex/texlive/DEPENDS
@@ -8,7 +8,7 @@ depends ed &&
depends texinfo &&
depends ghostscript '--with-gs=gs' &&
depends fontconfig "--enable-xetex" &&
-depends freetype2 "--with-system-freetype2" &&
+depends freetype2 "--with-system-freetype2 --with-freetype2-includes=/usr/include/freetype2" &&
depends libpng "--with-system-libpng --with-libpng-include=/usr/includes --with-libpng-libdir=/usr/lib" &&
depends zlib "--with-system-zlib --with-zlib-libdir=/usr/lib --with-zlib-include=/usr/includes" &&
depends t1lib "--with-system-t1lib --with-t1lib-libdir=/usr/lib --with-t1lib-includes=/usr/include" &&
diff --git a/latex/texlive/HISTORY b/latex/texlive/HISTORY
index 20b745ff18..dbb5501a19 100644
--- a/latex/texlive/HISTORY
+++ b/latex/texlive/HISTORY
@@ -1,3 +1,7 @@
+2013-12-15 Javier Vasquez <j.e.vasquez.v@gmail.com>
+ * Fixes Bug #630
+ * DEPENDS, BUILD: Fixing finding the path for freetype2 headers
+
2013-08-10 Javier Vasquez <j.e.vasquez.v@gmail.com>
* Fixes Bug #471
* BUILD: Remove --disable-luatex