]> git.pld-linux.org Git - packages/llvm.git/commitdiff
- up to 2.6 prerelease
authorArkadiusz Miśkiewicz <arekm@maven.pl>
Sat, 19 Sep 2009 20:00:56 +0000 (20:00 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    llvm-2.5-tclsh_check.patch -> 1.1
    llvm-2.6-destdir-clang.patch -> 1.1
    llvm-2.6-destdir.patch -> 1.1
    llvm-2.6-timestamp.patch -> 1.1
    llvm-dirs.patch -> 1.2
    llvm.spec -> 1.11

llvm-2.5-tclsh_check.patch [new file with mode: 0644]
llvm-2.6-destdir-clang.patch [new file with mode: 0644]
llvm-2.6-destdir.patch [new file with mode: 0644]
llvm-2.6-timestamp.patch [new file with mode: 0644]
llvm-dirs.patch [deleted file]
llvm.spec

diff --git a/llvm-2.5-tclsh_check.patch b/llvm-2.5-tclsh_check.patch
new file mode 100644 (file)
index 0000000..30d45ea
--- /dev/null
@@ -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>
+<td><address><a href="mailto:webmaster@fedoraproject.org">webmaster@fedoraproject.org</a></address></td>
+<td style="text-align: right;"><strong><a href="/viewvc-static/help_rootview.html">ViewVC Help</a></strong></td>
+</tr>
+<tr>
+<td>Powered by <a href="http://viewvc.tigris.org/">ViewVC 1.0.9</a></td>
+<td style="text-align: right;">&nbsp;</td>
+</tr>
+</table>
+</body>
+</html>
+
diff --git a/llvm-2.6-destdir-clang.patch b/llvm-2.6-destdir-clang.patch
new file mode 100644 (file)
index 0000000..584afa5
--- /dev/null
@@ -0,0 +1,99 @@
+From 01c48a60e0a3bcd2e4d6829f2f0186d4ee6ef504 Mon Sep 17 00:00:00 2001
+From: Erick Tryzelaar <erickt@pixar.com>
+Date: Fri, 21 Aug 2009 12:37:18 -0700
+Subject: [PATCH] Use LLVM's new DESTDIR-less PROJ_* variables.
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="------------1.6.4"
+
+This is a multi-part message in MIME format.
+--------------1.6.4
+Content-Type: text/plain; charset=UTF-8; format=fixed
+Content-Transfer-Encoding: 8bit
+
+---
+ docs/Makefile           |   18 +++++++++---------
+ docs/tools/Makefile     |    6 +++---
+ tools/clang-cc/Makefile |    2 +-
+ 3 files changed, 13 insertions(+), 13 deletions(-)
+
+
+--------------1.6.4
+Content-Type: text/x-patch; name="0001-Use-LLVM-s-new-DESTDIR-less-PROJ_-variables.patch"
+Content-Transfer-Encoding: 8bit
+Content-Disposition: attachment; filename="0001-Use-LLVM-s-new-DESTDIR-less-PROJ_-variables.patch"
+
+diff --git docs/Makefile docs/Makefile
+index 9b706c7..e9bbb28 100644
+--- docs/Makefile
++++ docs/Makefile
+@@ -48,11 +48,11 @@ generated:: doxygen
+ install-html: $(PROJ_OBJ_DIR)/html.tar.gz
+       $(Echo) Installing HTML documentation
+-      $(Verb) $(MKDIR) $(PROJ_docsdir)/html
+-      $(Verb) $(MKDIR) $(PROJ_docsdir)/html/img
+-      $(Verb) $(DataInstall) $(HTML) $(PROJ_docsdir)/html
+-#     $(Verb) $(DataInstall) $(IMAGES) $(PROJ_docsdir)/html/img
+-      $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(PROJ_docsdir)
++      $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html
++      $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img
++      $(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html
++#     $(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img
++      $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir)
+ $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
+       $(Echo) Packaging HTML documentation
+@@ -63,11 +63,11 @@ $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
+ install-doxygen: doxygen
+       $(Echo) Installing doxygen documentation
+-      $(Verb) $(MKDIR) $(PROJ_docsdir)/html/doxygen
+-      $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(PROJ_docsdir)
++      $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen
++      $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir)
+       $(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \
+         $(FIND) . -type f -exec \
+-          $(DataInstall) {} $(PROJ_docsdir)/html/doxygen \;
++          $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \;
+ doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz
+@@ -94,4 +94,4 @@ $(LLVM_SRC_ROOT)/docs/userloc.html:
+ uninstall-local::
+       $(Echo) Uninstalling Documentation
+-      $(Verb) $(RM) -rf $(PROJ_docsdir)
++      $(Verb) $(RM) -rf $(DESTDIR)$(PROJ_docsdir)
+diff --git docs/tools/Makefile docs/tools/Makefile
+index 90eb776..8107754 100644
+--- docs/tools/Makefile
++++ docs/tools/Makefile
+@@ -81,9 +81,9 @@ EXTRA_DIST := $(POD)
+ clean-local::
+       $(Verb) $(RM) -f pod2htm*.*~~ $(HTML) $(MAN) $(PS)
+-HTML_DIR := $(PROJ_docsdir)/html/clang
+-MAN_DIR  := $(PROJ_mandir)/man1
+-PS_DIR   := $(PROJ_docsdir)/ps
++HTML_DIR := $(DESTDIR)$(PROJ_docsdir)/html/clang
++MAN_DIR  := $(DESTDIR)$(PROJ_mandir)/man1
++PS_DIR   := $(DESTDIR)$(PROJ_docsdir)/ps
+ install-html:: $(HTML)
+       $(Echo) Installing HTML Clang Tools Documentation
+diff --git tools/clang-cc/Makefile tools/clang-cc/Makefile
+index 874a42f..7c31f37 100644
+--- tools/clang-cc/Makefile
++++ tools/clang-cc/Makefile
+@@ -27,6 +27,6 @@ USEDLIBS = clangFrontend.a clangCodeGen.a clangAnalysis.a    \
+ # clang-cc lives in a special location; we can get away with this
+ # because nothing else gets installed from here.
+-PROJ_bindir := $(DESTDIR)$(PROJ_prefix)/libexec
++PROJ_bindir := $(PROJ_prefix)/libexec
+ include $(LLVM_SRC_ROOT)/Makefile.rules
+
+--------------1.6.4--
+
+
diff --git a/llvm-2.6-destdir.patch b/llvm-2.6-destdir.patch
new file mode 100644 (file)
index 0000000..f65204d
--- /dev/null
@@ -0,0 +1,361 @@
+From 5a380ce5d1c8d5a1474764a7a54a1e2072fddb03 Mon Sep 17 00:00:00 2001
+From: Erick Tryzelaar <idadesub@users.sourceforge.net>
+Date: Fri, 21 Aug 2009 11:59:01 -0700
+Subject: [PATCH] Rewrite makefiles to explicitly reference DESTDIR so we can not bake DESTDIR
+ into the O'Caml symlinks.
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="------------1.6.4"
+
+This is a multi-part message in MIME format.
+--------------1.6.4
+Content-Type: text/plain; charset=UTF-8; format=fixed
+Content-Transfer-Encoding: 8bit
+
+---
+ Makefile.config.in         |   16 +++++++-------
+ Makefile.rules             |   46 ++++++++++++++++++++++----------------------
+ docs/CommandGuide/Makefile |    6 ++--
+ docs/Makefile              |   24 +++++++++++-----------
+ docs/tutorial/Makefile     |    2 +-
+ lib/VMCore/Makefile        |    4 +-
+ tools/gccas/Makefile       |    4 +-
+ tools/gccld/Makefile       |    4 +-
+ tools/llvm-config/Makefile |    4 +-
+ 9 files changed, 55 insertions(+), 55 deletions(-)
+
+
+--------------1.6.4
+Content-Type: text/x-patch; name="0001-Rewrite-makefiles-to-explicitly-reference-DESTDIR-so.patch"
+Content-Transfer-Encoding: 8bit
+Content-Disposition: attachment; filename="0001-Rewrite-makefiles-to-explicitly-reference-DESTDIR-so.patch"
+
+diff --git Makefile.config.in Makefile.config.in
+index ecd0595..73656f7 100644
+--- Makefile.config.in
++++ Makefile.config.in
+@@ -76,14 +76,14 @@ endif
+ LLVMMAKE := $(LLVM_SRC_ROOT)/make
+-PROJ_bindir     := $(DESTDIR)$(PROJ_prefix)/bin
+-PROJ_libdir     := $(DESTDIR)$(PROJ_prefix)/lib
+-PROJ_datadir    := $(DESTDIR)$(PROJ_prefix)/share
+-PROJ_docsdir    := $(DESTDIR)$(PROJ_prefix)/docs/llvm
+-PROJ_etcdir     := $(DESTDIR)$(PROJ_prefix)/etc/llvm
+-PROJ_includedir := $(DESTDIR)$(PROJ_prefix)/include
+-PROJ_infodir    := $(DESTDIR)$(PROJ_prefix)/info
+-PROJ_mandir     := $(DESTDIR)$(PROJ_prefix)/share/man
++PROJ_bindir     := $(PROJ_prefix)/bin
++PROJ_libdir     := $(PROJ_prefix)/lib
++PROJ_datadir    := $(PROJ_prefix)/share
++PROJ_docsdir    := $(PROJ_prefix)/docs/llvm
++PROJ_etcdir     := $(PROJ_prefix)/etc/llvm
++PROJ_includedir := $(PROJ_prefix)/include
++PROJ_infodir    := $(PROJ_prefix)/info
++PROJ_mandir     := $(PROJ_prefix)/share/man
+ # Determine if we're on a unix type operating system
+ LLVM_ON_UNIX:=@LLVM_ON_UNIX@
+diff --git Makefile.rules Makefile.rules
+index 5556684..08965f3 100644
+--- Makefile.rules
++++ Makefile.rules
+@@ -720,7 +720,7 @@ ObjectsBC := $(BaseNameSources:%=$(ObjDir)/%.bc)
+ # in the file so they get built before dependencies
+ #---------------------------------------------------------
+-$(PROJ_bindir) $(PROJ_libdir) $(PROJ_includedir) $(PROJ_etcdir)::
++$(DESTDIR)$(PROJ_bindir) $(DESTDIR)$(PROJ_libdir) $(DESTDIR)$(PROJ_includedir) $(DESTDIR)$(PROJ_etcdir)::
+       $(Verb) $(MKDIR) $@
+ # To create other directories, as needed, and timestamp their creation
+@@ -842,22 +842,22 @@ install-local::
+ uninstall-local::
+       $(Echo) UnInstall circumvented with NO_INSTALL
+ else
+-install-local:: $(PROJ_etcdir) $(CONFIG_FILES)
+-      $(Echo) Installing Configuration Files To $(PROJ_etcdir)
++install-local:: $(DESTDIR)$(PROJ_etcdir) $(CONFIG_FILES)
++      $(Echo) Installing Configuration Files To $(DESTDIR)$(PROJ_etcdir)
+       $(Verb)for file in $(CONFIG_FILES); do \
+           if test -f $(PROJ_OBJ_DIR)/$${file} ; then \
+-            $(DataInstall) $(PROJ_OBJ_DIR)/$${file} $(PROJ_etcdir) ; \
++            $(DataInstall) $(PROJ_OBJ_DIR)/$${file} $(DESTDIR)$(PROJ_etcdir) ; \
+           elif test -f $(PROJ_SRC_DIR)/$${file} ; then \
+-            $(DataInstall) $(PROJ_SRC_DIR)/$${file} $(PROJ_etcdir) ; \
++            $(DataInstall) $(PROJ_SRC_DIR)/$${file} $(DESTDIR)$(PROJ_etcdir) ; \
+           else \
+             $(ECHO) Error: cannot find config file $${file}. ; \
+           fi \
+       done
+ uninstall-local::
+-      $(Echo) Uninstalling Configuration Files From $(PROJ_etcdir)
++      $(Echo) Uninstalling Configuration Files From $(DESTDIR)$(PROJ_etcdir)
+       $(Verb)for file in $(CONFIG_FILES); do \
+-        $(RM) -f $(PROJ_etcdir)/$${file} ; \
++        $(RM) -f $(DESTDIR)$(PROJ_etcdir)/$${file} ; \
+       done
+ endif
+@@ -944,7 +944,7 @@ endif
+ ifdef BYTECODE_DESTINATION
+ ModuleDestDir := $(BYTECODE_DESTINATION)
+ else
+-ModuleDestDir := $(PROJ_libdir)
++ModuleDestDir := $(DESTDIR)$(PROJ_libdir)
+ endif
+ ifdef NO_INSTALL
+@@ -1023,17 +1023,17 @@ install-local::
+ uninstall-local::
+       $(Echo) Uninstall circumvented with NO_INSTALL
+ else
+-DestSharedLib = $(PROJ_libdir)/lib$(LIBRARYNAME)$(SHLIBEXT)
++DestSharedLib = $(DESTDIR)$(PROJ_libdir)/lib$(LIBRARYNAME)$(SHLIBEXT)
+ install-local:: $(DestSharedLib)
+-$(DestSharedLib): $(LibName.SO) $(PROJ_libdir)
++$(DestSharedLib): $(LibName.SO) $(DESTDIR)$(PROJ_libdir)
+       $(Echo) Installing $(BuildMode) Shared Library $(DestSharedLib)
+       $(Verb) $(INSTALL) $(LibName.SO) $(DestSharedLib)
+ uninstall-local::
+       $(Echo) Uninstalling $(BuildMode) Shared Library $(DestSharedLib)
+-      -$(Verb) $(RM) -f $(PROJ_libdir)/lib$(LIBRARYNAME).*
++      -$(Verb) $(RM) -f $(DESTDIR)$(PROJ_libdir)/lib$(LIBRARYNAME).*
+ endif
+ endif
+@@ -1078,7 +1078,7 @@ endif
+ ifdef BYTECODE_DESTINATION
+ BytecodeDestDir := $(BYTECODE_DESTINATION)
+ else
+-BytecodeDestDir := $(PROJ_libdir)
++BytecodeDestDir := $(DESTDIR)$(PROJ_libdir)
+ endif
+ DestBytecodeLib = $(BytecodeDestDir)/lib$(LIBRARYNAME).bca
+@@ -1141,13 +1141,13 @@ install-local::
+ uninstall-local::
+       $(Echo) Uninstall circumvented with NO_INSTALL
+ else
+-DestArchiveLib := $(PROJ_libdir)/lib$(LIBRARYNAME).a
++DestArchiveLib := $(DESTDIR)$(PROJ_libdir)/lib$(LIBRARYNAME).a
+ install-local:: $(DestArchiveLib)
+-$(DestArchiveLib): $(LibName.A) $(PROJ_libdir)
++$(DestArchiveLib): $(LibName.A) $(DESTDIR)$(PROJ_libdir)
+       $(Echo) Installing $(BuildMode) Archive Library $(DestArchiveLib)
+-      $(Verb) $(MKDIR) $(PROJ_libdir)
++      $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_libdir)
+       $(Verb) $(INSTALL) $(LibName.A) $(DestArchiveLib)
+ uninstall-local::
+@@ -1225,11 +1225,11 @@ install-local::
+ uninstall-local::
+       $(Echo) Uninstall circumvented with NO_INSTALL
+ else
+-DestTool = $(PROJ_bindir)/$(TOOLNAME)$(EXEEXT)
++DestTool = $(DESTDIR)$(PROJ_bindir)/$(TOOLNAME)$(EXEEXT)
+ install-local:: $(DestTool)
+-$(DestTool): $(ToolBuildPath) $(PROJ_bindir)
++$(DestTool): $(ToolBuildPath) $(DESTDIR)$(PROJ_bindir)
+       $(Echo) Installing $(BuildMode) $(DestTool)
+       $(Verb) $(ProgInstall) $(ToolBuildPath) $(DestTool)
+@@ -1824,25 +1824,25 @@ uninstall-local::
+ else
+ install-local::
+       $(Echo) Installing include files
+-      $(Verb) $(MKDIR) $(PROJ_includedir)
++      $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_includedir)
+       $(Verb) if test -d "$(PROJ_SRC_ROOT)/include" ; then \
+         cd $(PROJ_SRC_ROOT)/include && \
+         for  hdr in `find . -type f '!' '(' -name '*~' \
+             -o -name '.#*' -o -name '*.in' ')' -print | grep -v CVS | \
+             grep -v .svn` ; do \
+-          instdir=`dirname "$(PROJ_includedir)/$$hdr"` ; \
++          instdir=`dirname "$(DESTDIR)$(PROJ_includedir)/$$hdr"` ; \
+           if test \! -d "$$instdir" ; then \
+             $(EchoCmd) Making install directory $$instdir ; \
+             $(MKDIR) $$instdir ;\
+           fi ; \
+-          $(DataInstall) $$hdr $(PROJ_includedir)/$$hdr ; \
++          $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
+         done ; \
+       fi
+ ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
+       $(Verb) if test -d "$(PROJ_OBJ_ROOT)/include" ; then \
+         cd $(PROJ_OBJ_ROOT)/include && \
+         for hdr in `find . -type f -print | grep -v CVS` ; do \
+-          $(DataInstall) $$hdr $(PROJ_includedir)/$$hdr ; \
++          $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
+         done ; \
+       fi
+ endif
+@@ -1854,10 +1854,10 @@ uninstall-local::
+           $(RM) -f `find . -path '*/Internal' -prune -o '(' -type f \
+             '!' '(' -name '*~' -o -name '.#*' \
+         -o -name '*.in' ')' -print ')' | \
+-        grep -v CVS | sed 's#^#$(PROJ_includedir)/#'` ; \
++        grep -v CVS | sed 's#^#$(DESTDIR)$(PROJ_includedir)/#'` ; \
+         cd $(PROJ_SRC_ROOT)/include && \
+           $(RM) -f `find . -path '*/Internal' -prune -o '(' -type f -name '*.in' \
+-      -print ')' | sed 's#\.in$$##;s#^#$(PROJ_includedir)/#'` ; \
++      -print ')' | sed 's#\.in$$##;s#^#$(DESTDIR)$(PROJ_includedir)/#'` ; \
+       fi
+ endif
+ endif
+diff --git docs/CommandGuide/Makefile docs/CommandGuide/Makefile
+index cf77e6a..28835ac 100644
+--- docs/CommandGuide/Makefile
++++ docs/CommandGuide/Makefile
+@@ -71,9 +71,9 @@ EXTRA_DIST := $(POD) index.html
+ clean-local::
+       $(Verb) $(RM) -f pod2htm*.*~~ $(HTML) $(MAN) $(PS)
+-HTML_DIR := $(PROJ_docsdir)/html/CommandGuide
+-MAN_DIR  := $(PROJ_mandir)/man1
+-PS_DIR   := $(PROJ_docsdir)/ps
++HTML_DIR := $(DESTDIR)$(PROJ_docsdir)/html/CommandGuide
++MAN_DIR  := $(DESTDIR)$(PROJ_mandir)/man1
++PS_DIR   := $(DESTDIR)$(PROJ_docsdir)/ps
+ install-local:: $(HTML) $(MAN) $(PS)
+       $(Echo) Installing HTML CommandGuide Documentation
+diff --git docs/Makefile docs/Makefile
+index 310c4bd..30cd8a7 100644
+--- docs/Makefile
++++ docs/Makefile
+@@ -48,11 +48,11 @@ generated:: doxygen ocamldoc
+ install-html: $(PROJ_OBJ_DIR)/html.tar.gz
+       $(Echo) Installing HTML documentation
+-      $(Verb) $(MKDIR) $(PROJ_docsdir)/html
+-      $(Verb) $(MKDIR) $(PROJ_docsdir)/html/img
+-      $(Verb) $(DataInstall) $(HTML) $(PROJ_docsdir)/html
+-      $(Verb) $(DataInstall) $(IMAGES) $(PROJ_docsdir)/html/img
+-      $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(PROJ_docsdir)
++      $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html
++      $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img
++      $(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html
++      $(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img
++      $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir)
+ $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
+       $(Echo) Packaging HTML documentation
+@@ -63,11 +63,11 @@ $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
+ install-doxygen: doxygen
+       $(Echo) Installing doxygen documentation
+-      $(Verb) $(MKDIR) $(PROJ_docsdir)/html/doxygen
+-      $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(PROJ_docsdir)
++      $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen
++      $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir)
+       $(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \
+         $(FIND) . -type f -exec \
+-          $(DataInstall) {} $(PROJ_docsdir)/html/doxygen \;
++          $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \;
+ doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz
+@@ -94,11 +94,11 @@ $(LLVM_SRC_ROOT)/docs/userloc.html:
+ install-ocamldoc: ocamldoc
+       $(Echo) Installing ocamldoc documentation
+-      $(Verb) $(MKDIR) $(PROJ_docsdir)/ocamldoc/html
+-      $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_docsdir)
++      $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html
++      $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(DESTDIR)$(PROJ_docsdir)
+       $(Verb) cd $(PROJ_OBJ_DIR)/ocamldoc && \
+         $(FIND) . -type f -exec \
+-          $(DataInstall) {} $(PROJ_docsdir)/ocamldoc/html \;
++          $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html \;
+ ocamldoc: regen-ocamldoc $(PROJ_OBJ_DIR)/ocamldoc.tar.gz
+@@ -122,4 +122,4 @@ $(PROJ_OBJ_DIR)/ocamldoc.tar.gz:
+ uninstall-local::
+       $(Echo) Uninstalling Documentation
+-      $(Verb) $(RM) -rf $(PROJ_docsdir)
++      $(Verb) $(RM) -rf $(DESTDIR)$(PROJ_docsdir)
+diff --git docs/tutorial/Makefile docs/tutorial/Makefile
+index 6169bb8..9082ad4 100644
+--- docs/tutorial/Makefile
++++ docs/tutorial/Makefile
+@@ -12,7 +12,7 @@ include $(LEVEL)/Makefile.common
+ HTML       := $(wildcard $(PROJ_SRC_DIR)/*.html)
+ EXTRA_DIST := $(HTML) index.html
+-HTML_DIR   := $(PROJ_docsdir)/html/tutorial
++HTML_DIR   := $(DESTDIR)$(PROJ_docsdir)/html/tutorial
+ install-local:: $(HTML)
+       $(Echo) Installing HTML Tutorial Documentation
+diff --git lib/VMCore/Makefile lib/VMCore/Makefile
+index e9d3dc8..c4817a5 100644
+--- lib/VMCore/Makefile
++++ lib/VMCore/Makefile
+@@ -29,5 +29,5 @@ $(GENFILE): $(ObjDir)/Intrinsics.gen.tmp
+           changed significantly. )
+ install-local:: $(GENFILE)
+-      $(Echo) Installing $(PROJ_includedir)/llvm/Intrinsics.gen
+-      $(Verb) $(DataInstall) $(GENFILE) $(PROJ_includedir)/llvm/Intrinsics.gen
++      $(Echo) Installing $(DESTDIR)$(PROJ_includedir)/llvm/Intrinsics.gen
++      $(Verb) $(DataInstall) $(GENFILE) $(DESTDIR)$(PROJ_includedir)/llvm/Intrinsics.gen
+diff --git tools/gccas/Makefile tools/gccas/Makefile
+index ff84d96..594f9e4 100644
+--- tools/gccas/Makefile
++++ tools/gccas/Makefile
+@@ -10,9 +10,9 @@ LEVEL = ../..
+ include $(LEVEL)/Makefile.common
+-install-local:: $(PROJ_bindir)/gccas
++install-local:: $(DESTDIR)$(PROJ_bindir)/gccas
+       
+-$(PROJ_bindir)/gccas : gccas.sh Makefile
++$(DESTDIR)$(PROJ_bindir)/gccas : gccas.sh Makefile
+       $(Echo) Installing gccas shell script.
+       $(Verb) sed "s#@TOOLDIR@#$(PROJ_bindir)#" $< > $@
+       $(Verb) chmod 0755 $@
+diff --git tools/gccld/Makefile tools/gccld/Makefile
+index b2d3f73..8ec0307 100644
+--- tools/gccld/Makefile
++++ tools/gccld/Makefile
+@@ -11,9 +11,9 @@ LEVEL = ../..
+ include $(LEVEL)/Makefile.common
+-install-local:: $(PROJ_bindir)/gccld
++install-local:: $(DESTDIR)$(PROJ_bindir)/gccld
+       
+-$(PROJ_bindir)/gccld : gccld.sh Makefile
++$(DESTDIR)$(PROJ_bindir)/gccld : gccld.sh Makefile
+       $(Echo) Installing gccld shell script.
+       $(Verb) sed "s#@TOOLDIR@#$(PROJ_bindir)#" $< > $@
+       $(Verb) chmod 0755 $@
+diff --git tools/llvm-config/Makefile tools/llvm-config/Makefile
+index 6eedca0..8659681 100644
+--- tools/llvm-config/Makefile
++++ tools/llvm-config/Makefile
+@@ -87,6 +87,6 @@ clean-local::
+         $(LibDeps) GenLibDeps.out
+ install-local:: all-local
+       $(Echo) Installing llvm-config
+-      $(Verb) $(MKDIR) $(PROJ_bindir)
+-      $(Verb) $(ScriptInstall) $(ToolDir)/llvm-config $(PROJ_bindir)
++      $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_bindir)
++      $(Verb) $(ScriptInstall) $(ToolDir)/llvm-config $(DESTDIR)$(PROJ_bindir)
+
+--------------1.6.4--
+
+
diff --git a/llvm-2.6-timestamp.patch b/llvm-2.6-timestamp.patch
new file mode 100644 (file)
index 0000000..ab0979e
--- /dev/null
@@ -0,0 +1,11 @@
+--- llvm-2.6/Makefile.rules.timestamp  2009-08-19 18:04:44.000000000 -0400
++++ llvm-2.6/Makefile.rules    2009-09-09 02:10:38.287389725 -0400
+@@ -672,7 +672,7 @@
+ ProgInstall   = $(INSTALL) $(Install.StripFlag) -m 0755
+ ScriptInstall = $(INSTALL) -m 0755
+-DataInstall   = $(INSTALL) -m 0644
++DataInstall   = $(INSTALL) -p -m 0644
+ # When compiling under Mingw/Cygwin, the tblgen tool expects Windows
+ # paths. In this case, the SYSPATH function (defined in
diff --git a/llvm-dirs.patch b/llvm-dirs.patch
deleted file mode 100644 (file)
index 3a0c03a..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
---- Makefile.config.in~        2007-10-21 15:22:13.000000000 +0200
-+++ Makefile.config.in 2007-10-21 15:26:03.219091571 +0200
-@@ -49,7 +49,18 @@
- PROJ_SRC_DIR    := $(shell cd $(LLVM_SRC_ROOT)/$(patsubst $(PROJ_OBJ_ROOT)%,%,$(PROJ_OBJ_DIR)); $(PWD))
- prefix          := @prefix@
- PROJ_prefix     := $(prefix)
-+
-+bindir     := @bindir@
-+libdir     := @libdir@
-+datadir    := @datadir@
-+docsdir    := @docsdir@
-+etcdir     := @sysconfdir@
-+includedir := @includedir@
-+infodir    := @infodir@
-+mandir     := @mandir@
-+
- PROJ_VERSION    := $(LLVMVersion)
-+
- else
- ifndef PROJ_SRC_ROOT
- $(error Projects must define PROJ_SRC_ROOT)
-@@ -76,14 +76,14 @@
- LLVMMAKE := $(LLVM_SRC_ROOT)/make
--PROJ_bindir     := $(DESTDIR)$(PROJ_prefix)/bin
--PROJ_libdir     := $(DESTDIR)$(PROJ_prefix)/lib
--PROJ_datadir    := $(DESTDIR)$(PROJ_prefix)/share
--PROJ_docsdir    := $(DESTDIR)$(PROJ_prefix)/docs/llvm
--PROJ_etcdir     := $(DESTDIR)$(PROJ_prefix)/etc/llvm
--PROJ_includedir := $(DESTDIR)$(PROJ_prefix)/include
--PROJ_infodir    := $(DESTDIR)$(PROJ_prefix)/info
--PROJ_mandir     := $(DESTDIR)$(PROJ_prefix)/share/man
-+PROJ_bindir     := $(DESTDIR)$(bindir)
-+PROJ_libdir     := $(DESTDIR)$(libdir)
-+PROJ_datadir    := $(DESTDIR)$(datadir)
-+PROJ_docsdir    := $(DESTDIR)$(docsdir)
-+PROJ_etcdir     := $(DESTDIR)$(etcdir)
-+PROJ_includedir := $(DESTDIR)$(includedir)
-+PROJ_infodir    := $(DESTDIR)$(infodir)
-+PROJ_mandir     := $(DESTDIR)$(mandir)
- # Determine if we're on a unix type operating system
- LLVM_ON_UNIX:=@LLVM_ON_UNIX@
index fadfe58ef3b716da5b018e51cba4e1f06b331ba9..dd769556cf08ad9002639332a53d6a7ad1b4001e 100644 (file)
--- a/llvm.spec
+++ b/llvm.spec
@@ -2,29 +2,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
@@ -75,24 +82,6 @@ Requires:    libstdc++-devel >= 6:3.4
 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
@@ -112,86 +101,138 @@ Requires:        %{name}-ocaml = %{version}-%{release}
 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
@@ -203,8 +244,6 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -214,6 +253,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_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*
@@ -221,56 +261,45 @@ rm -rf $RPM_BUILD_ROOT
 #%{_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.*
-
-%files gcc-c++
+%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 -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
This page took 0.084438 seconds and 4 git commands to generate.