diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2016-08-22 18:22:50 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-10-19 10:52:36 +0200 |
| commit | 4323fb269efcb6e49031a7b1c36e868408358baa (patch) | |
| tree | f4d18061438a6f8fdd44bf02b148ec6984d1af66 | |
| parent | d78610bc6616b811a8bba42f61ca42fa905b8d1d (diff) | |
| download | alpine_aports-4323fb269efcb6e49031a7b1c36e868408358baa.tar.bz2 alpine_aports-4323fb269efcb6e49031a7b1c36e868408358baa.tar.xz alpine_aports-4323fb269efcb6e49031a7b1c36e868408358baa.zip | |
community/openjdk7: fix build on gcc6
| -rw-r--r-- | community/openjdk7/APKBUILD | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/community/openjdk7/APKBUILD b/community/openjdk7/APKBUILD index 4de209d525..83568dd55c 100644 --- a/community/openjdk7/APKBUILD +++ b/community/openjdk7/APKBUILD | |||
| @@ -125,6 +125,14 @@ build() { | |||
| 125 | export PATH=$JAVA_HOME/bin:$srcdir/apache-ant-$ANT_VER/bin:$PATH | 125 | export PATH=$JAVA_HOME/bin:$srcdir/apache-ant-$ANT_VER/bin:$PATH |
| 126 | export DISTRIBUTION_PATCHES="" | 126 | export DISTRIBUTION_PATCHES="" |
| 127 | 127 | ||
| 128 | # Explicitly set the C++ standard as the default has changed on GCC 6+ | ||
| 129 | # and disable optimizations that lead to a broken JVM. These options | ||
| 130 | # has been adopted from the Fedora package. | ||
| 131 | export EXTRA_CPP_FLAGS="$CXXFLAGS -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse" | ||
| 132 | # CXXFLAGS doesn't make it to all calls, so we set the C++ standard | ||
| 133 | # version for C too. | ||
| 134 | export EXTRA_CFLAGS="$CFLAGS -std=gnu++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse" | ||
| 135 | |||
| 128 | local patch | 136 | local patch |
| 129 | for patch in $source; do | 137 | for patch in $source; do |
| 130 | case $patch in | 138 | case $patch in |