Mercurial > hg > release > icedtea7-forest-2.3 > jdk
changeset 6320:3297163636bf
PR1554: Fix build on Mac OS X
Contributed-by: Alex Kasko <alex.kasko.lists@gmail.com>
| author | andrew |
|---|---|
| date | Wed, 04 Sep 2013 18:20:38 +0100 |
| parents | b3846cc85e15 |
| children | 5bbb4c34cc3a |
| files | make/java/nio/Makefile make/sun/lwawt/FILES_c_macosx.gmk make/sun/lwawt/Makefile |
| diffstat | 3 files changed, 17 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/make/java/nio/Makefile Wed Sep 04 17:53:23 2013 +0100 +++ b/make/java/nio/Makefile Wed Sep 04 18:20:38 2013 +0100 @@ -167,6 +167,11 @@ FILES_gen += \ sun/nio/fs/UnixConstants.java +ifndef COMPILE_AGAINST_SYSCALLS +FILES_c += \ + syscalls_fp.c +endif + endif ifeq ($(PLATFORM), solaris) @@ -234,11 +239,6 @@ gio_fp.c endif -ifndef COMPILE_AGAINST_SYSCALLS -FILES_c += \ - syscalls_fp.c -endif - endif # PLATFORM = linux ifeq ($(PLATFORM), macosx)
--- a/make/sun/lwawt/FILES_c_macosx.gmk Wed Sep 04 17:53:23 2013 +0100 +++ b/make/sun/lwawt/FILES_c_macosx.gmk Wed Sep 04 18:20:38 2013 +0100 @@ -98,3 +98,9 @@ AccelGlyphCache.c \ CUPSfuncs.c + +ifndef USE_SYSTEM_CUPS +FILES_c += \ + cups_fp.c +endif +
--- a/make/sun/lwawt/Makefile Wed Sep 04 17:53:23 2013 +0100 +++ b/make/sun/lwawt/Makefile Wed Sep 04 18:20:38 2013 +0100 @@ -63,6 +63,10 @@ vpath %.c $(SHARE_SRC)/native/sun/font vpath %.c $(call NativeSrcDirList,,native/sun/awt) +ifndef USE_SYSTEM_CUPS +vpath %.c $(PLATFORM_SRC)/native/common/deps +endif + vpath %.cpp $(SHARE_SRC)/native/sun/image vpath %.m $(call NativeSrcDirList,,native/sun/awt) @@ -103,7 +107,8 @@ $(call NativeSrcDirList,-I,/native/sun/osxapp) \ $(call NativeSrcDirList,-I,/native/sun/font) \ $(call NativeSrcDirList,-I,/native/sun/java2d) \ - $(call NativeSrcDirList,-I,/native/sun/java2d/opengl) + $(call NativeSrcDirList,-I,/native/sun/java2d/opengl) \ + $(call NativeSrcDirList,-I,/native/common/deps) ifeq ($(MILESTONE), internal) CPPFLAGS += -DINTERNAL_BUILD