diff options
| author | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2011-11-30 23:25:38 +0900 |
|---|---|---|
| committer | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2011-11-30 23:25:38 +0900 |
| commit | 2968bd60984742c11f98ebf9ffc728793fcbf242 (patch) | |
| tree | 9e24f633f973a13a75e9b765c07f2a59fb8ce89b | |
| parent | eba2781ab98282714c19df4c758a140dc0cc33ad (diff) | |
| download | freetype2-2968bd60984742c11f98ebf9ffc728793fcbf242.tar.gz | |
Fix Savannah bug #34728 (`make devel' on Mac OS X).
* builds/toplevel.mk: Check `/dev/null' to identify the Unix-
like systems without `init' nor `hurd' (e.g. Mac OS X >= 10.4).
* builds/unix/detect.mk: Ditto.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | builds/toplevel.mk | 1 | ||||
| -rw-r--r-- | builds/unix/detect.mk | 1 |
3 files changed, 10 insertions, 0 deletions
@@ -1,5 +1,13 @@ 2011-11-30 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> + Fix Savannah bug #34728 (`make devel' on Mac OS X). + + * builds/toplevel.mk: Check `/dev/null' to identify the Unix- + like systems without `init' nor `hurd' (e.g. Mac OS X >= 10.4). + * builds/unix/detect.mk: Ditto. + +2011-11-30 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> + [apinames] Fix the overflow of signed integer hash. * src/tools/apinames.c (names_add): Change the type of `h' from diff --git a/builds/toplevel.mk b/builds/toplevel.mk index d552a4a17..18bcef2c4 100644 --- a/builds/toplevel.mk +++ b/builds/toplevel.mk @@ -122,6 +122,7 @@ ifdef check_platform # is_unix := $(strip $(wildcard /sbin/init) \ $(wildcard /usr/sbin/init) \ + $(wildcard /dev/null) \ $(wildcard /hurd/auth)) ifneq ($(is_unix),) diff --git a/builds/unix/detect.mk b/builds/unix/detect.mk index e74af5730..b2ae4f42b 100644 --- a/builds/unix/detect.mk +++ b/builds/unix/detect.mk @@ -20,6 +20,7 @@ ifeq ($(PLATFORM),ansi) # is_unix := $(strip $(wildcard /sbin/init) \ $(wildcard /usr/sbin/init) \ + $(wildcard /dev/null) \ $(wildcard /hurd/auth)) ifneq ($(is_unix),) |