/[packages]/updates/5/java-1.8.0-openjdk/current/SOURCES/pr2444.patch
ViewVC logotype

Contents of /updates/5/java-1.8.0-openjdk/current/SOURCES/pr2444.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 855972 - (show annotations) (download)
Tue Jul 21 18:32:49 2015 UTC (8 years, 8 months ago) by luigiwalser
File size: 1220 byte(s)
- sync with fedora 22 as of 2015-07-17:
  - added requires lksctp-tools for headless subpackage to make
    sun.nio.ch.sctp work
  - allow build on Linux 4.x kernel (sync from master)
  - Update to the 8u51-b16 security release
  - rename some patches and add some more from fedora
  - adapt to openjdk as the build directory instead of jdk8
  - sync with rhel7
  - fix md5sum tests

1 # HG changeset patch
2 # User omajid
3 # Date 1434565087 14400
4 # Wed Jun 17 14:18:07 2015 -0400
5 # Node ID 44d6e4ff3770e0d272cc5d5e5cf88762e108e2c5
6 # Parent d4d7a3107d2039e6077391cf83b70ff7074653b0
7 8087156, PR2444: SetupNativeCompilation ignores CFLAGS_release for cpp files
8 Reviewed-by: erikj, ihse
9
10 diff -r d4d7a3107d20 -r 44d6e4ff3770 make/common/NativeCompilation.gmk
11 --- openjdk///make/common/NativeCompilation.gmk Fri Jun 12 21:25:45 2015 +0100
12 +++ openjdk///make/common/NativeCompilation.gmk Wed Jun 17 14:18:07 2015 -0400
13 @@ -323,6 +323,13 @@
14 $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
15 endif
16
17 + ifeq ($$($1_CXXFLAGS),)
18 + $1_CXXFLAGS:=$$($1_CFLAGS)
19 + endif
20 + ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),)
21 + $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS)
22 + endif
23 +
24 ifneq (,$$($1_DEBUG_SYMBOLS))
25 ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
26 ifdef OPENJDK
27 @@ -340,13 +347,6 @@
28 endif
29 endif
30
31 - ifeq ($$($1_CXXFLAGS),)
32 - $1_CXXFLAGS:=$$($1_CFLAGS)
33 - endif
34 - ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),)
35 - $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS)
36 - endif
37 -
38 ifneq (,$$($1_REORDER))
39 $1_EXTRA_CFLAGS += $$(C_FLAG_REORDER)
40 $1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER)

  ViewVC Help
Powered by ViewVC 1.1.30