summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-01-02 08:40:42 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-01-02 08:40:42 +0000
commit120aa6671f32d669b6b002d2a1537b9bbe2356fb (patch)
treed2498f46998c45d50dc6d49aae2e12dbcaaaf416 /Build/source
parentd7791fc34f9ba4d3a601731e5b0fe7e683705d72 (diff)
freetype2: Build fix for AIX 4.3
git-svn-id: svn://tug.org/texlive/trunk@28693 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/libs/freetype2/freetype-2.4.11-PATCHES/ChangeLog5
-rw-r--r--Build/source/libs/freetype2/freetype-2.4.11-PATCHES/patch-01-CONFIG_SHELL33
-rw-r--r--Build/source/libs/freetype2/freetype-2.4.11/builds/unix/detect.mk5
-rw-r--r--Build/source/libs/freetype2/freetype-2.4.11/builds/unix/unix-def.in1
4 files changed, 42 insertions, 2 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 d5e62c7daa3..39e112d1241 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,8 @@
+2013-01-02 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-01-CONFIG_SHELL (new): Build fix for ancient systems
+ (e.g., AIX 4.3.3) with insuffient /bin/sh.
+
2012-12-31 Peter Breitenlohner <peb@mppmu.mpg.de>
Imported freetype-2.4.11 source tree from:
diff --git a/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/patch-01-CONFIG_SHELL b/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/patch-01-CONFIG_SHELL
new file mode 100644
index 00000000000..edba4e8d422
--- /dev/null
+++ b/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/patch-01-CONFIG_SHELL
@@ -0,0 +1,33 @@
+ Respect CONFIG_SHELL from the environment
+
+diff -ur -x config.guess -x config.sub -x install-sh freetype-2.4.11.orig/builds/unix/detect.mk freetype-2.4.11/builds/unix/detect.mk
+--- freetype-2.4.11.orig/builds/unix/detect.mk 2011-11-30 16:30:49.000000000 +0100
++++ freetype-2.4.11/builds/unix/detect.mk 2013-01-02 08:48:02.000000000 +0100
+@@ -76,13 +76,14 @@
+
+ have_Makefile := $(wildcard $(OBJ_DIR)/Makefile)
+
++ CONFIG_SHELL ?= /bin/sh
+ setup: std_setup
+ ifdef must_configure
+ ifneq ($(have_Makefile),)
+ # we are building FT2 not in the src tree
+- $(TOP_DIR)/builds/unix/configure $(value CFG)
++ $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG)
+ else
+- cd builds/unix; ./configure $(value CFG)
++ cd builds/unix; $(CONFIG_SHELL) ./configure $(value CFG)
+ endif
+ endif
+
+diff -ur -x config.guess -x config.sub -x install-sh freetype-2.4.11.orig/builds/unix/unix-def.in freetype-2.4.11/builds/unix/unix-def.in
+--- freetype-2.4.11.orig/builds/unix/unix-def.in 2012-09-30 08:42:17.000000000 +0200
++++ freetype-2.4.11/builds/unix/unix-def.in 2013-01-01 16:35:19.000000000 +0100
+@@ -12,6 +12,7 @@
+ # indicate that you have read the license and understand and accept it
+ # fully.
+
++SHELL := @SHELL@
+
+ TOP_DIR := $(shell cd $(TOP_DIR); pwd)
+
diff --git a/Build/source/libs/freetype2/freetype-2.4.11/builds/unix/detect.mk b/Build/source/libs/freetype2/freetype-2.4.11/builds/unix/detect.mk
index b2ae4f42bce..89718bda2e7 100644
--- a/Build/source/libs/freetype2/freetype-2.4.11/builds/unix/detect.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.11/builds/unix/detect.mk
@@ -76,13 +76,14 @@ ifeq ($(PLATFORM),unix)
have_Makefile := $(wildcard $(OBJ_DIR)/Makefile)
+ CONFIG_SHELL ?= /bin/sh
setup: std_setup
ifdef must_configure
ifneq ($(have_Makefile),)
# we are building FT2 not in the src tree
- $(TOP_DIR)/builds/unix/configure $(value CFG)
+ $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG)
else
- cd builds/unix; ./configure $(value CFG)
+ cd builds/unix; $(CONFIG_SHELL) ./configure $(value CFG)
endif
endif
diff --git a/Build/source/libs/freetype2/freetype-2.4.11/builds/unix/unix-def.in b/Build/source/libs/freetype2/freetype-2.4.11/builds/unix/unix-def.in
index d3ebc8b2654..761c322b917 100644
--- a/Build/source/libs/freetype2/freetype-2.4.11/builds/unix/unix-def.in
+++ b/Build/source/libs/freetype2/freetype-2.4.11/builds/unix/unix-def.in
@@ -12,6 +12,7 @@
# indicate that you have read the license and understand and accept it
# fully.
+SHELL := @SHELL@
TOP_DIR := $(shell cd $(TOP_DIR); pwd)