------------------------------------------------------------
revno: 664
committer: Matthias Klose <d...@ubuntu.com>
branch nick: openjdk8
timestamp: Tue 2015-12-15 08:48:54 +0100
message:
openjdk-8 (8u72-b05-4) unstable; urgency=medium
* openjdk-8-jdk: Fix typo in sdk provides. Addresses: #803150.
* Fix cross builds.
* Build again using GCC 4.9 on mips*, fails to build with GCC 5.
-- Matthias Klose <d...@ubuntu.com> Mon, 14 Dec 2015 21:54:43 +0100
modified:
debian/changelog
debian/control
debian/patches/zero-architectures.diff
debian/rules
--
lp:~openjdk/openjdk/openjdk8
https://code.launchpad.net/~openjdk/openjdk/openjdk8
Your team Debian Java Maintainers is subscribed to branch
lp:~openjdk/openjdk/openjdk8.
To unsubscribe from this branch go to
https://code.launchpad.net/~openjdk/openjdk/openjdk8/+edit-subscription
=== modified file 'debian/changelog'
--- debian/changelog 2015-12-12 20:01:27 +0000
+++ debian/changelog 2015-12-15 07:48:54 +0000
@@ -1,8 +1,10 @@
-openjdk-8 (8u72-b05-4) UNRELEASED; urgency=medium
+openjdk-8 (8u72-b05-4) unstable; urgency=medium
* openjdk-8-jdk: Fix typo in sdk provides. Addresses: #803150.
+ * Fix cross builds.
+ * Build again using GCC 4.9 on mips*, fails to build with GCC 5.
- -- Matthias Klose <d...@ubuntu.com> Sat, 12 Dec 2015 20:59:36 +0100
+ -- Matthias Klose <d...@ubuntu.com> Mon, 14 Dec 2015 21:54:43 +0100
openjdk-8 (8u72-b05-3) unstable; urgency=medium
=== modified file 'debian/control'
--- debian/control 2015-12-12 20:01:27 +0000
+++ debian/control 2015-12-15 07:48:54 +0000
@@ -6,11 +6,11 @@
Build-Depends: debhelper (>= 5), quilt, m4, lsb-release, zip, unzip,
sharutils, gawk, cpio, pkg-config, procps, time, wdiff, fastjar (>= 2:0.96-0ubuntu2),
autoconf, automake, autotools-dev, ant, ant-optional, libtool,
- g++-5 [amd64 i386 arm64 ppc64 ppc64el kfreebsd-amd64 kfreebsd-i386], g++-4.9 [!amd64 !i386 !arm64 !ppc64 !ppc64el !kfreebsd-amd64 !kfreebsd-i386],
+ g++-5, g++-4.9 [mips mipsel mips64 mips64el],
openjdk-8-jdk | openjdk-7-jdk,
libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, libasound2-dev, liblcms2-dev, libfreetype6-dev (>= 2.2.1), libgtk2.0-dev, libxinerama-dev, libkrb5-dev, xsltproc, libpcsclite-dev,
libffi-dev,
- zlib1g-dev, libattr1-dev, libpng-dev, libjpeg-dev, libgif-dev, libpulse-dev (>= 0.9.12) [!alpha], systemtap-sdt-dev,
+ zlib1g-dev, libattr1-dev, libpng-dev, libjpeg-dev, libgif-dev, libpulse-dev (>= 0.9.12) [!alpha], systemtap-sdt-dev [!sh4],
libnss3-dev (>= 2:3.17.1), tzdata,
mauve, jtreg, xvfb, xauth, xfonts-base, libgl1-mesa-dri [!x32], twm | metacity, twm | dbus-x11, x11-xkb-utils,
Standards-Version: 3.9.6
=== modified file 'debian/patches/zero-architectures.diff'
--- debian/patches/zero-architectures.diff 2015-07-06 17:50:26 +0000
+++ debian/patches/zero-architectures.diff 2015-12-15 07:48:54 +0000
@@ -87,7 +87,7 @@
+ m68k) ZERO_ARCHDEF=M68K ;;
+ mips|mipsn32|mips64) ZERO_ARCHDEF=MIPS ;;
+ mipsel|mipsn32el|mips64el) ZERO_ARCHDEF=MIPSEL ;;
-+ sh*) ZERO_ARCHDEF=sh ;;
++ sh*) ZERO_ARCHDEF=ZERO_SH ;;
ppc) ZERO_ARCHDEF=PPC32 ;;
ppc64) ZERO_ARCHDEF=PPC64 ;;
s390*) ZERO_ARCHDEF=S390 ;;
@@ -104,3 +104,30 @@
TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([$ZERO_ARCHFLAG], [], [ZERO_ARCHFLAG=""])
AC_SUBST(ZERO_ARCHFLAG)
+Index: b/hotspot/src/os/linux/vm/os_linux.cpp
+===================================================================
+--- a/hotspot/src/os/linux/vm/os_linux.cpp
++++ b/hotspot/src/os/linux/vm/os_linux.cpp
+@@ -1897,7 +1897,8 @@ void * os::dll_load(const char *filename
+ {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"},
+ {EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"},
+ {EM_PARISC, EM_PARISC, ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"},
+- {EM_68K, EM_68K, ELFCLASS32, ELFDATA2MSB, (char*)"M68k"}
++ {EM_68K, EM_68K, ELFCLASS32, ELFDATA2MSB, (char*)"M68k"},
++ {EM_SH, EM_SH, ELFCLASS32, ELFDATA2LSB, (char*)"Hitachi SH"}
+ };
+
+ #if (defined IA32)
+@@ -1928,9 +1929,11 @@ void * os::dll_load(const char *filename
+ static Elf32_Half running_arch_code=EM_MIPS;
+ #elif (defined M68K)
+ static Elf32_Half running_arch_code=EM_68K;
++ #elif (defined ZERO_SH)
++ static Elf32_Half running_arch_code=EM_SH;
+ #else
+ #error Method os::dll_load requires that one of following is defined:\
+- IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K
++ IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, SH
+ #endif
+
+ // Identify compatability class for VM's architecture and library's architecture
=== modified file 'debian/rules'
--- debian/rules 2015-12-12 19:58:56 +0000
+++ debian/rules 2015-12-15 07:48:54 +0000
@@ -96,7 +96,7 @@
etcdir = etc/$(jdirname)
endif
security = $(etcdir)/security
-ifeq ($(bootcycle_build),yes)
+ifneq ($(bootcycle_build),yes)
jreimg = images/j2re-image
sdkimg = images/j2sdk-image
build_target = images
@@ -125,8 +125,8 @@
with_wgy_zenhai = $(if $(filter $(distrel),lenny),,yes)
-arch_map := alpha=alpha arm=arm armel=arm armhf=arm arm64=aarch64 amd64=amd64 hppa=parisc i386=i586 m68k=m68k mips=mips mipsel=mipsel mips64=mips64 mips64el=mips64el powerpc=ppc powerpcspe=ppc ppc64=ppc64 ppc64el=ppc64le sparc=sparc sparc64=sparcv9 sh4=sh s390x=s390x ia64=ia64 m68k=m68k x32=x32
-archdir_map := alpha=alpha arm=arm armel=arm armhf=arm arm64=aarch64 amd64=amd64 hppa=parisc i386=i386 m68k=m68k mips=mips mipsel=mipsel mips64=mips64 mips64el=mips64el powerpc=ppc powerpcspe=ppc ppc64=ppc64 ppc64el=ppc64le sparc=sparc sparc64=sparcv9 sh4=sh s390x=s390x ia64=ia64 m68k=m68k x32=x32
+arch_map := alpha=alpha arm=arm armel=arm armhf=arm arm64=aarch64 amd64=amd64 hppa=parisc i386=i586 m68k=m68k mips=mips mipsel=mipsel mips64=mips64 mips64el=mips64el powerpc=ppc powerpcspe=ppc ppc64=ppc64 ppc64el=ppc64le sparc=sparc sparc64=sparcv9 sh4=sh s390x=s390x ia64=ia64 x32=x32
+archdir_map := alpha=alpha arm=arm armel=arm armhf=arm arm64=aarch64 amd64=amd64 hppa=parisc i386=i386 m68k=m68k mips=mips mipsel=mipsel mips64=mips64 mips64el=mips64el powerpc=ppc powerpcspe=ppc ppc64=ppc64 ppc64el=ppc64le sparc=sparc sparc64=sparcv9 sh4=sh s390x=s390x ia64=ia64 x32=x32
jvmarch := $(strip $(patsubst $(DEB_HOST_ARCH_CPU)=%, %, \
$(filter $(DEB_HOST_ARCH_CPU)=%, $(arch_map))))
@@ -145,13 +145,6 @@
endif
any_archs = alpha amd64 armel armhf arm64 i386 ia64 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el m68k sh4 sparc sparc64 s390x x32 kfreebsd-i386 kfreebsd-amd64
-bootjdk_gcj_archs = amd64 armel armhf arm64 hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 ppc64el m68k sh4 sparc sparc64 s390x x32 kfreebsd-i386 kfreebsd-amd64
-bootjdk_openjdk_archs = alpha arm64 mips64 mips64el
-bootjdk_cacao_archs =
-#ifneq (,$(filter nobootstrap, $(DEB_BUILD_OPTIONS)))
- bootjdk_openjdk_archs := $(bootjdk_openjdk_archs) $(bootjdk_gcj_archs)
- bootjdk_gcj_archs :=
-#endif
cacao_archs = alpha amd64 armel armhf i386 powerpc powerpcspe m68k mips mipsel
# TODO kfreebsd porting for cacao vm
@@ -192,29 +185,16 @@
endif
endif
-ifneq (,$(filter $(DEB_HOST_ARCH), $(bootjdk_gcj_archs)))
- BOOTJDK_JAVA = gcj
- BOOTJDK_HOME = /usr/lib/jvm/java-gcj
- ifneq (,$(filter $(distrel), wheezy))
- ifneq (,$(filter $(DEB_HOST_ARCH), m68k))
- BOOTJDK_HOME = /usr/lib/jvm/java-1.5.0-gcj-4.6
- endif
- ifneq (,$(filter $(DEB_HOST_ARCH), ia64))
- BOOTJDK_HOME = /usr/lib/jvm/java-1.5.0-gcj-4.7-ia64
- endif
- endif
-else ifneq (,$(filter $(DEB_HOST_ARCH), $(bootjdk_openjdk_archs)))
- BOOTJDK_JAVA = openjdk
- BOOTJDK_HOME := $(strip $(subst /bin/javac,, $(firstword $(wildcard \
- /usr/lib/jvm/java-8-openjdk-$(DEB_HOST_ARCH)/bin/javac \
- /usr/lib/jvm/java-7-openjdk-$(DEB_HOST_ARCH)/bin/javac \
+BOOTJDK_HOME := $(strip $(subst /bin/javac,, $(firstword $(wildcard \
+ /usr/lib/jvm/java-8-openjdk-$(DEB_BUILD_ARCH)/bin/javac \
+ /usr/lib/jvm/java-7-openjdk-$(DEB_BUILD_ARCH)/bin/javac \
/usr/lib/jvm/java-7-openjdk/bin/javac \
- /usr/lib/jvm/java-8-openjdk-$(DEB_HOST_ARCH)/bin/javac))))
-else ifneq (,$(filter $(DEB_HOST_ARCH), $(bootjdk_cacao_archs)))
- BOOTJDK_JAVA = cacao
- BOOTJDK_HOME = /usr/lib/jvm/java-6-cacao
+ ))))
+
+ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+ BUILDJDK_HOME = $(CURDIR)/$(builddir)/$(sdkimg)
else
- $(error unknown bootstrap method for architecture $(DEB_HOST_ARCH))
+ BUILDJDK_HOME = $(BOOTJDK_HOME)
endif
OPENJDK_VERSION = jdk$(shortver)u$(updatever)-$(buildver)
@@ -297,13 +277,11 @@
else ifneq (,$(filter $(distrel),utopic vivid jessie))
export CC = gcc-4.9
export CXX = g++-4.9
-else ifneq (,$(filter $(distrel),sid stretch wily xenial))
- ifneq (,$(filter $(DEB_HOST_ARCH), $(hotspot_archs)))
- export CC = $(DEB_HOST_GNU_TYPE)-gcc-5
- export CXX = $(DEB_HOST_GNU_TYPE)-g++-5
- else
+else ifneq (,$(filter $(distrel),sid stretch wily))
+ ifneq (,$(filter $(DEB_HOST_ARCH), mips mips64 mips64 mips64el))
export CC = $(DEB_HOST_GNU_TYPE)-gcc-4.9
export CXX = $(DEB_HOST_GNU_TYPE)-g++-4.9
+ else
export CC = $(DEB_HOST_GNU_TYPE)-gcc-5
export CXX = $(DEB_HOST_GNU_TYPE)-g++-5
endif
@@ -369,9 +347,11 @@
endif
ifeq (,$(filter $(distrel),squeeze wheezy lucid precise quantal raring saucy trusty))
- with_systemtap = yes
- ALT_SDT_H := $(firstword $(wildcard /usr/include/*/sys/sdt.h /usr/include/sys/sdt.h))
- export ALT_SDT_H
+ ifeq (,$(filter $(DEB_HOST_ARCH),sh4))
+ with_systemtap = yes
+ ALT_SDT_H := $(firstword $(wildcard /usr/include/*/sys/sdt.h /usr/include/sys/sdt.h))
+ export ALT_SDT_H
+ endif
endif
ifneq (,$(filter $(DEB_HOST_ARCH), sparc64))
@@ -576,11 +556,7 @@
ZERO_CONFIGURE_ARGS += --with-jvm-variants=zero
DEFAULT_CONFIGURE_ARGS += --with-boot-jdk=$(BOOTJDK_HOME)
-ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
- ZERO_CONFIGURE_ARGS += --with-boot-jdk=$(CURDIR)/$(builddir)/$(sdkimg)
-else
- ZERO_CONFIGURE_ARGS += --with-boot-jdk=$(BOOTJDK_HOME)
-endif
+ZERO_CONFIGURE_ARGS += --with-boot-jdk=$(BUILDJDK_HOME)
COMMON_CONFIGURE_ARGS += --disable-ccache
@@ -683,31 +659,8 @@
else
bd_autotools = autoconf, automake, autotools-dev,
endif
-# This section should be in sync with "GCJ_SUFFIX" definition
-bd_bootstrap =
-ifneq (,$(bootjdk_gcj_archs))
- bd_bootstrap += \
- ecj-gcj [$(strip $(foreach a,$(bootjdk_gcj_archs), $(a)))],
- bootjdk_gcj46_archs = m68k
- bootjdk_gcj_default_archs = $(filter-out $(bootjdk_gcj46_archs), $(bootjdk_gcj_archs))
- ifneq (,$(filter $(distrel),squeeze wheezy lucid precise))
- bd_bootstrap += \
- gcj-jdk [$(strip $(foreach a,$(bootjdk_gcj_default_archs), $(a)))], \
- gcj-4.6-jdk [$(strip $(foreach a,$(bootjdk_gcj46_archs), $(a)))], \
- gcj-4.7-jdk [ia64],
- else
- bd_bootstrap += \
- gcj-jdk [$(strip $(foreach a,$(bootjdk_gcj_default_archs), $(a)))],
- endif
-endif
-ifneq (,$(bootjdk_openjdk_archs))
- bd_bootstrap += \
+bd_bootstrap += \
openjdk-8-jdk | openjdk-7-jdk,
-endif
-ifneq (,$(bootjdk_cacao_archs))
- bd_bootstrap += \
- cacao-oj6-jdk [$(strip $(foreach a,$(bootjdk_cacao_archs), $(a)))],
-endif
# This section should be in sync with "CC/CXX" definition
ifneq (,$(filter $(distrel),squeeze lucid))
@@ -723,7 +676,7 @@
else ifneq (,$(filter $(distrel),utopic vivid jessie))
bd_gcc = g++-4.9,
else ifneq (,$(filter $(distrel),wily stretch sid))
- bd_gcc = g++-5 [$(hotspot_archs)], g++-4.9 [$(strip $(foreach a,$(hotspot_archs), !$(a)))],
+ bd_gcc = g++-5, g++-4.9 [mips mipsel mips64 mips64el],
else
bd_gcc = g++-5,
endif
@@ -796,7 +749,7 @@
endif
endif
ifeq ($(with_systemtap),yes)
- bd_systemtap = systemtap-sdt-dev,
+ bd_systemtap = systemtap-sdt-dev [!sh4],
endif
ifneq (,$(jamvm_archs))
@@ -1093,6 +1046,8 @@
fi
mkdir -p $(jbuilddir)
cd $(jbuilddir) && ../jamvm/configure \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --host=$(DEB_HOST_GNU_TYPE) \
--prefix=$(CURDIR)/$(jbuilddir)/install \
--with-java-runtime-library=openjdk8 \
--with-gnu-ld \
@@ -1112,12 +1067,14 @@
cd icedtea-sound && ./autogen.sh; \
fi
cd icedtea-sound && ./configure \
- --disable-maintainer-mode \
- --with-jdk-home=$(CURDIR)/$(builddir)/$(sdkimg) \
- CPPFLAGS="$(EXTRA_CPPFLAGS_IT)" \
- CFLAGS="$(EXTRA_CFLAGS_IT)" \
- CXXFLAGS="$(EXTRA_CXXFLAGS_IT)" \
- LDFLAGS="$(EXTRA_LDFLAGS_IT)"
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --host=$(DEB_HOST_GNU_TYPE) \
+ --disable-maintainer-mode \
+ --with-jdk-home=$(BUILDJDK_HOME) \
+ CPPFLAGS="$(EXTRA_CPPFLAGS_IT)" \
+ CFLAGS="$(EXTRA_CFLAGS_IT)" \
+ CXXFLAGS="$(EXTRA_CXXFLAGS_IT)" \
+ LDFLAGS="$(EXTRA_LDFLAGS_IT)"
touch $@
stamps/sound-build: stamps/sound-configure
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>.
Please use
debian-j...@lists.debian.org for discussions and questions.
