Attachment 705078 Details for Bug 917749 – specfile changes

[patch] specfile changes

gcc.spec.patch (text/plain), 3.87 KB, created by Mark Salter on 2013-03-04 17:18:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Salter

Created: 2013-03-04 17:18:23 UTC

Size: 3.87 KB

patch

obsolete

>--- /home/msalter/rpmbuild/SPECS/gcc.spec	2013-02-13 18:11:20.000000000 -0500
>+++ /home/msalter/gcc.spec	2013-03-01 14:48:01.198679157 -0500
>@@ -1,3 +1,5 @@
>+%bcond_without java
>+%bcond_without docs
> %global DATE 20130213
> %global SVNREV 196031
> %global gcc_version 4.8.0
>@@ -14,7 +16,7 @@
> %if 0%{?rhel} >= 7
> %global build_java 0
> %else
>-%global build_java 1
>+%global build_java %{with java}
> %endif
> %ifarch %{ix86} x86_64 ppc ppc64 s390 s390x %{arm}
> %global build_go 1
>@@ -47,7 +49,7 @@
> %global build_libitm 0
> %endif
> %global build_cloog 1
>-%global build_libstdcxx_docs 1
>+%global build_libstdcxx_docs %{with docs}
> # If you don't have already a usable gcc-java and libgcj for your arch,
> # do on some arch which has it rpmbuild -bc --with java_tar gcc.spec
> # which creates libjava-classes-%{version}-%{release}.tar.bz2
>@@ -69,7 +71,7 @@
> Summary: Various compilers (C, C++, Objective-C, Java, ...)
> Name: gcc
> Version: %{gcc_version}
>-Release: %{gcc_release}%{?dist}
>+Release: %{gcc_release}.x1%{?dist}
> # libgcc, libgfortran, libmudflap, libgomp, libstdc++ and crtstuff have
> # GCC Runtime Exception.
> License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
>@@ -205,6 +207,8 @@ Patch1002: fastjar-0.97-filename0.patch
> Patch1003: fastjar-CVE-2010-0831.patch
> Patch1004: fastjar-man.patch
> 
>+Patch2000: gcc-aarch64-config.patch
>+
> # On ARM EABI systems, we do want -gnueabi to be part of the
> # target triple.
> %ifnarch %{arm}
>@@ -813,6 +817,8 @@ tar xzf %{SOURCE4}
> %patch1003 -p0 -b .fastjar-CVE-2010-0831~
> %patch1004 -p0 -b .fastjar-man~
> 
>+%patch2000 -p1 -b .aarch-config
>+
> %if %{bootstrap_java}
> tar xjf %{SOURCE10}
> %endif
>@@ -998,12 +1004,16 @@ case "$OPT_FLAGS" in
> esac
> enablelgo=
> enablelada=
>+enableljava=
> %if %{build_ada}
> enablelada=,ada
> %endif
> %if %{build_go}
> enablelgo=,go
> %endif
>+%if %{build_java}
>+enableljava=,java
>+%endif
> CC="$CC" CFLAGS="$OPT_FLAGS" \
> 	CXXFLAGS="`echo " $OPT_FLAGS " | sed 's/ -Wall / /g;s/ -fexceptions / /g'`" \
> 	XCFLAGS="$OPT_FLAGS" TCFLAGS="$OPT_FLAGS" GCJFLAGS="$OPT_FLAGS" \
>@@ -1012,7 +1022,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" \
> 	--enable-shared --enable-threads=posix --enable-checking=release \
> 	--with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \
> 	--enable-gnu-unique-object --enable-linker-build-id --with-linker-hash-style=gnu \
>-	--enable-languages=c,c++,objc,obj-c++,java,fortran${enablelada}${enablelgo},lto \
>+	--enable-languages=c,c++,objc,obj-c++,fortran${enableljava}${enablelada}${enablelgo},lto \
> 	--enable-plugin --enable-initfini-array \
> %if !%{build_java}
> 	--disable-libgcj \
>@@ -1077,7 +1087,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" \
> 	--build=%{gcc_target_platform}
> %endif
> 
>-%ifarch %{arm} sparc sparcv9 sparc64
>+%ifarch %{arm} sparc sparcv9 sparc64 aarch64
> GCJFLAGS="$OPT_FLAGS" make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" bootstrap
> %else
> GCJFLAGS="$OPT_FLAGS" make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" profiledbootstrap
>@@ -1303,6 +1313,14 @@ mv %{buildroot}%{_prefix}/lib/libgfortra
> mv %{buildroot}%{_prefix}/lib/libitm.spec $FULLPATH/
> %endif
> 
>+%ifarch aarch64
>+# FIXME
>+# aarch64 is not really multilib but it does use /usr/lib64 for shared libs
>+# Maybe needs a patch somewhere to avoid this crazyness
>+mkdir -p %{buildroot}%{_prefix}/%{_lib}
>+mv -f %{buildroot}%{_prefix}/lib/lib* %{buildroot}%{_prefix}/%{_lib}
>+%endif
>+
> mkdir -p %{buildroot}/%{_lib}
> mv -f %{buildroot}%{_prefix}/%{_lib}/libgcc_s.so.1 %{buildroot}/%{_lib}/libgcc_s-%{gcc_version}-%{DATE}.so.1
> chmod 755 %{buildroot}/%{_lib}/libgcc_s-%{gcc_version}-%{DATE}.so.1
>@@ -2977,6 +2995,9 @@ fi
> %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/plugin
> 
> %changelog
>+* Sat Feb 16 2013 Mark Salter <msalter@redhat.com> - 4.8.0-0.12.x1
>+- add aarch64/bootstrap support
>+
> * Wed Feb 13 2013 Jakub Jelinek <jakub@redhat.com> 4.8.0-0.12
> - updated from trunk
>   - PRs c++/55710, c++/55879, c++/55993, c++/56135, c++/56155, c++/56285,

Actions: View | Diff

Attachments on bug 917749: 705078 | 705082