packages: llvm/llvm.spec, llvm/llvm-2.5-tclsh_check.patch (NEW), llvm/llvm-...
arekm
arekm at pld-linux.org
Sat Sep 19 22:01:02 CEST 2009
Author: arekm Date: Sat Sep 19 20:01:02 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 2.6 prerelease
---- Files affected:
packages/llvm:
llvm.spec (1.10 -> 1.11) , llvm-2.5-tclsh_check.patch (NONE -> 1.1) (NEW), llvm-2.6-destdir-clang.patch (NONE -> 1.1) (NEW), llvm-2.6-destdir.patch (NONE -> 1.1) (NEW), llvm-2.6-timestamp.patch (NONE -> 1.1) (NEW), llvm-dirs.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/llvm/llvm.spec
diff -u packages/llvm/llvm.spec:1.10 packages/llvm/llvm.spec:1.11
--- packages/llvm/llvm.spec:1.10 Sun Apr 12 07:44:27 2009
+++ packages/llvm/llvm.spec Sat Sep 19 22:00:56 2009
@@ -3,29 +3,36 @@
# - gcc/c++ packages: http://cvs.fedoraproject.org/viewvc/rpms/llvm/devel/llvm.spec?revision=HEAD&view=markup
# - test gcc pkgs and all
#
-# Conditional build:
-%bcond_with ocaml # build without OCaml bindings
-%bcond_without gcc # build without gcc
-#
%define lgcc_vertar 4.2
-%define lgcc_version 4.2.1
+%define lgcc_version 4.2
Summary: The Low Level Virtual Machine (An Optimizing Compiler Infrastructure)
Summary(pl.UTF-8): Niskopoziomowa maszyna wirtualna (infrastruktura kompilatora optymalizującego)
Name: llvm
-Version: 2.5
+Version: 2.6
Release: 0.1
License: University of Illinois/NCSA Open Source License
Group: Development/Languages
-Source0: http://llvm.org/releases/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 55df2ea8665c8094ad2ef85187b9fc74
-Source1: http://llvm.org/releases/%{version}/%{name}-gcc-%{lgcc_vertar}-%{version}.source.tar.gz
-# Source1-md5: c5800d85059fcf80429a86c536127595
-Patch0: %{name}-dirs.patch
+Source0: http://llvm.org/prereleases/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: d4d2cfbb962eca0c96aa1d794e23a681
+Source1: http://llvm.org/prereleases/2.6/clang-%{version}.tar.gz
+# Source1-md5: 80a2a9bbe8fa7c403b2ec7aca8b4108f
+# http://llvm.org/bugs/show_bug.cgi?id=3153
+Patch0: %{name}-2.6-destdir.patch
+Patch1: %{name}-2.6-destdir-clang.patch
+# http://llvm.org/bugs/show_bug.cgi?id=4911
+Patch2: %{name}-2.5-tclsh_check.patch
+# Data files should be installed with timestamps preserved
+Patch3: %{name}-2.6-timestamp.patch
URL: http://llvm.org/
BuildRequires: bash
-BuildRequires: gcc >= 5:3.4
+BuildRequires: bison
+BuildRequires: doxygen
+BuildRequires: flex
+BuildRequires: graphviz
+BuildRequires: groff
BuildRequires: libltdl-devel
-%{?with_ocaml:BuildRequires: ocaml}
+BuildRequires: libstdc++-devel >= 5:3.4
+BuildRequires: ocaml-ocamldoc
# gcc4 might be installed, but not current __cc
%if "%(echo %{cc_version} | cut -d. -f1,2)" < "3.4"
BuildRequires: __cc >= 3.4
@@ -76,24 +83,6 @@
This package contains library and header files needed to develop new
native programs that use the LLVM infrastructure.
-%package gcc
-Summary: C compiler for LLVM
-License: GPL+
-Group: Development/Languages
-Requires: %{name} = %{version}-%{release}
-
-%description gcc
-C compiler for LLVM.
-
-%package gcc-c++
-Summary: C++ compiler for LLVM
-License: GPL+
-Group: Development/Languages
-Requires: %{name}-gcc = %{version}-%{release}
-
-%description gcc-c++
-C++ compiler for LLVM.
-
%package ocaml
Summary: OCaml binding for LLVM
Group: Development/Libraries
@@ -113,86 +102,138 @@
The %{name}-ocaml-devel package contains libraries and signature files
for developing applications that use %{name}-ocaml.
+%package -n clang
+Summary: A C language family frontend for LLVM
+License: NCSA
+Group: Development/Languages
+
+%description -n clang
+clang: noun 1. A loud, resonant, metallic sound. 2. The strident call
+of a crane or goose. 3. C-language family front-end toolkit.
+
+The goal of the Clang project is to create a new C, C++, Objective C
+and Objective C++ front-end for the LLVM compiler. Its tools are built
+as libraries and designed to be loosely-coupled and extendable.
+
+%package -n clang-analyzer
+Summary: A source code analysis framework
+License: NCSA
+Group: Development/Languages
+Requires: clang = %{version}-%{release}
+# not picked up automatically since files are currently not instaled
+# in standard Python hierarchies yet
+Requires: python
+
+%description -n clang-analyzer
+The Clang Static Analyzer consists of both a source code analysis
+framework and a standalone tool that finds bugs in C and Objective-C
+programs. The standalone tool is invoked from the command-line, and is
+intended to run in tandem with a build of a project or code base.
+
%prep
-%setup -q %{?with_gcc:-a1}
-%patch0 -p0
+%setup -q -a1
+mv clang-*.* tools/clang
+%patch0 -p0 -b .destdir
+cd tools/clang
+%patch1 -p0 -b .destdir-clang
+cd ../..
+%patch2 -p1 -b .tclsh_check
+%patch3 -p1 -b .timestamp
%build
+# Disabling assertions now, rec. by pure and needed for OpenGTL
+# no PIC on ix86: http://llvm.org/bugs/show_bug.cgi?id=3239
+#
# bash specific 'test a < b'
-bash %configure \
+mkdir obj && cd obj
+bash ../%configure \
--libdir=%{_libdir}/%{name} \
--datadir=%{_datadir}/%{name}-%{version} \
- --enable-bindings=%{!?with_ocaml:no}%{?with_ocaml:ocaml} \
+%ifarch %{ix86}
+ --enable-pic=no \
+%endif
--disable-static \
- --enable-assertions \
+ --disable-assertions \
--enable-debug-runtime \
--enable-jit \
--enable-optimized \
--enable-shared \
--with-pic
-%{__make} OPTIMIZE_OPTION="%{rpmcflags}"
-
-%if %{with gcc}
-# Build llvm-gcc.
-
-export PATH=%{_builddir}/%{?buildsubdir}/Release/bin:$PATH
-
-install -d llvm-gcc%{lgcc_vertar}-%{version}.source/build
-cd llvm-gcc%{lgcc_vertar}-%{version}.source/build
-../configure \
- --host=%{_host} \
- --build=%{_build} \
- --target=%{_target_platform} \
- --prefix=%{_libdir}/llvm-gcc \
- --libdir=%{_libdir}/llvm-gcc/%{_lib} \
- --enable-threads \
- --disable-nls \
-%ifarch %{x8664}
- --disable-multilib \
- --disable-shared \
-%endif
- --enable-languages=c,c++ \
- --enable-llvm=%{_builddir}/%{?buildsubdir} \
- --program-prefix=llvm-
+# FIXME file this
+# configure does not properly specify libdir
+sed -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}/%{name}|g' Makefile.config
-%{__make} LLVM_VERSION_INFO=%{version}
-%endif
+%{__make} \
+ OPTIMIZE_OPTION="%{rpmcflags} %{rpmcppflags}"
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+cd obj
+chmod -x examples/Makefile
+
+%{__make} -j1 install \
+ PROJ_docsdir=/moredocs \
DESTDIR=$RPM_BUILD_ROOT
+cd ..
-find $RPM_BUILD_ROOT -name .dir | xargs rm -fv
+# Static analyzer not installed by default:
+# http://clang-analyzer.llvm.org/installation#OtherPlatforms
+install -d $RPM_BUILD_ROOT%{_libdir}/clang-analyzer/libexec
+# wrong path used
+install -d $RPM_BUILD_ROOT%{_libexecdir}
+mv $RPM_BUILD_ROOT/usr/libexec/clang-cc $RPM_BUILD_ROOT%{_libexecdir}/clang-cc
+# link clang-cc for scan-build to find
+ln -s %{_libexecdir}/clang-cc $RPM_BUILD_ROOT%{_libdir}/clang-analyzer/libexec/
+# create launchers
+for f in scan-{build,view}; do
+ ln -s %{_libdir}/clang-analyzer/$f $RPM_BUILD_ROOT%{_bindir}/$f
+done
+
+cd tools/clang/utils
+cp -p ccc-analyzer $RPM_BUILD_ROOT%{_libdir}/clang-analyzer/libexec/
+
+for f in scan-build scanview.css sorttable.js; do
+ cp -p $f $RPM_BUILD_ROOT%{_libdir}/clang-analyzer/
+done
+cd ../../..
+
+cd tools/clang/tools/scan-view
+cp -pr * $RPM_BUILD_ROOT%{_libdir}/clang-analyzer/
+cd ../../../../
+
+# Move documentation back to build directory
+#
+rm -rf moredocs
+mv $RPM_BUILD_ROOT/moredocs .
+rm moredocs/*.tar.gz
+#rm moredocs/ocamldoc/html/*.tar.gz
+
+# And prepare Clang documentation
+#
+rm -rf clang-docs
+mkdir clang-docs
+for f in LICENSE.TXT NOTES.txt README.txt TODO.txt; do
+ ln tools/clang/$f clang-docs/
+done
+#rm -rf tools/clang/docs/{doxygen*,Makefile*,*.graffle,tools}
# Get rid of erroneously installed example files.
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/LLVMHello.*
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*LLVMHello.*
-%if %{with gcc}
-# Install llvm-gcc.
+# Remove deprecated tools.
+rm $RPM_BUILD_ROOT%{_bindir}/gcc{as,ld}
-%{__make} -C llvm-gcc%{lgcc_vertar}-%{version}.source/build install \
- DESTDIR=$RPM_BUILD_ROOT
+# FIXME file this bug
+sed -i 's,ABS_RUN_DIR/lib",ABS_RUN_DIR/%{_lib}/%{name}",' \
+ $RPM_BUILD_ROOT%{_bindir}/llvm-config
-cd $RPM_BUILD_ROOT%{_libdir}/llvm-gcc/%{_lib}
-find . -name '*.la' -print0 | xargs -0r rm
-find . -name '*.a' -exec $RPM_BUILD_ROOT%{_bindir}/llvm-ranlib {} \;
-cd ../bin
-ln llvm-c++ llvm-gcc llvm-g++ $RPM_BUILD_ROOT%{_bindir}
-rm llvm-cpp llvm-gccbug llvm-gcov %{_target_platform}-gcc*
-cd ..
-mv man/man1/llvm-gcc.1 man/man1/llvm-g++.1 $RPM_BUILD_ROOT%{_mandir}/man1
-rm -r info man %{_lib}/libiberty.a
-rm -r libexec/gcc/%{_target_platform}/%{lgcc_version}/install-tools
-
-rm -r $RPM_BUILD_ROOT%{_libdir}/llvm-gcc/%{_lib}/gcc/%{_target_platform}/%{lgcc_version}/install-tools
-rm -f $RPM_BUILD_ROOT%{_libdir}/llvm-gcc/%{_lib}/libgomp.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/llvm-gcc/%{_lib}/libgomp.spec
-rm -f $RPM_BUILD_ROOT%{_libdir}/llvm-gcc/%{_lib}/libssp.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/llvm-gcc/%{_lib}/libssp_nonshared.a
-%endif
+chmod -x $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a
+
+# remove documentation makefiles:
+# they require the build directory to work
+find examples -name 'Makefile' | xargs -0r rm -f
%clean
rm -rf $RPM_BUILD_ROOT
@@ -204,8 +245,6 @@
%defattr(644,root,root,755)
%doc CREDITS.TXT LICENSE.TXT README.txt
%attr(755,root,root) %{_bindir}/bugpoint
-%attr(755,root,root) %{_bindir}/gccas
-%attr(755,root,root) %{_bindir}/gccld
%attr(755,root,root) %{_bindir}/llc
%attr(755,root,root) %{_bindir}/lli
%attr(755,root,root) %{_bindir}/opt
@@ -215,6 +254,7 @@
%{_mandir}/man1/bugpoint.1*
%{_mandir}/man1/llc.1*
%{_mandir}/man1/lli.1*
+%{_mandir}/man1/llvmc.1*
%{_mandir}/man1/llvm-*.1*
%{_mandir}/man1/llvmgcc.1*
%{_mandir}/man1/llvmgxx.1*
@@ -222,59 +262,48 @@
#%{_mandir}/man1/stkrc.1*
%{_mandir}/man1/tblgen.1*
-
%files doc
%defattr(644,root,root,755)
-%doc docs/*.{html,css} docs/img examples
+%doc docs/*.{html,css} docs/img examples moredocs/html
%files devel
%defattr(644,root,root,755)
+#%doc docs/doxygen
%attr(755,root,root) %{_bindir}/llvm-config
%{_includedir}/llvm
%{_includedir}/llvm-c
-%{_libdir}/llvm/LLVM*.o
-%{_libdir}/llvm/libLLVM*.a
+%{_libdir}/%{name}
-%if %{with gcc}
-%files gcc
+%files -n clang
%defattr(644,root,root,755)
-#%attr(755,root,root) %{_bindir}/llvm2cpp
-#%attr(755,root,root) %{_bindir}/llvmc
-#%dir %{_sysconfdir}
-#%verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/c
-#%verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/cpp
-#%verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/ll
-#%verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/st
-#%{_mandir}/man1/llvm2cpp.1*
-#%{_mandir}/man1/llvmc.1*
-%attr(755,root,root) %{_bindir}/llvm-gcc
-%dir %{_libdir}/llvm-gcc
-%dir %{_libdir}/llvm-gcc/bin
-%dir %{_libdir}/llvm-gcc/include
-%dir %{_libdir}/llvm-gcc/%{_lib}
-%dir %{_libdir}/llvm-gcc/libexec
-%dir %{_libdir}/llvm-gcc/libexec/gcc
-%dir %{_libdir}/llvm-gcc/libexec/gcc/%{_target_platform}/%{lgcc_version}
-%{_libdir}/llvm-gcc/%{_lib}/gcc
-%{_libdir}/llvm-gcc/%{_lib}/libmudflap*.a
-%attr(755,root,root) %{_libdir}/llvm-gcc/bin/%{_target_platform}-llvm-gcc
-%attr(755,root,root) %{_libdir}/llvm-gcc/bin/llvm-gcc
-%{_libdir}/llvm-gcc/libexec/gcc/%{_target_platform}/%{lgcc_version}/cc1
-%{_libdir}/llvm-gcc/libexec/gcc/%{_target_platform}/%{lgcc_version}/collect2
-%{_mandir}/man1/llvm-gcc.*
+%doc clang-docs/*
+%doc tools/clang/docs/*
+%attr(755,root,root) %{_bindir}/clang*
+%attr(755,root,root) %{_bindir}/FileCheck
+%attr(755,root,root) %{_bindir}/FileUpdate
+%attr(755,root,root) %{_bindir}/tblgen
+%{_prefix}/lib/clang
+%{_libexecdir}/clang-cc
+%{_mandir}/man1/clang.1.*
+%{_mandir}/man1/FileCheck.1.*
-%files gcc-c++
+%files -n clang-analyzer
%defattr(644,root,root,755)
-#%verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/c++
-#%verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/cxx
-%attr(755,root,root) %{_bindir}/llvm-[cg]++
-%{_libdir}/llvm-gcc/%{_lib}/lib*++.a
-%attr(755,root,root) %{_libdir}/llvm-gcc/bin/%{_target_platform}-llvm-[cg]++
-%attr(755,root,root) %{_libdir}/llvm-gcc/bin/llvm-[cg]++
-%{_libdir}/llvm-gcc/include/c++
-%attr(755,root,root) %{_libdir}/llvm-gcc/libexec/gcc/%{_target_platform}/%{lgcc_version}/cc1plus
-%{_mandir}/man1/llvm-g++.*
-%endif
+%attr(755,root,root) %{_bindir}/scan-build
+%attr(755,root,root) %{_bindir}/scan-view
+%{_libdir}/clang-analyzer
+
+%files ocaml
+%defattr(644,root,root,755)
+%doc moredocs/ocamldoc/html/*
+%{_libdir}/ocaml/*.cma
+%{_libdir}/ocaml/*.cmi
+
+%files ocaml-devel
+%defattr(644,root,root,755)
+%{_libdir}/ocaml/*.a
+%{_libdir}/ocaml/*.cmx*
+%{_libdir}/ocaml/*.mli
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -282,6 +311,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.11 2009/09/19 20:00:56 arekm
+- up to 2.6 prerelease
+
Revision 1.10 2009/04/12 05:44:27 aredridel
- 2.5
================================================================
Index: packages/llvm/llvm-2.5-tclsh_check.patch
diff -u /dev/null packages/llvm/llvm-2.5-tclsh_check.patch:1.1
--- /dev/null Sat Sep 19 22:01:02 2009
+++ packages/llvm/llvm-2.5-tclsh_check.patch Sat Sep 19 22:00:56 2009
@@ -0,0 +1,211 @@
+
+
+
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!-- ViewVC :: http://www.viewvc.org/ -->
+<head>
+<title>[pkgs] View of /devel/llvm/llvm-2.5-tclsh_check.patch</title>
+<meta name="generator" content="ViewVC 1.0.9" />
+<link rel="stylesheet" href="/viewvc-static/styles.css" type="text/css" />
+
+</head>
+<body>
+<div class="vc_navheader">
+
+<form method="get" action="/viewvc/">
+
+<table style="padding:0.1em;">
+<tr>
+<td>
+<strong>
+
+<a href="/viewvc/">
+
+[pkgs]</a>
+/
+
+<a href="/viewvc/devel/">
+
+devel</a>
+/
+
+<a href="/viewvc/devel/llvm/">
+
+llvm</a>
+/
+
+<a href="/viewvc/devel/llvm/llvm-2.5-tclsh_check.patch?view=log">
+
+llvm-2.5-tclsh_check.patch</a>
+
+
+</strong>
+
+</td>
+<td style="text-align:right;">
+
+
+<strong>Repository:</strong>
+<select name="root" onchange="submit()">
+
+
+<option value="*viewroots*">Repository Listing</option>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<optgroup label="CVS Repositories"><option>core</option><option>dirsec</option><option>docs</option><option>elvis</option><option>extras</option><option>fedora</option><option>l10n</option><option>legacy</option><option selected="selected">pkgs</option></optgroup>
+
+
+</select>
+<input type="submit" value="Go" />
+
+</td>
+</tr>
+</table>
+
+</form>
+
+</div>
+<div style="float: right; padding: 5px;"><a href="http://www.viewvc.org/"><img src="/viewvc-static/images/logo.png" alt="ViewVC logotype" width="128" height="48" /></a></div>
+<h1>View of /devel/llvm/llvm-2.5-tclsh_check.patch</h1>
+
+<p style="margin:0;">
+
+<a href="/viewvc/devel/llvm/"><img src="/viewvc-static/images/back_small.png" width="16" height="16" alt="Parent Directory" /> Parent Directory</a>
+
+| <a href="/viewvc/devel/llvm/llvm-2.5-tclsh_check.patch?view=log#rev1.1"><img src="/viewvc-static/images/log.png" width="16" height="16" alt="Revision Log" /> Revision Log</a>
+
+
+
+
+</p>
+
+<hr />
+<div class="vc_summary">
+Revision <strong>1.1</strong> -
+(<a href="/viewvc/devel/llvm/llvm-2.5-tclsh_check.patch?revision=1.1"><strong>download</strong></a>)
+
+(<a href="/viewvc/devel/llvm/llvm-2.5-tclsh_check.patch?annotate=1.1"><strong>annotate</strong></a>)
+
+<br /><em>Sun Sep 6 03:00:39 2009 UTC</em>
+(13 days, 15 hours ago)
+by <em>salimma</em>
+
+
+<br />Branch: <strong>MAIN</strong>
+
+
+<br />CVS Tags: <strong>llvm-2_5-6_fc12, llvm-2_6-0_5_pre1_fc12, llvm-2_6-0_3_pre1_fc12, llvm-2_6-0_2_pre1_fc12, llvm-2_6-0_4_pre1_fc12, llvm-2_6-0_1_pre1_fc12, HEAD</strong>
+
+
+
+
+
+
+
+
+<pre class="vc_log">Commit llvm-gcc source
+</pre>
+
+</div>
+<div id="vc_markup"><pre>--- llvm-2.5/configure.tclsh_check 2009-02-03 00:29:49.000000000 -0500
++++ llvm-2.5/configure 2009-09-05 12:25:54.761389908 -0400
+@@ -8032,7 +8032,7 @@
+ else
+
+ if test x"${with_tclinclude}" != x ; then
+- if test -f ${with_tclinclude}/tclsh ; then
++ if test -f ${with_tclinclude}/tcl.h ; then
+ ac_cv_path_tclsh=`(cd ${with_tclinclude}; pwd)`
+ elif test -f ${with_tclinclude}/src/tclsh ; then
+ ac_cv_path_tclsh=`(cd ${with_tclinclude}/src; pwd)`
+</pre></div>
+
+<hr />
+<table>
+<tr>
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/llvm/llvm.spec?r1=1.10&r2=1.11&f=u
More information about the pld-cvs-commit
mailing list