changeset in /hg/icedtea6: 2009-05-25 Xerxes R?nby <xerxes at zaf...
Lillian Angel
langel at redhat.com
Mon May 25 05:03:07 PDT 2009
Xerxes Rånby wrote:
>
> Hi,
>
> Ok to apply this to the icedtea6-1.5 branch?
We are just at the end of our testing, as I am sure a lot of people are.
Mind if we leave this out? Unless it is crucial to get in.
Thanks,
Lillian
>
> Xerxes
>
> Xerxes R?nby skrev:
>> changeset 4501bcea5ffd in /hg/icedtea6
>> details:
>> http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4501bcea5ffd
>> description:
>> 2009-05-25 Xerxes R?nby <xerxes at zafena.se>
>>
>> * acinclude.m4: Fix: Renamed TARGET_ARCH to CROSS_TARGET_ARCH
>> to prevent unintended use by make builtin LINK.c rule.
>> * Makefile.am: Likewise.
>> * patches/icedtea-explicit-target-arch.patch: Likewise.
>>
>> diffstat:
>>
>> 4 files changed, 24 insertions(+), 17 deletions(-)
>> ChangeLog | 7 +++++++
>> Makefile.am | 4 ++--
>> acinclude.m4 | 24
>> ++++++++++++------------
>> patches/icedtea-explicit-target-arch.patch | 6 +++---
>>
>> diffs (158 lines):
>>
>> diff -r fd613af504b2 -r 4501bcea5ffd ChangeLog
>> --- a/ChangeLog Fri May 22 10:13:16 2009 -0400
>> +++ b/ChangeLog Mon May 25 12:40:45 2009 +0200
>> @@ -1,3 +1,10 @@ 2009-05-22 Omair Majid <omajid at redhat.
>> +2009-05-25 Xerxes Rånby <xerxes at zafena.se>
>> +
>> + * acinclude.m4: Fix: Renamed TARGET_ARCH to CROSS_TARGET_ARCH
>> + to prevent unintended use by make builtin LINK.c rule.
>> + * Makefile.am: Likewise.
>> + * patches/icedtea-explicit-target-arch.patch: Likewise.
>> +
>> 2009-05-22 Omair Majid <omajid at redhat.com>
>>
>> * rt/net/sourceforge/jnlp/JNLPFile.java (parse): Fix comment to
>> reflect diff -r fd613af504b2 -r 4501bcea5ffd Makefile.am
>> --- a/Makefile.am Fri May 22 10:13:16 2009 -0400
>> +++ b/Makefile.am Mon May 25 12:40:45 2009 +0200
>> @@ -202,7 +202,7 @@ if ENABLE_CROSS_COMPILATION
>> if ENABLE_CROSS_COMPILATION
>> ICEDTEA_ENV += \
>> CROSS_COMPILATION="true" \
>> - TARGET_ARCH="$(TARGET_ARCH)"
>> + CROSS_TARGET_ARCH="$(CROSS_TARGET_ARCH)"
>> endif
>>
>> if USE_ALT_JAR
>> @@ -285,7 +285,7 @@ if ENABLE_CROSS_COMPILATION
>> if ENABLE_CROSS_COMPILATION
>> ICEDTEA_ENV_ECJ += \
>> CROSS_COMPILATION="true" \
>> - TARGET_ARCH="$(TARGET_ARCH)"
>> + CROSS_TARGET_ARCH="$(CROSS_TARGET_ARCH)"
>> endif
>>
>> env-ecj:
>> diff -r fd613af504b2 -r 4501bcea5ffd acinclude.m4
>> --- a/acinclude.m4 Fri May 22 10:13:16 2009 -0400
>> +++ b/acinclude.m4 Mon May 25 12:40:45 2009 +0200
>> @@ -5,77 +5,77 @@ AC_DEFUN([SET_ARCH_DIRS],
>> BUILD_ARCH_DIR=amd64
>> INSTALL_ARCH_DIR=amd64
>> JRE_ARCH_DIR=amd64
>> - TARGET_ARCH=x86_64
>> + CROSS_TARGET_ARCH=x86_64
>> ;;
>> i?86-*-*)
>> BUILD_ARCH_DIR=i586
>> INSTALL_ARCH_DIR=i386
>> JRE_ARCH_DIR=i386
>> ARCH_PREFIX=${LINUX32}
>> - TARGET_ARCH=i386
>> + CROSS_TARGET_ARCH=i386
>> ;;
>> alpha*-*-*)
>> BUILD_ARCH_DIR=alpha
>> INSTALL_ARCH_DIR=alpha
>> JRE_ARCH_DIR=alpha
>> - TARGET_ARCH=alpha
>> + CROSS_TARGET_ARCH=alpha
>> ;;
>> arm*-*-*)
>> BUILD_ARCH_DIR=arm
>> INSTALL_ARCH_DIR=arm
>> JRE_ARCH_DIR=arm
>> - TARGET_ARCH=arm
>> + CROSS_TARGET_ARCH=arm
>> ;;
>> mips-*-*)
>> BUILD_ARCH_DIR=mips
>> INSTALL_ARCH_DIR=mips
>> JRE_ARCH_DIR=mips
>> - TARGET_ARCH=mips
>> + CROSS_TARGET_ARCH=mips
>> ;;
>> mipsel-*-*)
>> BUILD_ARCH_DIR=mipsel
>> INSTALL_ARCH_DIR=mipsel
>> JRE_ARCH_DIR=mipsel
>> - TARGET_ARCH=mipsel
>> + CROSS_TARGET_ARCH=mipsel
>> ;;
>> powerpc-*-*)
>> BUILD_ARCH_DIR=ppc
>> INSTALL_ARCH_DIR=ppc
>> JRE_ARCH_DIR=ppc
>> ARCH_PREFIX=${LINUX32}
>> - TARGET_ARCH=ppc
>> + CROSS_TARGET_ARCH=ppc
>> ;;
>> powerpc64-*-*)
>> BUILD_ARCH_DIR=ppc64
>> INSTALL_ARCH_DIR=ppc64
>> JRE_ARCH_DIR=ppc64
>> - TARGET_ARCH=ppc64
>> + CROSS_TARGET_ARCH=ppc64
>> ;;
>> sparc64-*-*)
>> BUILD_ARCH_DIR=sparcv9
>> INSTALL_ARCH_DIR=sparcv9
>> JRE_ARCH_DIR=sparc64
>> - TARGET_ARCH=sparc64
>> + CROSS_TARGET_ARCH=sparc64
>> ;;
>> s390-*-*)
>> BUILD_ARCH_DIR=s390
>> INSTALL_ARCH_DIR=s390
>> JRE_ARCH_DIR=s390
>> ARCH_PREFIX=${LINUX32}
>> - TARGET_ARCH=s390
>> + CROSS_TARGET_ARCH=s390
>> ;;
>> *)
>> BUILD_ARCH_DIR=`uname -m`
>> INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
>> JRE_ARCH_DIR=$INSTALL_ARCH_DIR
>> - TARGET_ARCH=$BUILD_ARCH_DIR
>> + CROSS_TARGET_ARCH=$BUILD_ARCH_DIR
>> ;;
>> esac
>> AC_SUBST(BUILD_ARCH_DIR)
>> AC_SUBST(INSTALL_ARCH_DIR)
>> AC_SUBST(JRE_ARCH_DIR)
>> AC_SUBST(ARCH_PREFIX)
>> - AC_SUBST(TARGET_ARCH)
>> + AC_SUBST(CROSS_TARGET_ARCH)
>> ])
>>
>> AC_DEFUN([SET_OS_DIRS],
>> diff -r fd613af504b2 -r 4501bcea5ffd
>> patches/icedtea-explicit-target-arch.patch
>> --- a/patches/icedtea-explicit-target-arch.patch Fri May 22
>> 10:13:16 2009 -0400
>> +++ b/patches/icedtea-explicit-target-arch.patch Mon May 25
>> 12:40:45 2009 +0200
>> @@ -16,7 +16,7 @@ Index: openjdk/hotspot/make/linux/makefi
>> +ifndef CROSS_COMPILATION
>> + ARCH:=$(shell uname -m)
>> +else
>> -+ ARCH:=$(TARGET_ARCH)
>> ++ ARCH:=$(CROSS_TARGET_ARCH)
>> +endif
>> PATH_SEP = :
>> ifeq ($(LP64), 1)
>> @@ -38,7 +38,7 @@ Index: openjdk/jdk/make/common/shared/Pl
>> + mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU
>> 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/')
>> + endif
>> + else
>> -+ mach := $(TARGET_ARCH)
>> ++ mach := $(CROSS_TARGET_ARCH)
>> endif
>> archExpr = case "$(mach)" in \
>> i[3-9]86) \
>> @@ -62,7 +62,7 @@ Index: openjdk/corba/make/common/shared/
>> + endif
>> + else
>> + # Cross-compilation: Assume target archicture is given.
>> -+ mach := $(TARGET_ARCH)
>> ++ mach := $(CROSS_TARGET_ARCH)
>> endif
>> archExpr = case "$(mach)" in \
>> i[3-9]86) \
>>
>
More information about the distro-pkg-dev
mailing list