1.1 --- a/common/autoconf/spec.gmk.in Thu Sep 12 12:29:17 2013 -0700
1.2 +++ b/common/autoconf/spec.gmk.in Tue Nov 05 17:33:48 2013 -0800
1.3 @@ -30,8 +30,8 @@
1.4 # (called @OPENJDK_BUILD_AUTOCONF_NAME@ by autoconf)
1.5 # using 'configure @CONFIGURE_COMMAND_LINE@'
1.6
1.7 -# When calling macros, the spaces between arguments are
1.8 -# often semantically important! Sometimes we need to subst
1.9 +# When calling macros, the spaces between arguments are
1.10 +# often semantically important! Sometimes we need to subst
1.11 # spaces and commas, therefore we need the following macros.
1.12 X:=
1.13 SPACE:=$(X) $(X)
1.14 @@ -56,17 +56,17 @@
1.15
1.16 # Pass along the verbosity and log level settings.
1.17 ifeq (,$(findstring VERBOSE=,$(MAKE)))
1.18 - MAKE:=$(MAKE) $(VERBOSE) VERBOSE="$(VERBOSE)" LOG_LEVEL="$(LOG_LEVEL)"
1.19 + MAKE:=$(MAKE) $(VERBOSE) VERBOSE="$(VERBOSE)" LOG_LEVEL="$(LOG_LEVEL)"
1.20 endif
1.21
1.22 # No implicit variables or rules!
1.23 ifeq (,$(findstring -R,$(MAKE)))
1.24 - MAKE:=$(MAKE) -R
1.25 + MAKE:=$(MAKE) -R
1.26 endif
1.27
1.28 # Specify where the common include directory for makefiles is.
1.29 ifeq (,$(findstring -I @SRC_ROOT@/common/makefiles,$(MAKE)))
1.30 - MAKE:=$(MAKE) -I @SRC_ROOT@/common/makefiles
1.31 + MAKE:=$(MAKE) -I @SRC_ROOT@/common/makefiles
1.32 endif
1.33
1.34 # The "human readable" name of this configuration
1.35 @@ -92,6 +92,7 @@
1.36 OPENJDK_TARGET_CPU_OSARCH:=@OPENJDK_TARGET_CPU_OSARCH@
1.37 OPENJDK_TARGET_CPU_JLI_CFLAGS:=@OPENJDK_TARGET_CPU_JLI_CFLAGS@
1.38 OPENJDK_TARGET_OS_API_DIR:=@OPENJDK_TARGET_OS_API_DIR@
1.39 +OPENJDK_TARGET_OS_EXPORT_DIR:=@OPENJDK_TARGET_OS_EXPORT_DIR@
1.40
1.41 # We are building on this build system.
1.42 # When not cross-compiling, it is the same as the target.
1.43 @@ -161,6 +162,7 @@
1.44 COMPANY_NAME:=@COMPANY_NAME@
1.45 MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@
1.46 MACOSX_BUNDLE_ID_BASE=@MACOSX_BUNDLE_ID_BASE@
1.47 +USER_RELEASE_SUFFIX=@USER_RELEASE_SUFFIX@
1.48
1.49 # Different version strings generated from the above information.
1.50 JDK_VERSION:=@JDK_VERSION@
1.51 @@ -173,8 +175,8 @@
1.52 else
1.53 RELEASE=$(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE)
1.54 endif
1.55 -ifeq ($(JDK_BUILD_NUMBER),b00)
1.56 - USER_RELEASE_SUFFIX=@USER_RELEASE_SUFFIX@
1.57 +
1.58 +ifneq ($(USER_RELEASE_SUFFIX), )
1.59 FULL_VERSION=$(RELEASE)-$(USER_RELEASE_SUFFIX)-$(JDK_BUILD_NUMBER)
1.60 else
1.61 FULL_VERSION=$(RELEASE)-$(JDK_BUILD_NUMBER)
1.62 @@ -268,13 +270,9 @@
1.63 # Number of parallel jobs to use for compilation
1.64 JOBS?=@JOBS@
1.65
1.66 -# The OpenJDK makefiles should be changed to using the standard
1.67 -# configure output ..._CFLAGS and ..._LIBS. In the meantime we
1.68 -# extract the information here.
1.69 -FREETYPE2_LIB_PATH:=@FREETYPE2_LIB_PATH@
1.70 -FREETYPE2_LIBS:=@FREETYPE2_LIBS@
1.71 -FREETYPE2_CFLAGS:=@FREETYPE2_CFLAGS@
1.72 -USING_SYSTEM_FT_LIB=@USING_SYSTEM_FT_LIB@
1.73 +FREETYPE_LIBS:=@FREETYPE_LIBS@
1.74 +FREETYPE_CFLAGS:=@FREETYPE_CFLAGS@
1.75 +FREETYPE_BUNDLE_LIB_PATH=@FREETYPE_BUNDLE_LIB_PATH@
1.76 CUPS_CFLAGS:=@CUPS_CFLAGS@
1.77 ALSA_LIBS:=@ALSA_LIBS@
1.78 ALSA_CFLAGS:=@ALSA_CFLAGS@
1.79 @@ -287,15 +285,11 @@
1.80 # Enable unlimited crypto policy
1.81 UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@
1.82
1.83 -# Necessary additional compiler flags to compile X11
1.84 +# Necessary additional compiler flags to compile X11
1.85 X_CFLAGS:=@X_CFLAGS@
1.86 X_LIBS:=@X_LIBS@
1.87 OPENWIN_HOME:=@OPENWIN_HOME@
1.88
1.89 -# DirectX SDK
1.90 -DXSDK_LIB_PATH=@DXSDK_LIB_PATH@
1.91 -DXSDK_INCLUDE_PATH=@DXSDK_INCLUDE_PATH@
1.92 -
1.93 # The lowest required version of macosx to enforce compatiblity for
1.94 MACOSX_VERSION_MIN=@MACOSX_VERSION_MIN@
1.95
1.96 @@ -399,7 +393,7 @@
1.97 # Command to create a shared library
1.98 SHARED_LIBRARY_FLAGS:=@SHARED_LIBRARY_FLAGS@
1.99
1.100 -# Options to linker to specify a mapfile.
1.101 +# Options to linker to specify a mapfile.
1.102 # (Note absence of := assignment, because we do not want to evaluate the macro body here)
1.103 SET_SHARED_LIBRARY_MAPFILE=@SET_SHARED_LIBRARY_MAPFILE@
1.104
1.105 @@ -472,7 +466,7 @@
1.106 # Guarding this against resetting value. Legacy make files include spec multiple
1.107 # times.
1.108 ifndef RC_FLAGS
1.109 -RC_FLAGS:=@RC_FLAGS@
1.110 + RC_FLAGS:=@RC_FLAGS@
1.111 endif
1.112
1.113 # A specific java binary with specific options can be used to run
1.114 @@ -496,6 +490,7 @@
1.115 DATE:=@DATE@
1.116 DIFF:=@DIFF@
1.117 DIRNAME:=@DIRNAME@
1.118 +DSYMUTIL:=@DSYMUTIL@
1.119 FIND:=@FIND@
1.120 FIND_DELETE:=@FIND_DELETE@
1.121 ECHO:=@ECHO@
1.122 @@ -552,9 +547,9 @@
1.123 # we have solved how to prevent the log wrapper to wait
1.124 # for the background sjavac server process.
1.125 ifeq (@ENABLE_SJAVAC@X@OPENJDK_BUILD_OS_API@,yesXwinapi)
1.126 - BUILD_LOG_WRAPPER:=
1.127 + BUILD_LOG_WRAPPER:=
1.128 else
1.129 - BUILD_LOG_WRAPPER:=@BUILD_LOG_WRAPPER@
1.130 + BUILD_LOG_WRAPPER:=@BUILD_LOG_WRAPPER@
1.131 endif
1.132
1.133 # Build setup
1.134 @@ -574,12 +569,12 @@
1.135 # of the next macro to get rid of superfluous files.
1.136 ADD_SRCS=$1
1.137 ifneq (,$(ADD_SRC_ROOT))
1.138 - # Append wildcard rule to pickup any matching source roots found below ADD_SRC_ROOT
1.139 - ADD_SRCS+=$(wildcard $(subst $(SRC_ROOT),$(ADD_SRC_ROOT),$1))
1.140 + # Append wildcard rule to pickup any matching source roots found below ADD_SRC_ROOT
1.141 + ADD_SRCS+=$(wildcard $(subst $(SRC_ROOT),$(ADD_SRC_ROOT),$1))
1.142 endif
1.143 ifneq (,$(OVERRIDE_SRC_ROOT))
1.144 - # Append wildcard rule to pickup any matching source roots found below OVERRIDE_SRC_ROOT
1.145 - ADD_SRCS+=$(wildcard $(subst $(SRC_ROOT),$(OVERRIDE_SRC_ROOT),$1))
1.146 + # Append wildcard rule to pickup any matching source roots found below OVERRIDE_SRC_ROOT
1.147 + ADD_SRCS+=$(wildcard $(subst $(SRC_ROOT),$(OVERRIDE_SRC_ROOT),$1))
1.148 endif
1.149
1.150 # OVR_SRCS creates a filter expression to filter out sources in
1.151 @@ -589,9 +584,9 @@
1.152 # We cannot do the scan in configure, since that would force us to rerun configure when
1.153 # we add overridden sources.
1.154 ifneq (,$(OVERRIDE_SRC_ROOT))
1.155 - OVR_SRCS:=$(addsuffix %,$(subst $(OVERRIDE_SRC_ROOT),$(SRC_ROOT),$(sort $(dir $(shell $(FIND) $(OVERRIDE_SRC_ROOT) -type f)))))
1.156 + OVR_SRCS:=$(addsuffix %,$(subst $(OVERRIDE_SRC_ROOT),$(SRC_ROOT),$(sort $(dir $(shell $(FIND) $(OVERRIDE_SRC_ROOT) -type f)))))
1.157 else
1.158 - OVR_SRCS:=
1.159 + OVR_SRCS:=
1.160 endif
1.161
1.162 ####################################################
1.163 @@ -600,7 +595,7 @@
1.164 #
1.165
1.166 # Common prefix for all installed files. Defaults to /usr/local,
1.167 -# but /opt/myjdk is another common version.
1.168 +# but /opt/myjdk is another common version.
1.169 INSTALL_PREFIX=@prefix@
1.170
1.171 # Directories containing architecture-dependent files should be relative to exec_prefix
1.172 @@ -630,7 +625,7 @@
1.173 # Executables that other programs run.
1.174 INSTALL_LIBEXECDIR=@libexecdir@
1.175
1.176 -# Locale-dependent but architecture-independent data, such as message catalogs.
1.177 +# Locale-dependent but architecture-independent data, such as message catalogs.
1.178 INSTALL_LOCALEDIR=@localedir@
1.179
1.180 # Modifiable single-machine data
