problem with latest updates

[Henri Gomez]

I applied your patches and now build fail about freetype.

1.7-bsdport-x86_64/workspace/build/bsd-amd64/hotspot/import\n
ALT_HOTSPOT_IMPORT_PATH =
/Users/henri/Documents/jenkins/data/jobs/openjdk-1.7-bsdport-x86_64/workspace/build/bsd-amd64/hotspot/import\n
 HOTSPOT_SERVER_PATH =
/Users/henri/Documents/jenkins/data/jobs/openjdk-1.7-bsdport-x86_64/workspace/build/bsd-amd64/hotspot/import/jre/lib/amd64/server\n
   ALT_HOTSPOT_SERVER_PATH = \n  CACERTS_FILE =
./../src/share/lib/security/cacerts\n    ALT_CACERTS_FILE = \n
CUPS_HEADERS_PATH = /usr/include\n    ALT_CUPS_HEADERS_PATH =
/usr/include\n \nOpenJDK-specific settings:\n  FREETYPE_HEADERS_PATH =
/usr/X11R6/include\n    ALT_FREETYPE_HEADERS_PATH =
/usr/X11R6/include\n  FREETYPE_LIB_PATH = /usr/X11R6/lib\n
ALT_FREETYPE_LIB_PATH = /usr/X11R6/lib\n \nPrevious JDK Settings:\n
PREVIOUS_RELEASE_PATH = USING-PREVIOUS_RELEASE_IMAGE\n
ALT_PREVIOUS_RELEASE_PATH = \n  PREVIOUS_JDK_VERSION = 1.6.0\n
ALT_PREVIOUS_JDK_VERSION = \n  PREVIOUS_JDK_FILE = \n
ALT_PREVIOUS_JDK_FILE = \n  PREVIOUS_JRE_FILE = \n
ALT_PREVIOUS_JRE_FILE = \n  PREVIOUS_RELEASE_IMAGE =
/Library/Java/JavaVirtualMachines/openjdk-1.7-i586/Contents/Home\n
ALT_PREVIOUS_RELEASE_IMAGE = \n

WARNING: This build does not include running javadoc.\n
ERROR: FreeType version  2.3.0  or higher is required. \n Failed to
build freetypecheck.  \n
Exiting because of the above error(s). \n

Still on OS/X 10.6.6 (64bits)


2011/3/8 John Rose <john.r.rose at oracle.com>:
> I had a problem building hotspot from the new sources.
>
> The file bsd_x86_32.s needed some help with a recent change.
>
> Also, the cpp symbol __APPLE__ wasn't visible.
>
> The following patch allows libjvm to be built.
>
> -- John
>
> -------
>        hg dif
> diff --git a/make/bsd/makefiles/vm.make b/make/bsd/makefiles/vm.make
> --- a/make/bsd/makefiles/vm.make
> +++ b/make/bsd/makefiles/vm.make
> @@ -125,6 +125,8 @@
>   LIBJVM   = lib$(JVM).dylib
>   LIBJVM_G = lib$(JVM)$(G_SUFFIX).dylib
>   CFLAGS  += -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE
> +  CFLAGS  += -D__APPLE__
> +  ASFLAGS += -D__APPLE__
>  else
>   LIBJVM   = lib$(JVM).so
>   LIBJVM_G = lib$(JVM)$(G_SUFFIX).so
> diff --git a/src/os_cpu/bsd_x86/vm/bsd_x86_32.s b/src/os_cpu/bsd_x86/vm/bsd_x86_32.s
> --- a/src/os_cpu/bsd_x86/vm/bsd_x86_32.s
> +++ b/src/os_cpu/bsd_x86/vm/bsd_x86_32.s
> @@ -689,8 +689,8 @@
>         # Support for jlong Atomic::load and Atomic::store.
>         # void _Atomic_move_long(volatile jlong* src, volatile jlong* dst)
>         .p2align 4,,15
> -       .type    _Atomic_move_long, at function
> -_Atomic_move_long:
> +       ELF_TYPE(_Atomic_move_long, at function)
> +SYMBOL(_Atomic_move_long):
>         movl     4(%esp), %eax   # src
>         fildll    (%eax)
>         movl     8(%esp), %eax   # dest
> --------
>
>