/[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 489355 by dmorgan, Sun Aug 4 21:32:45 2013 UTC revision 489356 by dmorgan, Sun Sep 29 20:41:25 2013 UTC
# Line 1  Line 1 
1  # If debug is 1, OpenJDK is built with all debug info present.  # If debug is 1, OpenJDK is built with all debug info present.
2  %global debug 0  %global debug 0
3    
4  %global jdk8_version b89x  %global jdk8_version b106
5  %global hg_tag jdk8-%{jdk8_version}  %global hg_tag jdk8-%{jdk8_version}
6    %global aarch64_hg_tag aarch64-20130813
7    
8  %global aarch64                 aarch64 arm64 armv8  %global aarch64                 aarch64 arm64 armv8
9  %global multilib_arches %{power64} sparc64 x86_64 %{aarch64}  %global multilib_arches %{power64} sparc64 x86_64 %{aarch64}
# Line 10  Line 11 
11    
12    
13  %ifarch x86_64  %ifarch x86_64
 %global archbuild amd64  
14  %global archinstall amd64  %global archinstall amd64
15  %endif  %endif
16  %ifarch ppc  %ifarch ppc
 %global archbuild ppc  
17  %global archinstall ppc  %global archinstall ppc
 %global archdef PPC  
18  %endif  %endif
19  %ifarch %{power64}  %ifarch %{power64}
 %global archbuild ppc64  
20  %global archinstall ppc64  %global archinstall ppc64
 %global archdef PPC  
21  %endif  %endif
22  %ifarch %{ix86}  %ifarch %{ix86}
 %global archbuild i586  
23  %global archinstall i386  %global archinstall i386
24  %endif  %endif
25  %ifarch ia64  %ifarch ia64
 %global archbuild ia64  
26  %global archinstall ia64  %global archinstall ia64
27  %endif  %endif
28  %ifarch s390  %ifarch s390
 %global archbuild s390  
29  %global archinstall s390  %global archinstall s390
 %global archdef S390  
30  %endif  %endif
31  %ifarch s390x  %ifarch s390x
 %global archbuild s390x  
32  %global archinstall s390x  %global archinstall s390x
 %global archdef S390  
33  %endif  %endif
34  %ifarch %{arm}  %ifarch %{arm}
 %global archbuild arm  
35  %global archinstall arm  %global archinstall arm
 %global archdef ARM  
36  %endif  %endif
37  %ifarch %{aarch64}  %ifarch %{aarch64}
 %global archbuild aarch64  
38  %global archinstall aarch64  %global archinstall aarch64
 %global archdef AARCH64  
39  %endif  %endif
40  # 32 bit sparc, optimized for v9  # 32 bit sparc, optimized for v9
41  %ifarch sparcv9  %ifarch sparcv9
 %global archbuild sparc  
42  %global archinstall sparc  %global archinstall sparc
43  %endif  %endif
44  # 64 bit sparc  # 64 bit sparc
45  %ifarch sparc64  %ifarch sparc64
 %global archbuild sparcv9  
46  %global archinstall sparcv9  %global archinstall sparcv9
47  %endif  %endif
48  %ifnarch %{jit_arches}  %ifnarch %{jit_arches}
 %global archbuild %{_arch}  
49  %global archinstall %{_arch}  %global archinstall %{_arch}
50  %endif  %endif
51    
# Line 124  Line 107 
107  %global jvmjardir       %{_jvmjardir}/%{name}-%{version}  %global jvmjardir       %{_jvmjardir}/%{name}-%{version}
108  %endif  %endif
109    
110  %ifarch %{jit_arches}  %if %{with_systemtap}
111  # Where to install systemtap tapset (links)  # Where to install systemtap tapset (links)
112  # We would like these to be in a package specific subdir,  # We would like these to be in a package specific subdir,
113  # but currently systemtap doesn't support that, so we have to  # but currently systemtap doesn't support that, so we have to
# Line 142  Line 125 
125    
126  Name:    java-%{javaver}-%{origin}  Name:    java-%{javaver}-%{origin}
127  Version: %{javaver}.%{buildver}  Version: %{javaver}.%{buildver}
128  Release: %mkrel 0.11.%{jdk8_version}.1  Release: %mkrel 0.19.%{jdk8_version}.1
129  # 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,
130  # 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
131  # also included the epoch in their virtual provides.  This created a  # also included the epoch in their virtual provides.  This created a
# Line 159  Group:   Development/Java Line 142  Group:   Development/Java
142  License:  ASL 1.1 and ASL 2.0 and GPL+ and GPLv2 and GPLv2 with exceptions and LGPL+ and LGPLv2 and MPLv1.0 and MPLv1.1 and Public Domain and W3C  License:  ASL 1.1 and ASL 2.0 and GPL+ and GPLv2 and GPLv2 with exceptions and LGPL+ and LGPLv2 and MPLv1.0 and MPLv1.1 and Public Domain and W3C
143  URL:      http://openjdk.java.net/  URL:      http://openjdk.java.net/
144    
145  # Source from upstrem OpenJDK8 project. Use  # Source from upstrem OpenJDK8 project. To regenerate, use
146  # './generate_source_tarball.sh %{hg_tag}' to generate. The script clones  # ./generate_source_tarball.sh jdk8 %{hg_tag}
147  # repositories of jdk8 and aarch64-port and removes code not allowed in Fedora.  # ./generate_source_tarball.sh aarch64-port %{aarch64_hg_tag}
148  Source0:  jdk8-%{jdk8_version}.tar.xz  Source0:  jdk8-%{hg_tag}.tar.xz
149  Source1:  aarch64-port-%{jdk8_version}.tar.xz  Source1:  aarch64-port-%{aarch64_hg_tag}.tar.xz
150    
151  # Custom README for -src subpackage  # Custom README for -src subpackage
152  Source2:  README.src  Source2:  README.src
# Line 207  Patch102: %{name}-size_t.patch Line 190  Patch102: %{name}-size_t.patch
190  Patch103: %{name}-ppc-zero-hotspot.patch  Patch103: %{name}-ppc-zero-hotspot.patch
191    
192  Patch201: system-libjpeg.patch  Patch201: system-libjpeg.patch
 Patch2011: system-libjpegAARCH64.patch  
193  Patch202: system-libpng.patch  Patch202: system-libpng.patch
194  Patch203: system-lcms.patch  Patch203: system-lcms.patch
195  Patch2031: system-lcmsAARCH64.patch  Patch2031: system-lcmsAARCH64.patch
# Line 232  BuildRequires: libxinerama-devel Line 214  BuildRequires: libxinerama-devel
214  BuildRequires: libxt-devel  BuildRequires: libxt-devel
215  BuildRequires: libxtst-devel  BuildRequires: libxtst-devel
216  BuildRequires: pkgconfig  BuildRequires: pkgconfig
217  BuildRequires: wget  BuildRequires: x11-proto-devel
218    #BuildRequires: redhat-lsb
219  BuildRequires: zip  BuildRequires: zip
220  # OpenJDK X officially requires OpenJDK (X-1) to build  # OpenJDK X officially requires OpenJDK (X-1) to build
221  BuildRequires: java-1.7.0-openjdk-devel  BuildRequires: java-1.7.0-openjdk-devel
# Line 248  BuildRequires: openssl Line 231  BuildRequires: openssl
231  %ifnarch %{arm} %{aarch64}  %ifnarch %{arm} %{aarch64}
232  BuildRequires: prelink  BuildRequires: prelink
233  %endif  %endif
234  %ifarch %{jit_arches}  %if %{with_systemtap}
 #systemtap build requirement.  
235  BuildRequires: systemtap  BuildRequires: systemtap
236  %endif  %endif
237    
# Line 324  The OpenJDK demos. Line 306  The OpenJDK demos.
306  %package src  %package src
307  Summary: OpenJDK Source Bundle  Summary: OpenJDK Source Bundle
308  Group:   Development/Java  Group:   Development/Java
309    
310  Requires: %{name} = %{epoch}:%{version}-%{release}  Requires: %{name} = %{epoch}:%{version}-%{release}
311    
312  %description src  %description src
# Line 368  cp %{SOURCE101} jdk8/common/autoconf/bui Line 351  cp %{SOURCE101} jdk8/common/autoconf/bui
351    
352  sh %{SOURCE12}  sh %{SOURCE12}
353    
 %ifarch %{aarch64}  
 %patch2011  
 %else  
354  %patch201  %patch201
 %endif  
   
355  %patch202  %patch202
356    
357  %ifarch %{aarch64}  %ifarch %{aarch64}
# Line 442  bash ../../configure \ Line 420  bash ../../configure \
420  %ifnarch %{jit_arches}  %ifnarch %{jit_arches}
421      --with-jvm-variants=zero \      --with-jvm-variants=zero \
422  %endif  %endif
423    %ifarch %{aarch64}
424        --with-jvm-variants=client \
425        --disable-precompiled-headers \
426    %endif
427        --disable-zip-debug-info \
428      --with-build-number=%{buildver} \      --with-build-number=%{buildver} \
429      --with-boot-jdk=/usr/lib/jvm/java-openjdk \      --with-boot-jdk=/usr/lib/jvm/java-openjdk \
430      --with-debug-level=%{debugbuild} \      --with-debug-level=%{debugbuild} \
# Line 490  pushd %{buildoutputdir}/images/j2sdk-ima Line 473  pushd %{buildoutputdir}/images/j2sdk-ima
473    install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}    install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
474    cp -a jre/bin jre/lib $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}    cp -a jre/bin jre/lib $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
475    
476  %ifarch %{jit_arches}  %if %{with_systemtap}
477    # Install systemtap support files.    # Install systemtap support files.
478    install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/tapset    install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/tapset
479    cp -a $RPM_BUILD_DIR/%{name}/tapset/*.stp $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/tapset/    cp -a $RPM_BUILD_DIR/%{name}/tapset/*.stp $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/tapset/
# Line 871  exit 0 Line 854  exit 0
854  %dir %{_jvmdir}/%{sdkdir}/bin  %dir %{_jvmdir}/%{sdkdir}/bin
855  %dir %{_jvmdir}/%{sdkdir}/include  %dir %{_jvmdir}/%{sdkdir}/include
856  %dir %{_jvmdir}/%{sdkdir}/lib  %dir %{_jvmdir}/%{sdkdir}/lib
857  %ifarch %{jit_arches}  %if %{with_systemtap}
858  %dir %{_jvmdir}/%{sdkdir}/tapset  %dir %{_jvmdir}/%{sdkdir}/tapset
859  %endif  %endif
860  %{_jvmdir}/%{sdkdir}/bin/*  %{_jvmdir}/%{sdkdir}/bin/*
861  %{_jvmdir}/%{sdkdir}/include/*  %{_jvmdir}/%{sdkdir}/include/*
862  %{_jvmdir}/%{sdkdir}/lib/*  %{_jvmdir}/%{sdkdir}/lib/*
863  %ifarch %{jit_arches}  %if %{with_systemtap}
864  %{_jvmdir}/%{sdkdir}/tapset/*.stp  %{_jvmdir}/%{sdkdir}/tapset/*.stp
865  %endif  %endif
866  %{_jvmdir}/%{sdklnk}  %{_jvmdir}/%{sdklnk}
# Line 913  exit 0 Line 896  exit 0
896  %{_mandir}/man1/wsgen-%{name}.1*  %{_mandir}/man1/wsgen-%{name}.1*
897  %{_mandir}/man1/wsimport-%{name}.1*  %{_mandir}/man1/wsimport-%{name}.1*
898  %{_mandir}/man1/xjc-%{name}.1*  %{_mandir}/man1/xjc-%{name}.1*
899  %ifarch %{jit_arches}  %if %{with_systemtap}
900  %{tapsetroot}  %{tapsetroot}
901  %endif  %endif
902    
# Line 931  exit 0 Line 914  exit 0
914  %doc %{_javadocdir}/%{name}  %doc %{_javadocdir}/%{name}
915  %doc %{buildoutputdir}/images/j2sdk-image/jre/LICENSE  %doc %{buildoutputdir}/images/j2sdk-image/jre/LICENSE
916    
917    

Legend:
Removed from v.489355  
changed lines
  Added in v.489356

  ViewVC Help
Powered by ViewVC 1.1.30