From f536e61549c79aca6916e7fa2912fc281fe56376 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 29 Jan 2018 12:38:15 +0000 Subject: [PATCH] 6.0.0-rc1 --- .gitignore | 1 + libcxx.spec | 15 +++++++++++---- sources | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1359fba..ecfb3ad 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /libcxx-4.0.1.src.tar.xz /libcxx-5.0.0.src.tar.xz /libcxx-5.0.1.src.tar.xz +/libcxx-6.0.0rc1.src.tar.xz diff --git a/libcxx.spec b/libcxx.spec index fc1c151..e1267e7 100644 --- a/libcxx.spec +++ b/libcxx.spec @@ -2,13 +2,15 @@ # Otherwise, you have a loop with libcxxabi %global bootstrap 0 +%global rc_ver 1 + Name: libcxx -Version: 5.0.1 -Release: 1%{?dist} +Version: 6.0.0 +Release: 0.1.rc%{rc_ver}%{?dist} Summary: C++ standard library targeting C++11 License: MIT or NCSA URL: http://libcxx.llvm.org/ -Source0: http://llvm.org/releases/%{version}/libcxx-%{version}.src.tar.xz +Source0: http://llvm.org/releases/%{version}/libcxx-%{version}%{?rc_ver:rc%{rc_ver}}.src.tar.xz BuildRequires: clang llvm-devel cmake llvm-static %if %{bootstrap} < 1 BuildRequires: libcxxabi-devel @@ -41,7 +43,7 @@ Summary: Static libraries for libcxx %{summary}. %prep -%setup -q -n %{name}-%{version}.src +%setup -q -n %{name}-%{version}%{?rc_ver:rc%{rc_ver}}.src %build mkdir _build @@ -54,6 +56,8 @@ cd _build %endif %endif export LDFLAGS="-Wl,--build-id" +#Filter out cxxflags not supported by clang +export CXXFLAGS=`echo $CXXFLAGS | sed 's/-fstack-clash-protection//g'` # Clang in older releases than f24 can't build this code without crashing. # So, we use gcc there. But the really old version in RHEL 6 works. Huh. %cmake .. \ @@ -108,6 +112,9 @@ make install DESTDIR=%{buildroot} %changelog +* Sat Jan 20 2018 Tom Stellard - 6.0.0-0.1.rc1 +- 6.0.0-rc1 + * Thu Dec 21 2017 Tom Stellard - 5.0.1-1 - 5.0.1 Release diff --git a/sources b/sources index 279b690..46a5d55 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libcxx-5.0.1.src.tar.xz) = 994681d3c79047fc2d618c5584b08e9b5c925dab48f8812fc0adc81a575b49a637e9481bb9a0f7ae6f7f352b2b33f40056c347c27123cd6c96c6c226febd002c +SHA512 (libcxx-6.0.0rc1.src.tar.xz) = 5d8481e9a1a6570a7bc90dfd77b7787ba4e6480c52aca949811254003c00f6b83496d29260af9fa3fd3f0ba29d647b3c961d91bead66082f9e7bc09d4e68a7a1