summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsuzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>2016-07-07 18:55:37 +0900
committersuzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>2016-07-07 18:55:37 +0900
commit783cbcd67dee48e431cea376e16d350dcbfcb317 (patch)
tree761a0efd27e563b98d022ec754b58a0db61fb75d
parent474682ff8777923dde4d0a64aed49c3b4c1bdef9 (diff)
downloadfreetype2-783cbcd67dee48e431cea376e16d350dcbfcb317.tar.gz
[mac] Fix Savannah bug #48417.
Mac OS X linker throws errors when `-exported_symbol_list' input file includes non-existing symbols. Reported by Ryan Schmidt. * builds/exports.mk: Exclude ftmac.h from the headers for apinames by default. Include it when ftmac.c would be compiled.
-rw-r--r--ChangeLog10
-rw-r--r--builds/exports.mk6
2 files changed, 15 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7761f37bb..8cf5015be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2016-07-07 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
+ [mac] Fix Savannah bug #48417.
+
+ Mac OS X linker throws errors when `-exported_symbol_list' input
+ file includes non-existing symbols. Reported by Ryan Schmidt.
+
+ * builds/exports.mk: Exclude ftmac.h from the headers for apinames
+ by default. Include it when ftmac.c would be compiled.
+
2016-07-06 Werner Lemberg <wl@gnu.org>
* src/truetype/ttinterp.c (TInstruction_Function): Removed, unused.
diff --git a/builds/exports.mk b/builds/exports.mk
index 9685f1f49..d5a508571 100644
--- a/builds/exports.mk
+++ b/builds/exports.mk
@@ -40,7 +40,11 @@ ifneq ($(EXPORTS_LIST),)
endif
# The list of public headers we're going to parse.
- PUBLIC_HEADERS := $(wildcard $(PUBLIC_DIR)/*.h)
+ PUBLIC_HEADERS := $(filter-out $(PUBLIC_DIR)/ftmac.h, \
+ $(wildcard $(PUBLIC_DIR)/*.h))
+ ifneq ($(ftmac_c),)
+ PUBLIC_HEADERS += $(PUBLIC_DIR)/ftmac.h
+ endif
# The `apinames' source and executable. We use $E_BUILD as the host
# executable suffix, which *includes* the final dot.