|
|
@@ -8,7 +8,7 @@
|
|
|
%global llvmdocdir() %{_docdir}/%1-%{version}
|
|
|
|
|
|
Name: llvm
|
|
|
-Version: 3.5.1
|
|
|
+Version: 3.6.1
|
|
|
Release: 1%{?_dist_release}
|
|
|
Summary: The Low Level Virtual Machine
|
|
|
Summary(ja): LLVM - 低レベルバーチャルマシン
|
|
|
@@ -42,7 +42,7 @@ Patch201: lldb-fix-expression-parser.patch
|
|
|
Patch202: lldb-python-module-symlink.patch
|
|
|
|
|
|
# Vine Patch
|
|
|
-Patch1000: clang-3.5.0-driver-ld.gold.patch
|
|
|
+Patch1000: clang-3.6.1-driver-ld.gold.patch
|
|
|
Patch1001: clang-3.5.0-driver-lib64.patch
|
|
|
Patch1002: clang-3.5.0-driver-vine.patch
|
|
|
|
|
|
@@ -56,17 +56,21 @@ BuildRequires: gcc-c++ >= 3.4
|
|
|
BuildRequires: groff
|
|
|
BuildRequires: libffi-devel
|
|
|
BuildRequires: libtool-ltdl-devel
|
|
|
-BuildRequires: ocaml
|
|
|
-BuildRequires: perl
|
|
|
+BuildRequires: libxml2-devel
|
|
|
+BuildRequires: ocaml-findlib
|
|
|
+#BuildRequires: ocaml-ctypes
|
|
|
+BuildRequires: ocaml-ounit
|
|
|
# for DejaGNU test suite
|
|
|
-BuildRequires: dejagnu tcl python
|
|
|
+BuildRequires: dejagnu tcl-devel python
|
|
|
%if %{with doxygen}
|
|
|
BuildRequires: doxygen graphviz
|
|
|
%endif
|
|
|
+# pod2man
|
|
|
+BuildRequires: perl
|
|
|
# lldb
|
|
|
BuildRequires: swig
|
|
|
BuildRequires: libedit-devel
|
|
|
-BuildRequires: python-devel
|
|
|
+BuildRequires: python-devel >= 2.7
|
|
|
|
|
|
Requires: llvm-libs = %{version}-%{release}
|
|
|
|
|
|
@@ -117,6 +121,8 @@ Group: System Environment/Libraries
|
|
|
%description libs
|
|
|
Shared libraries for the LLVM compiler infrastructure.
|
|
|
|
|
|
+%description libs -l ja
|
|
|
+LLVM コンパイラ基盤の共有ライブラリです．
|
|
|
|
|
|
%package -n clang
|
|
|
Summary: A C language family front-end for LLVM
|
|
|
@@ -147,6 +153,8 @@ Group: System Environment/Libraries
|
|
|
%description -n clang-libs
|
|
|
Runtime library for clang.
|
|
|
|
|
|
+%description -n clang-libs -l ja
|
|
|
+Clang のランタイムライブラリです．
|
|
|
|
|
|
%package -n clang-devel
|
|
|
Summary: Header files for clang
|
|
|
@@ -157,6 +165,8 @@ Requires: clang = %{version}-%{release}
|
|
|
%description -n clang-devel
|
|
|
This package contains header files for the Clang compiler.
|
|
|
|
|
|
+%description -n clang-devel -l ja
|
|
|
+Clang コンパイラのヘッダファイル集です．
|
|
|
|
|
|
%package -n clang-analyzer
|
|
|
Summary: A source code analysis framework
|
|
|
@@ -279,29 +289,29 @@ mv cfe-%{version}.src tools/clang
|
|
|
mv compiler-rt-%{version}.src projects/compiler-rt
|
|
|
mv lldb-%{version}.src tools/lldb
|
|
|
|
|
|
-%patch1 -p1
|
|
|
+#patch1 -p1
|
|
|
%patch2 -p1
|
|
|
|
|
|
# clang
|
|
|
-pushd tools/clang
|
|
|
-%patch100 -p1
|
|
|
-%patch101 -p0
|
|
|
-popd
|
|
|
+#pushd tools/clang
|
|
|
+#%patch100 -p1
|
|
|
+#%patch101 -p0
|
|
|
+#popd
|
|
|
|
|
|
# lldb
|
|
|
pushd tools/lldb
|
|
|
# careful when recreating this patch...
|
|
|
%patch200 -p1 -b .python
|
|
|
-%patch201 -p2
|
|
|
+#patch201 -p2
|
|
|
%patch202 -p1
|
|
|
sed -i s/@lib@/%{_lib}/g scripts/Python/modules/readline/Makefile
|
|
|
popd
|
|
|
|
|
|
# Vine Linux
|
|
|
%patch1000 -p1 -b .driver-ld.gold
|
|
|
-%ifarch x86_64
|
|
|
-%patch1001 -p1 -b .driver-lib64
|
|
|
-%endif
|
|
|
+#%ifarch x86_64
|
|
|
+#%patch1001 -p1 -b .driver-lib64
|
|
|
+#%endif
|
|
|
%patch1002 -p1 -b .driver-vine
|
|
|
|
|
|
# fix library paths
|
|
|
@@ -310,42 +320,65 @@ sed -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}/%{name}|g' Makefile.config.in
|
|
|
sed -i 's|/lib\>|/%{_lib}/%{name}|g' tools/llvm-config/llvm-config.cpp
|
|
|
|
|
|
%build
|
|
|
-export CC=/usr/bin/gcc
|
|
|
-export CXX=/usr/bin/g++
|
|
|
-
|
|
|
# -fno-devirtualize shouldn't be necessary, but gcc has scary template-related
|
|
|
# bugs that make it so. gcc 5 ought to be fixed.
|
|
|
+export CC=gcc
|
|
|
+export CXX=g++
|
|
|
+export CFLAGS="%{optflags} -DLLDB_DISABLE_PYTHON"
|
|
|
+export CXXFLAGS="%{optflags} -DLLDB_DISABLE_PYTHON"
|
|
|
%configure \
|
|
|
--with-extra-options="-fno-devirtualize" \
|
|
|
--with-extra-ld-options=-Wl,-Bsymbolic \
|
|
|
--libdir=%{_libdir}/%{name} \
|
|
|
- --datadir=%{_libdir}/%{name} \
|
|
|
+ --disable-polly \
|
|
|
+ --disable-libcpp \
|
|
|
+ --enable-cxx11 \
|
|
|
+ --enable-clang-arcmt \
|
|
|
+ --enable-clang-static-analyzer \
|
|
|
+ --enable-clang-rewriter \
|
|
|
+ --enable-optimized \
|
|
|
+ --disable-profiling \
|
|
|
+ --disable-assertions \
|
|
|
+ --disable-werror \
|
|
|
+ --disable-expensive-checks \
|
|
|
+ --enable-debug-runtime \
|
|
|
+ --enable-keep-symbols \
|
|
|
+ --enable-jit \
|
|
|
+ --enable-docs \
|
|
|
%if %{with doxygen}
|
|
|
--enable-doxygen \
|
|
|
%else
|
|
|
--disable-doxygen \
|
|
|
%endif
|
|
|
+ --enable-threads \
|
|
|
+ --enable-pthreads \
|
|
|
+ --enable-zlib \
|
|
|
+ --enable-pic \
|
|
|
+ --enable-shared \
|
|
|
+ --disable-embed-stdcxx \
|
|
|
+ --enable-timestamps \
|
|
|
+ --enable-backtraces \
|
|
|
+ --enable-targets=x86,powerpc,arm,aarch64,cpp,nvptx,systemz,r600 \
|
|
|
+ --enable-bindings=ocaml \
|
|
|
+ --enable-libffi \
|
|
|
+ --enable-ltdl-install \
|
|
|
+ \
|
|
|
%ifarch armv7hl armv7l
|
|
|
--with-cpu=cortex-a8 \
|
|
|
--with-tune=cortex-a8 \
|
|
|
--with-arch=armv7-a \
|
|
|
--with-float=hard \
|
|
|
--with-fpu=vfpv3-d16 \
|
|
|
- --with-abi=aapcs-linux \
|
|
|
-%endif
|
|
|
- --enable-targets=host \
|
|
|
- --disable-assertions \
|
|
|
- --enable-optimized \
|
|
|
- --enable-jit \
|
|
|
- --enable-libffi \
|
|
|
- --enable-shared \
|
|
|
- --enable-pic \
|
|
|
- --with-c-include-dirs=%{_includedir}:$(echo %{_prefix}/lib/gcc/%{_target_cpu}*/*/include) \
|
|
|
+ --with-abi=aapcs-vfp \
|
|
|
+ %endif
|
|
|
+ \
|
|
|
--with-binutils-include=%{_includedir} \
|
|
|
- --enable-targets=x86,powerpc,arm,aarch64,cpp,nvptx \
|
|
|
- --enable-experimental-targets=R600 \
|
|
|
+ --with-c-include-dirs=%{_includedir}:$(echo %{_prefix}/lib/gcc/%{_target_cpu}*/*/include) \
|
|
|
--with-optimize-option=-O3
|
|
|
-
|
|
|
+
|
|
|
+# --datadir=%{_libdir}/%{name} \
|
|
|
+# --enable-experimental-targets=R600 \
|
|
|
+
|
|
|
make %{?_smp_mflags} REQUIRES_RTTI=1 VERBOSE=1
|
|
|
|
|
|
%install
|
|
|
@@ -355,7 +388,7 @@ make install DESTDIR=%{buildroot} \
|
|
|
PROJ_docsdir=/moredocs
|
|
|
|
|
|
# you have got to be kidding me
|
|
|
-rm -f %{buildroot}%{_bindir}/{FileCheck,count,not}
|
|
|
+rm -f %{buildroot}%{_bindir}/{FileCheck,count,not,verify-uselistorder,obj2yaml,yaml2obj}
|
|
|
|
|
|
# multilib fixes
|
|
|
mv %{buildroot}%{_bindir}/llvm-config{,-%{__isa_bits}}
|
|
|
@@ -370,7 +403,7 @@ popd
|
|
|
# Create ld.so.conf.d entry
|
|
|
mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
|
|
|
cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/llvm-%{_arch}.conf << EOF
|
|
|
-%{_libdir}/llvm
|
|
|
+%{_libdir}/%{name}
|
|
|
EOF
|
|
|
|
|
|
# Static analyzer not installed by default:
|
|
|
@@ -408,6 +441,10 @@ find %{buildroot}%{_libdir} -name "*.a" -type f -print0 | xargs -0 chmod -x
|
|
|
mkdir -p %{buildroot}%{_mandir}/man1
|
|
|
cp tools/lldb/docs/lldb.1 %{buildroot}%{_mandir}/man1/
|
|
|
|
|
|
+# Install documentation documentation
|
|
|
+find %{buildroot}/moredocs/ -name "*.tar.gz" -print0 | xargs -0 rm -rf
|
|
|
+mkdir -p %{buildroot}%{_docdir}
|
|
|
+
|
|
|
# llvm-doc
|
|
|
mkdir -p %{buildroot}%{llvmdocdir %{name}-doc}
|
|
|
cp -ar examples %{buildroot}%{llvmdocdir %{name}-doc}/examples
|
|
|
@@ -419,7 +456,7 @@ mv %{buildroot}/moredocs/html/doxygen %{buildroot}%{llvmdocdir %{name}-apidoc}
|
|
|
%endif
|
|
|
|
|
|
# llvm-ocaml-doc
|
|
|
-mv %{buildroot}/moredocs/ocamldoc/html %{buildroot}%{llvmdocdir %{name}-ocaml-doc}
|
|
|
+#mv %{buildroot}/moredocs/ocamldoc/html %{buildroot}%{llvmdocdir %{name}-ocaml-doc}
|
|
|
|
|
|
# clang
|
|
|
mkdir -p %{buildroot}%{llvmdocdir clang}
|
|
|
@@ -449,8 +486,10 @@ file %{buildroot}/%{_libdir}/%{name}/*.so | awk -F: '$2~/ELF/{print $1}' | xargs
|
|
|
|
|
|
|
|
|
%check
|
|
|
-make check 2>&1 | tee ../llvm-testlog.txt
|
|
|
-make -C tools/clang/test 2>&1 | tee ../llvm-testlog.txt
|
|
|
+# the || : is wrong, i know, but the git snaps fail to make check due to
|
|
|
+# broken makefiles in the doc dirs.
|
|
|
+make check LIT_ARGS="-v -j4" | tee llvm-testlog.txt ||:
|
|
|
+make -C tools/clang/test TESTARGS="-v -j4" | tee clang-testlog.txt ||:
|
|
|
|
|
|
|
|
|
%clean
|
|
|
@@ -553,7 +592,7 @@ exit 0
|
|
|
%{_bindir}/lldb-*
|
|
|
%{_libdir}/%{name}/liblldb.so
|
|
|
# XXX double check this
|
|
|
-%{python_sitearch}/*
|
|
|
+#{python_sitearch}/*
|
|
|
%doc %{_mandir}/man1/lldb.1.*
|
|
|
|
|
|
%files -n lldb-devel
|
|
|
@@ -579,7 +618,7 @@ exit 0
|
|
|
|
|
|
%files ocaml-doc
|
|
|
%defattr(-,root,root,-)
|
|
|
-%doc %{llvmdocdir %{name}-ocaml-doc}/
|
|
|
+#doc %{llvmdocdir %{name}-ocaml-doc}/
|
|
|
|
|
|
%if 0%{?_with_doxygen}
|
|
|
%files apidoc
|
|
|
@@ -603,6 +642,11 @@ exit 0
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Thu Jun 4 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.6.1-1
|
|
|
+- new upstream release
|
|
|
+- dropt Patch 1, 201 and 1001
|
|
|
+- updated Patch 1000
|
|
|
+
|
|
|
* Tue Mar 24 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.5.1-1
|
|
|
- updated to 3.5.1
|
|
|
- added Patch1, 2, 100, 101, 200, 201 and 202 from Fedora
|
inagaki