/[packages]/cauldron/java-1.8.0-openjdk/current/SPECS/java-1.8.0-openjdk.spec
ViewVC logotype

Diff of /cauldron/java-1.8.0-openjdk/current/SPECS/java-1.8.0-openjdk.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 820278 by luigiwalser, Sat Feb 14 02:45:21 2015 UTC revision 820279 by luigiwalser, Wed Apr 15 12:44:43 2015 UTC
# Line 113  Line 113 
113    
114  # Standard JPackage naming and versioning defines.  # Standard JPackage naming and versioning defines.
115  %global origin          openjdk  %global origin          openjdk
116  %global updatever       40  %global updatever       45
117  %global buildver        b25  %global buildver        b13
118  %global aarch64_updatever 40  %global aarch64_updatever 45
119  %global aarch64_buildver b12  %global aarch64_buildver b13
120  %global aarch64_changesetid aarch64-1263  %global aarch64_changesetid aarch64-jdk8u45-b13
121  # priority must be 7 digits in total  # priority must be 7 digits in total
122  %global priority        18000%{updatever}  %global priority        18000%{updatever}
123  %global javaver         1.8.0  %global javaver         1.8.0
# Line 443  exit 0 Line 443  exit 0
443  %dir %{_jvmdir}/%{sdkdir %%1}/bin  %dir %{_jvmdir}/%{sdkdir %%1}/bin
444  %dir %{_jvmdir}/%{sdkdir %%1}/include  %dir %{_jvmdir}/%{sdkdir %%1}/include
445  %dir %{_jvmdir}/%{sdkdir %%1}/lib  %dir %{_jvmdir}/%{sdkdir %%1}/lib
 %if %{with_systemtap}  
 %dir %{_jvmdir}/%{sdkdir %%1}/tapset  
 %endif  
