JDK 7 linux/solaris build failures

[Tim Bell]

Kelly O'Hair wrote:
> I think this is the fix... it is taking some time to completely
> verify it.
> 
> Can someone review this change?

See below

> And do I have approval to push directly into master?
> 
> -------
> 
> diff --git a/make/java/redist/Makefile b/make/java/redist/Makefile
> --- a/make/java/redist/Makefile
> +++ b/make/java/redist/Makefile
> @@ -216,7 +216,7 @@ endif # PLATFORM
>   $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVM_NAME): $(HOTSPOT_KERNEL_PATH)/$(JVM_NAME)
>          $(install-file)
> 
> -$(LIB_LOCATION)/$(LIBJSIG_NAME): $(HOTSPOT_SERVER_PATH)/$(LIBJSIG_NAME)
> +$(LIB_LOCATION)/$(LIBJSIG_NAME): $(HOTSPOT_IMPORT_PATH)/jre/lib/$(LIBARCH)/$(LIBJSIG_NAME)
>          $(install-import-file)

How about:

-$(LIB_LOCATION)/$(LIBJSIG_NAME): $(HOTSPOT_SERVER_PATH)/$(LIBJSIG_NAME)
---
+$(LIB_LOCATION)/$(LIBJSIG_NAME): $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_NAME)


This got me past the problem in my test build.  I am re-running a full build from
scratch now.

Either way you go, feel free to use me as a reviewer.

Tim


>   $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME) \
> 
> 
> -------
> 
> A little background, for the record (while I wait for this build to
> finish ):
> 
> The files exported by the hotspot makefiles for import to the jdk
> come in the shape of a sparse jdk install image, and the jdk Makefile
> jdk/make/java/redist/Makefile is responsible for copying or importing
> these files from this hotspot exported area, into the final jdk image.
> This hotspot area is specified via the
>     ALT_HOTSPOT_{IMPORT,SERVER,CLIENT}_PATH
> variables, or could be the ALT_JDK_IMPORT_PATH setting for partial builds.
> 
> If the hotspot team changes what it exports, this jdk makefile may need
> to change, and if the hotspot team wants to impact the shape or layout
> of the final jdk image with regards to their files, they need to address
> this in the jdk/make/java/redist/Makefile.
> 
> -kto