Merging in the change from release for in master

Doesn't actually change anything since lldb requires gcc 4.6 and is disabled on EL6
This commit is contained in:
Dave Johansen 2014-02-04 19:26:28 -07:00
parent 5b96b3dfff
commit c5d6b65dba

View file

@ -20,8 +20,8 @@
%bcond_with gold %bcond_with gold
%endif %endif
# lldb requires gcc 4.6 or higher # lldb requires gcc 4.6 or higher
# ppc64 fails to build lldb upstream # lldb not ported to anything but x86 so far.
%ifnarch ppc ppc64 %ifarch x86_64 %{ix86}
%bcond_without lldb %bcond_without lldb
%else %else
%bcond_with lldb %bcond_with lldb
@ -47,7 +47,7 @@ Obsoletes: pure <= 0.55
Name: llvm Name: llvm
Version: 3.4 Version: 3.4
Release: 7%{?dist} Release: 8%{?dist}
Summary: The Low Level Virtual Machine Summary: The Low Level Virtual Machine
Group: Development/Languages Group: Development/Languages
@ -665,18 +665,22 @@ exit 0
%endif %endif
%changelog %changelog
* Tue Feb 04 2014 Dave Johansen <davejohansen@gmail.com> 3.4-7 * Tue Feb 04 2014 Dave Johansen <davejohansen@gmail.com> 3.4-8
- Adding include path for ffi.h - Adding include path for ffi.h
* Mon Feb 03 2014 Dave Johansen <davejohansen@gmail.com> 3.4-6 * Mon Feb 03 2014 Dave Johansen <davejohansen@gmail.com> 3.4-7
- Removing specification of --with-c-include-dirs - Removing specification of --with-c-include-dirs
* Wed Jan 29 2014 Dave Johansen <davejohansen@gmail.com> 3.4-5 * Wed Jan 29 2014 Dave Johansen <davejohansen@gmail.com> 3.4-6
- Obsoleting pure on EL6 - Obsoleting pure on EL6
* Sat Jan 18 2014 Dave Johansen <davejohansen@gmail.com> 3.4-4 * Sat Jan 18 2014 Dave Johansen <davejohansen@gmail.com> 3.4-5
- Enable building on EL6 - Enable building on EL6
* Fri Jan 31 2014 Kyle McMartin <kyle@redhat.com> 3.4-4
- Disable lldb on everything but x86_64, and i686. It hasn't been ported
beyond those platforms so far.
* Fri Jan 17 2014 Dave Airlie <airlied@redhat.com> 3.4-3 * Fri Jan 17 2014 Dave Airlie <airlied@redhat.com> 3.4-3
- bump nvr for lldb on ppc disable - bump nvr for lldb on ppc disable