Date: Tuesday, February 27, 2018 @ 12:44:09
Author: guillaume
Revision: 317582
Upstream release 8.u162
Modified:
java8-openjdk/trunk/PKGBUILD
Deleted:
java8-openjdk/trunk/build_with_gcc6.patch
---+
PKGBUILD | 28 -
build_with_gcc6.patch | 1098
2 files changed, 12 insertions(+), 1114 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-02-27 12:34:23 UTC (rev 317581)
+++ PKGBUILD2018-02-27 12:44:09 UTC (rev 317582)
@@ -11,8 +11,8 @@
pkgbase=java8-openjdk
_java_ver=8
# Found @
http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
-_jdk_update=144
-_jdk_build=01
+_jdk_update=162
+_jdk_build=12
pkgver=${_java_ver}.u${_jdk_update}
_repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
pkgrel=1
@@ -29,18 +29,16 @@
jaxws-${_repo_ver}.tar.gz::${_url_src}/jaxws/archive/${_repo_ver}.tar.gz
jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz
langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz
-
nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz
-build_with_gcc6.patch)
+
nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz)
-sha256sums=('85a8a8c55cda2d3bae833578d6ad6c8bf531550ac051776d47946d17858a6721'
-'f0a153807e08c79c5ce229be6eafe7951854a7d7eb496cea7b24a0a5f305ccfe'
-'18d9fc6b9a6830cb8083e366b9ef31f8c8ebb80c816d7f516de8285181fb6bc1'
-'e8442fd2fcce332abdb1e34bb33655e43e6d88bb551fc67883b8cab043aba53f'
-'5146841822b49e1300c6c78a88be617fd72a80b76e8e2bb8d6ed526edfe1a929'
-'d5479dde109483c81f94abb91d93d11b1a899bb5d5685e7dfdd96ba8e35adf93'
-'7a3a7d2f2f6f47de876532d9ad9e3d04f0235a8d848ea958d6371dbb2535f83c'
-'5d14d0e910fec1cc34e02bf25173b25619083f2afda8e73d0bb5ba456c12b89c'
-'dcf5f495620231068b0c925a33ba7246bbeb85e9ae822b30ab77a66839c2d3b6')
+sha256sums=('7ad155f34bae7bfb43b5f74972f61cf2d390be9d068d7825af8416fe098f15b1'
+'d45747d3ef7bfff09e48391b10e9264619c2e3c65708cdf62fa3c4c4f724bf88'
+'9614ed1e9eb7e1ad9ee206272e761cbdb0d24193f4e70fad853ae1e8eb668af4'
+'1809fc11f8d5bd4817ac8be30493d0c6ae994c2f089101040345aed39cabe40d'
+'c576306038e548071a0c9904dd0ef82e1ada4dba8acf865b065672356c256dde'
+'c45c2bc4519992d78666c81b5faa33d7b40e268c8ae5c17ac1b7726fdf8e16d4'
+'b0dae1ddc9113d6ce5e7afc0a75284f913ab2d8f21c56b2378962037947629ec'
+'b8a89d7870c332055e4bde9ca7a4183b4de1a280709de29f18a6867dd1eb8296')
case "${CARCH}" in
'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;;
@@ -63,8 +61,6 @@
do
ln -s ../${subrepo}-${_repo_ver} ${subrepo}
done
-
- patch -p1 < ../build_with_gcc6.patch
}
build() {
@@ -74,7 +70,7 @@
# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1346
export MAKEFLAGS=${MAKEFLAGS/-j*}
# https://hydra.nixos.org/build/41230444/log
- export CFLAGS="-Wno-error=deprecated-declarations"
+ export CFLAGS="-Wno-error=deprecated-declarations -fno-lifetime-dse"
install -d -m 755 "${srcdir}/${_prefix}/"
sh configure \
Deleted: build_with_gcc6.patch
===
--- build_with_gcc6.patch 2018-02-27 12:34:23 UTC (rev 317581)
+++ build_with_gcc6.patch 2018-02-27 12:44:09 UTC (rev 317582)
@@ -1,1098 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1468209748 -3600
-# Mon Jul 11 05:02:28 2016 +0100
-# Node ID 7eb66a95dbd58d26ed271477076e0ab72e8c9ebf
-# Parent 817d9fb584baecae7c989dfd7009a7f0ac7c6360
-8151841: Build needs additional flags to compile with GCC 6 [plus parts of
8149647 & 8032045]
-Summary: C++ standard needs to be explicitly set and some optimisations turned
off to build on GCC 6
-Reviewed-by: erikj, dholmes, kbarrett
-
-diff --git a/common/autoconf/generated-configure.sh
b/common/autoconf/generated-configure.sh
a/common/autoconf/generated-configure.sh
-+++ b/common/autoconf/generated-configure.sh
-@@ -679,6 +679,9 @@
- CFLAGS_JDKLIB
- MACOSX_VERSION_MIN
- PACKAGE_PATH
-+NO_LIFETIME_DSE_CFLAG
-+NO_DELETE_NULL_POINTER_CHECKS_CFLAG
-+CXXSTD_CXXFLAG
- LEGACY_EXTRA_LDFLAGS
- LEGACY_EXTRA_CXXFLAGS
- LEGACY_EXTRA_CFLAGS
-@@ -743,6 +746,8 @@
- ac_ct_OBJC
- OBJCFLAGS
- OBJC
-+CXX_VERSION
-+CC_VERSION
- ac_ct_CXX
- CXXFLAGS
- CXX
-@@ -3672,7 +3677,7 @@
-
-
- #
--# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
- # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- #
- # This code is free software; you can redistribute it and/or modify it
-@@ -3795,6 +3800,19 @@
- # questions.
- #
-
-+# Prepare the system so that TOOLCHAIN_CHECK_COMPILER_VERSION can be calle
