[patch] build with versioned compiler

[Andrew John Hughes]

On 18/01/2008, Matthias Klose <doko at ubuntu.com> wrote:
> Two updates:
>
>  - allow openjdk/corba build with a versioned compiler (e.g. gcc-4.3)
>
>  - fix build failure when gcc version != gcj version, and the libgcj.so
>    installed in gcc_lib_dir cannot be found (debian and ubuntu do install
>    an extra symlink in /usr/lib/jvm/java-gcj/lib for that reason).
>
> Matthias
>
> patches/icedtea-gcc-suffix.patch
>
>         * patches/icedtea-ecj.patch: Add library dir to find libgcj.
>
> diff -r 23b096c586ef patches/icedtea-ecj.patch
> --- a/patches/icedtea-ecj.patch Mon Jan 14 00:41:35 2008 -0500
> +++ b/patches/icedtea-ecj.patch Fri Jan 18 13:01:35 2008 +0100
> @@ -271,7 +271,7 @@
>   endif
>   JVMLIB          = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
>  -JAVALIB         = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
> -+JAVALIB         = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -lgcj $(JVMLIB)
> ++JAVALIB         = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -L/usr/lib/jvm/java-gcj/lib -lgcj $(JVMLIB)
>

Is it really necessary to hardcode this path? I doubt it exists
everywhere, especially if gcj is not in that prefix.

>   #
>   # We want to privatize JVM symbols on Solaris. This is so the user can
>
> 2008-01-10  Matthias Klose <doko at ubuntu.com>
>
>         * patches/icedtea-gcc-suffix.patch: Allow openjdk/corba build
>         with a versioned compiler.
>
> diff -r 23b096c586ef patches/icedtea-gcc-suffix.patch
> --- a/patches/icedtea-gcc-suffix.patch  Mon Jan 14 00:41:35 2008 -0500
> +++ b/patches/icedtea-gcc-suffix.patch  Fri Jan 18 13:01:35 2008 +0100
> @@ -46,3 +46,27 @@
>     endif
>     ifneq ("$(findstring sparc,$(ARCH))", "")
>       # sparc or sparcv9
> +--- openjdk/corba/make/common/shared/Compiler-gcc.gmk~ 2008-01-14 14:05:43.738465508 +0100
> ++++ openjdk/corba/make/common/shared/Compiler-gcc.gmk  2008-01-14 14:19:33.640984398 +0100
> +@@ -58,17 +58,17 @@
> + ifeq ($(PLATFORM), linux)
> +
> +   # Settings specific to Linux
> +-  CC             = $(COMPILER_PATH)gcc
> +-  CPP            = $(COMPILER_PATH)gcc -E
> ++  CC             = $(COMPILER_PATH)gcc$(GCC_SUFFIX)
> ++  CPP            = $(COMPILER_PATH)gcc$(GCC_SUFFIX) -E
> +   # statically link libstdc++ before C++ ABI is stablized on Linux
> +   STATIC_CXX     = true
> +   ifeq ($(STATIC_CXX),true)
> +     # g++ always dynamically links libstdc++, even we use "-Wl,-Bstatic -lstdc++"
> +     # We need to use gcc to statically link the C++ runtime. gcc and g++ use
> +     # the same subprocess to compile C++ files, so it is OK to build using gcc.
> +-    CXX            = $(COMPILER_PATH)gcc
> ++    CXX            = $(COMPILER_PATH)gcc$(GCC_SUFFIX)
> +   else
> +-    CXX            = $(COMPILER_PATH)g++
> ++    CXX            = $(COMPILER_PATH)g++$(GCC_SUFFIX)
> +   endif
> +   ifneq ("$(findstring sparc,$(ARCH))", "")
> +     # sparc or sparcv9
>
>
The format of this patch seems a little odd with + on every line...

Cheers,
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net