summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-03-21 10:02:26 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-03-21 10:02:26 +0000
commit993ee61aefc428addf731a962bb1bc0053477bc1 (patch)
treedd4de6a217a79a4c981d2eb35f74c09b45cd6383 /Build
parent388463b9fa865c3b2311508c41647b0f3c532031 (diff)
libs/freetype2: Backport patch from git repository
git-svn-id: svn://tug.org/texlive/trunk@29454 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/freetype2/freetype-2.4.11-PATCHES/ChangeLog4
-rw-r--r--Build/source/libs/freetype2/freetype-2.4.11-PATCHES/patch-02-DISABLE_OLD_INTERNALS19
-rw-r--r--Build/source/libs/freetype2/freetype-2.4.11-PATCHES/patch-03-RESPECT-MAKE51
-rwxr-xr-xBuild/source/libs/freetype2/freetype-2.4.11/configure24
4 files changed, 79 insertions, 19 deletions
diff --git a/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/ChangeLog b/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/ChangeLog
index 5865e2a4bb7..4a02b365664 100644
--- a/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/ChangeLog
+++ b/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-21 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-03-RESPECT-MAKE (new): Backport from git repository.
+
2013-03-03 Khaled Hosny <khaledhosny@eglug.org>
* patch-02-DISABLE_OLD_INTERNALS (new): Build FreeType without
diff --git a/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/patch-02-DISABLE_OLD_INTERNALS b/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/patch-02-DISABLE_OLD_INTERNALS
index 329732125d2..f7c46f20b1a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/patch-02-DISABLE_OLD_INTERNALS
+++ b/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/patch-02-DISABLE_OLD_INTERNALS
@@ -1,8 +1,7 @@
-diff --git a/libs/freetype2/freetype-2.4.11/devel/ftoption.h b/libs/freetype2/freetype-2.4.11/devel/ftoption.h
-index 6b2a40f..205d6d0 100644
---- a/libs/freetype2/freetype-2.4.11/devel/ftoption.h
-+++ b/libs/freetype2/freetype-2.4.11/devel/ftoption.h
-@@ -783,7 +783,7 @@ FT_BEGIN_HEADER
+diff -ur -x config.guess -x config.sub -x install-sh freetype-2.4.11.orig/devel/ftoption.h freetype-2.4.11/devel/ftoption.h
+--- freetype-2.4.11.orig/devel/ftoption.h 2012-09-29 09:42:15.000000000 +0200
++++ freetype-2.4.11/devel/ftoption.h 2013-03-03 12:37:18.000000000 +0100
+@@ -783,7 +783,7 @@
* is recommended to disable the macro since it reduces the library's code
* size and activates a few memory-saving optimizations as well.
*/
@@ -11,12 +10,10 @@ index 6b2a40f..205d6d0 100644
/*
-
-diff --git a/libs/freetype2/freetype-2.4.11/include/freetype/config/ftoption.h b/libs/freetype2/freetype-2.4.11/include/freetype/config/ftoption.h
-index a73fff4..0d0b461 100644
---- a/libs/freetype2/freetype-2.4.11/include/freetype/config/ftoption.h
-+++ b/libs/freetype2/freetype-2.4.11/include/freetype/config/ftoption.h
-@@ -783,7 +783,7 @@ FT_BEGIN_HEADER
+diff -ur -x config.guess -x config.sub -x install-sh freetype-2.4.11.orig/include/freetype/config/ftoption.h freetype-2.4.11/include/freetype/config/ftoption.h
+--- freetype-2.4.11.orig/include/freetype/config/ftoption.h 2012-09-29 09:42:15.000000000 +0200
++++ freetype-2.4.11/include/freetype/config/ftoption.h 2013-03-03 13:08:40.000000000 +0100
+@@ -783,7 +783,7 @@
* is recommended to disable the macro since it reduces the library's code
* size and activates a few memory-saving optimizations as well.
*/
diff --git a/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/patch-03-RESPECT-MAKE b/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/patch-03-RESPECT-MAKE
new file mode 100644
index 00000000000..c88bab7a2f4
--- /dev/null
+++ b/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/patch-03-RESPECT-MAKE
@@ -0,0 +1,51 @@
+diff -ur -x config.guess -x config.sub -x install-sh freetype-2.4.11.orig/configure freetype-2.4.11/configure
+--- freetype-2.4.11.orig/configure 2011-12-02 20:21:55.000000000 +0100
++++ freetype-2.4.11/configure 2013-03-21 10:10:51.000000000 +0100
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ #
+-# Copyright 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010 by
++# Copyright 2002-2006, 2008-2010, 2013 by
+ # David Turner, Robert Wilhelm, and Werner Lemberg.
+ #
+ # This file is part of the FreeType project, and may only be used, modified,
+@@ -15,17 +15,25 @@
+
+ rm -f config.mk builds/unix/unix-def.mk builds/unix/unix-cc.mk
+
++# respect GNUMAKE environment variable for backwards compatibility
+ if test "x$GNUMAKE" = x; then
+- GNUMAKE=make
++ if test "x$MAKE" = x; then
++ MAKE=make
++ fi
++else
++ MAKE=$GNUMAKE
+ fi
+
+-if test -z "`$GNUMAKE -v 2>/dev/null | grep GNU`"; then
+- if test -z "`$GNUMAKE -v 2>/dev/null | grep makepp`"; then
++if test -z "`$MAKE -v 2>/dev/null | grep GNU`"; then
++ if test -z "`$MAKE -v 2>/dev/null | grep makepp`"; then
+ echo "GNU make (>= 3.80) or makepp (>= 1.19) is required to build FreeType2." >&2
+ echo "Please try" >&2
+- echo " \`GNUMAKE=<GNU make command name> $0'." >&2
+- echo "or >&2"
+- echo " \`GNUMAKE=\"makepp --norc-substitution\" $0'." >&2
++ echo >&2
++ echo " MAKE=<GNU make command name> $0" >&2
++ echo >&2
++ echo "or" >&2
++ echo >&2
++ echo " MAKE=\"makepp --norc-substitution\" $0" >&2
+ exit 1
+ fi
+ fi
+@@ -120,6 +128,6 @@
+ esac
+ done ;;
+ esac
+-CFG=$CFG $GNUMAKE setup unix
++CFG=$CFG $MAKE setup unix
+
+ # eof
diff --git a/Build/source/libs/freetype2/freetype-2.4.11/configure b/Build/source/libs/freetype2/freetype-2.4.11/configure
index 55a24fdc597..5052c08ade7 100755
--- a/Build/source/libs/freetype2/freetype-2.4.11/configure
+++ b/Build/source/libs/freetype2/freetype-2.4.11/configure
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010 by
+# Copyright 2002-2006, 2008-2010, 2013 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -15,17 +15,25 @@
rm -f config.mk builds/unix/unix-def.mk builds/unix/unix-cc.mk
+# respect GNUMAKE environment variable for backwards compatibility
if test "x$GNUMAKE" = x; then
- GNUMAKE=make
+ if test "x$MAKE" = x; then
+ MAKE=make
+ fi
+else
+ MAKE=$GNUMAKE
fi
-if test -z "`$GNUMAKE -v 2>/dev/null | grep GNU`"; then
- if test -z "`$GNUMAKE -v 2>/dev/null | grep makepp`"; then
+if test -z "`$MAKE -v 2>/dev/null | grep GNU`"; then
+ if test -z "`$MAKE -v 2>/dev/null | grep makepp`"; then
echo "GNU make (>= 3.80) or makepp (>= 1.19) is required to build FreeType2." >&2
echo "Please try" >&2
- echo " \`GNUMAKE=<GNU make command name> $0'." >&2
- echo "or >&2"
- echo " \`GNUMAKE=\"makepp --norc-substitution\" $0'." >&2
+ echo >&2
+ echo " MAKE=<GNU make command name> $0" >&2
+ echo >&2
+ echo "or" >&2
+ echo >&2
+ echo " MAKE=\"makepp --norc-substitution\" $0" >&2
exit 1
fi
fi
@@ -120,6 +128,6 @@ case $# in
esac
done ;;
esac
-CFG=$CFG $GNUMAKE setup unix
+CFG=$CFG $MAKE setup unix
# eof