446  %{_jvmdir}/%{sdkdir %%1}/bin/*  %{_jvmdir}/%{sdkdir %%1}/bin/*
447  %{_jvmdir}/%{sdkdir %%1}/include/*  %{_jvmdir}/%{sdkdir %%1}/include/*
448  %{_jvmdir}/%{sdkdir %%1}/lib/*  %{_jvmdir}/%{sdkdir %%1}/lib/*
 %if %{with_systemtap}  
 %{_jvmdir}/%{sdkdir %%1}/tapset/*.stp  
 %endif  
449  %{_jvmjardir}/%{sdkdir %%1}  %{_jvmjardir}/%{sdkdir %%1}
450  %{_datadir}/applications/*jconsole%1.desktop  %{_datadir}/applications/*jconsole%1.desktop
451  %{_mandir}/man1/appletviewer-%{uniquesuffix %%1}.1*  %{_mandir}/man1/appletviewer-%{uniquesuffix %%1}.1*
# Line 485  exit 0 Line 479  exit 0
479  %{_mandir}/man1/wsimport-%{uniquesuffix %%1}.1*  %{_mandir}/man1/wsimport-%{uniquesuffix %%1}.1*
480  %{_mandir}/man1/xjc-%{uniquesuffix %%1}.1*  %{_mandir}/man1/xjc-%{uniquesuffix %%1}.1*
481  %if %{with_systemtap}  %if %{with_systemtap}
482  %{tapsetroot}  %dir %{tapsetroot}
483    %dir %{tapsetdir}
484    %{tapsetdir}/*%{version}-%{release}.%{_arch}%1.stp
485    %dir %{_jvmdir}/%{sdkdir %%1}/tapset
486    %{_jvmdir}/%{sdkdir %%1}/tapset/*.stp
487  %endif  %endif
488  }  }
489    
# Line 635  Obsoletes: java-1.7.0-openjdk-accessibil Line 633  Obsoletes: java-1.7.0-openjdk-accessibil
633    
634  Name:    java-%{javaver}-%{origin}  Name:    java-%{javaver}-%{origin}
635  Version: %{javaver}.%{updatever}  Version: %{javaver}.%{updatever}
636  Release: %mkrel 5.%{buildver}.1  Release: %mkrel 6.%{buildver}.1
637  # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,  # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
638  # and this change was brought into RHEL-4.  java-1.5.0-ibm packages  # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
639  # also included the epoch in their virtual provides.  This created a  # also included the epoch in their virtual provides.  This created a
# Line 655  URL:      http://openjdk.java.net/ Line 653  URL:      http://openjdk.java.net/
653  # Source from upstrem OpenJDK8 project. To regenerate, use  # Source from upstrem OpenJDK8 project. To regenerate, use
654  # ./generate_source_tarball.sh jdk8u jdk8u jdk8u%%{updatever}-%%{buildver}  # ./generate_source_tarball.sh jdk8u jdk8u jdk8u%%{updatever}-%%{buildver}
655  # ./generate_source_tarball.sh aarch64-port jdk8 %%{aarch64_hg_tag}  # ./generate_source_tarball.sh aarch64-port jdk8 %%{aarch64_hg_tag}
656  Source0:  jdk8u40-jdk8u%{updatever}-%{buildver}.tar.xz  Source0:  jdk8u45-jdk8u%{updatever}-%{buildver}.tar.xz
657  Source1:  jdk8-jdk8u%{aarch64_updatever}-%{aarch64_buildver}-%{aarch64_changesetid}.tar.xz  Source1:  jdk8-jdk8u%{aarch64_updatever}-%{aarch64_buildver}-%{aarch64_changesetid}.tar.xz
658    
659  # Custom README for -src subpackage  # Custom README for -src subpackage
# Line 675  Source10: policytool.desktop.in Line 673  Source10: policytool.desktop.in
673  Source11: nss.cfg  Source11: nss.cfg
674    
675  # Removed libraries that we link instead  # Removed libraries that we link instead
676  Source12: remove-intree-libraries.sh  Source12: %{name}-remove-intree-libraries.sh
677    
678  # Ensure we aren't using the limited crypto policy  # Ensure we aren't using the limited crypto policy
679  Source13: TestCryptoLevel.java  Source13: TestCryptoLevel.java
# Line 694  Patch1:   %{name}-accessible-toolkit.pat Line 692  Patch1:   %{name}-accessible-toolkit.pat
692  # Restrict access to java-atk-wrapper classes  # Restrict access to java-atk-wrapper classes
693  Patch3: java-atk-wrapper-security.patch  Patch3: java-atk-wrapper-security.patch
694  # RHBZ 808293  # RHBZ 808293
695  Patch4: PStack-808293.patch  Patch4: %{name}-PStack-808293.patch
696  # Allow multiple initialization of PKCS11 libraries  # Allow multiple initialization of PKCS11 libraries
697  Patch5: multiple-pkcs11-library-init.patch  Patch5: multiple-pkcs11-library-init.patch
698  # Disable doclint for compatibility  # Disable doclint for compatibility
# Line 717  Patch102: %{name}-size_t.patch Line 715  Patch102: %{name}-size_t.patch
715  Patch201: system-libjpeg.patch  Patch201: system-libjpeg.patch
716  Patch202: system-libpng.patch  Patch202: system-libpng.patch
717  Patch203: system-lcms.patch  Patch203: system-lcms.patch
718    Patch204: zero-interpreter-fix.patch
719    
720  Patch300: jstack-pr1845.patch  Patch300: jstack-pr1845.patch
721    
722    # Fixed in upstream 9. See upstream bug:
723    # https://bugs.openjdk.java.net/browse/JDK-8064815
724  Patch400: ppc_stack_overflow_fix.patch  Patch400: ppc_stack_overflow_fix.patch
725    # Fixed in upstream 9. See upstream bug:
726    # https://bugs.openjdk.java.net/browse/JDK-8067330
727  Patch401: fix_ZERO_ARCHDEF_ppc.patch  Patch401: fix_ZERO_ARCHDEF_ppc.patch
728    # Fixed in upstream 9. See upstream bug:
729    # https://bugs.openjdk.java.net/browse/JDK-8067331
730  Patch402: atomic_linux_zero.inline.hpp.patch  Patch402: atomic_linux_zero.inline.hpp.patch
731    # Fixes StackOverflowError on ARM32 bit Zero. See RHBZ#1206656
732    Patch403: rhbz1206656_fix_current_stack_pointer.patch
733    
734    #both upstreamed, will fly away in u60 (bug IDs are Red Hat bug IDs)
735    Patch501: 1182011_JavaPrintApiDoesNotPrintUmlautCharsWithPostscriptOutputCorrectly.patch
736    Patch502: 1182694_javaApplicationMenuMisbehave.patch
737    Patch503: d318d83c4e74.patch
738    
739    
740  Patch9999: enableArm64.patch  Patch9999: enableArm64.patch
741    
# Line 977  cp %{SOURCE101} jdk8/common/autoconf/bui Line 990  cp %{SOURCE101} jdk8/common/autoconf/bui
990  # Remove libraries that are linked  # Remove libraries that are linked
991  sh %{SOURCE12}  sh %{SOURCE12}
992    
993  %ifarch %{aarch64}  # Add AArch64 support to configure & JDK build
994  %patch9999  %patch9999
 %endif  
995    
996  %patch201  %patch201
997  %patch202  %patch202
998  %patch203  %patch203
999    %ifnarch %{aarch64}
1000    %patch204
1001    %endif
1002    
1003  %patch1  %patch1
1004  %patch3  %patch3
# Line 1005  sh %{SOURCE12} Line 1020  sh %{SOURCE12}
1020  %patch400  %patch400
1021  %patch401  %patch401
1022  %patch402  %patch402
1023    %patch403
1024    
1025  # Extract systemtap tapsets  # Extract systemtap tapsets
1026  %if %{with_systemtap}  %if %{with_systemtap}
# Line 1013  tar xzf %{SOURCE8} Line 1029  tar xzf %{SOURCE8}
1029    
1030  %patch300  %patch300
1031    
1032    %patch501
1033    %patch502
1034    %patch503
1035    
1036  %if %{include_debug_build}  %if %{include_debug_build}
1037  cp -r tapset tapset%{debug_suffix}  cp -r tapset tapset%{debug_suffix}
1038  %endif  %endif
# Line 1033  for suffix in %{build_loop} ; do Line 1053  for suffix in %{build_loop} ; do
1053    done    done
1054  done  done
1055  # systemtap tapsets ends  # systemtap tapsets ends
1056  %endif  %endif
1057    
1058  # Prepare desktop files  # Prepare desktop files
1059  for suffix in %{build_loop} ; do  for suffix in %{build_loop} ; do
# Line 1062  export CFLAGS="$CFLAGS -mieee" Line 1082  export CFLAGS="$CFLAGS -mieee"
1082  %endif  %endif
1083    
1084  EXTRA_CFLAGS="-fstack-protector-strong"  EXTRA_CFLAGS="-fstack-protector-strong"
1085  #see https://bugzilla.redhat.com/show_bug.cgi?id=1120792  # Disable various optimizations to fix miscompliation. See:
1086  EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-devirtualize -Wno-return-local-addr"  # - https://bugzilla.redhat.com/show_bug.cgi?id=1120792
1087  EXTRA_CPP_FLAGS="-fno-devirtualize -Wno-return-local-addr"  # - https://bugzilla.redhat.com/show_bug.cgi?id=1208369
1088    EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-devirtualize -fno-tree-vrp"
1089    EXTRA_CPP_FLAGS="-fno-devirtualize -fno-tree-vrp"
1090  # PPC/PPC64 needs -fno-tree-vectorize since -O3 would  # PPC/PPC64 needs -fno-tree-vectorize since -O3 would
1091  # otherwise generate wrong code producing segfaults.  # otherwise generate wrong code producing segfaults.
1092  %ifarch %{power64} ppc  %ifarch %{power64} ppc
# Line 1115  bash ../../configure \ Line 1137  bash ../../configure \
1137      --with-extra-cflags="$EXTRA_CFLAGS" \      --with-extra-cflags="$EXTRA_CFLAGS" \
1138      --with-num-cores="$NUM_PROC"      --with-num-cores="$NUM_PROC"
1139    
1140    cat spec.gmk
1141    cat hotspot-spec.gmk
1142    
1143  # The combination of FULL_DEBUG_SYMBOLS=0 and ALT_OBJCOPY=/does_not_exist  # The combination of FULL_DEBUG_SYMBOLS=0 and ALT_OBJCOPY=/does_not_exist
1144  # disables FDS for all build configs and reverts to pre-FDS make logic.  # disables FDS for all build configs and reverts to pre-FDS make logic.
1145  # STRIP_POLICY=none says don't do any stripping. DEBUG_BINARIES=true says  # STRIP_POLICY=none says don't do any stripping. DEBUG_BINARIES=true says
# Line 1213  mkdir -p $RPM_BUILD_ROOT%{_jvmdir}/%{jre Line 1238  mkdir -p $RPM_BUILD_ROOT%{_jvmdir}/%{jre
1238    install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir $suffix}/tapset    install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir $suffix}/tapset
1239    # note, that uniquesuffix  is in BUILD dir in this case    # note, that uniquesuffix  is in BUILD dir in this case
1240    cp -a $RPM_BUILD_DIR/%{uniquesuffix ""}/tapset$suffix/*.stp $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir $suffix}/tapset/    cp -a $RPM_BUILD_DIR/%{uniquesuffix ""}/tapset$suffix/*.stp $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir $suffix}/tapset/
1241      pushd $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir $suffix}/tapset/
1242       tapsetFiles=`ls *.stp`
1243      popd
1244    install -d -m 755 $RPM_BUILD_ROOT%{tapsetdir}    install -d -m 755 $RPM_BUILD_ROOT%{tapsetdir}
1245    pushd $RPM_BUILD_ROOT%{tapsetdir}    pushd $RPM_BUILD_ROOT%{tapsetdir}
1246      RELATIVE=$(%{abs2rel} %{_jvmdir}/%{sdkdir $suffix}/tapset %{tapsetdir})      RELATIVE=$(%{abs2rel} %{_jvmdir}/%{sdkdir $suffix}/tapset %{tapsetdir})
1247      ln -sf $RELATIVE/*.stp .      for name in $tapsetFiles ; do
1248          targetName=`echo $name | sed "s/.stp/$suffix.stp/"`
1249          ln -sf $RELATIVE/$name $targetName
1250        done
1251    popd    popd
1252  %endif  %endif
1253    

Legend:
Removed from v.820278  
changed lines
  Added in v.820279

  ViewVC Help
Powered by ViewVC 1.1.30