From b78904250a626648316c6390a3ab6026b60e3fd6 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Sat, 23 Jan 2010 20:11:36 +0000
Subject: [PATCH] upgrading package: llvm 2.4 -> 2.6

---
 llvm/llvm.patch | 21 +++++++++++++++++++++
 llvm/llvm.spec  | 28 +++++++++++++---------------
 2 files changed, 34 insertions(+), 15 deletions(-)
 create mode 100644 llvm/llvm.patch

diff --git a/llvm/llvm.patch b/llvm/llvm.patch
new file mode 100644
index 0000000000..0ee60e1ab8
--- /dev/null
+++ b/llvm/llvm.patch
@@ -0,0 +1,21 @@
+Index: autoconf/ExportMap.map
+--- autoconf/ExportMap.map.orig	2009-02-26 19:37:59 +0100
++++ autoconf/ExportMap.map	2010-01-23 10:15:28 +0100
+@@ -1,4 +1,4 @@
+ {
+-	global: main;
++	global: main; environ; __progname;
+ 	local: *;
+ };
+Index: Makefile.config.in
+--- Makefile.config.in.orig	2009-08-18 02:40:33 +0200
++++ Makefile.config.in	2010-01-23 13:51:58 +0100
+@@ -83,7 +83,7 @@
+ 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_mandir     := $(DESTDIR)$(PROJ_prefix)/man
+ 
+ # Determine if we're on a unix type operating system
+ LLVM_ON_UNIX:=@LLVM_ON_UNIX@
diff --git a/llvm/llvm.spec b/llvm/llvm.spec
index 5569d094d6..40ec784503 100644
--- a/llvm/llvm.spec
+++ b/llvm/llvm.spec
@@ -31,12 +31,13 @@ Distribution: OpenPKG Community
 Class:        EVAL
 Group:        Compiler
 License:      University of Illinois Open Source License
-Version:      2.4
-Release:      20081110
+Version:      2.6
+Release:      20100123
 
 #   list of sources
 Source0:      http://llvm.org/releases/%{version}/llvm-%{version}.tar.gz
-Source1:      http://download.openpkg.org/components/versioned/clang/clang-20080620.tar.gz
+Source1:      http://llvm.org/releases/%{version}/clang-%{version}.tar.gz
+Patch0:       llvm.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -72,10 +73,8 @@ AutoReqProv:  no
 %prep
     %setup -q
     %setup -q -T -D -a 1
-    mv clang tools/clang
-    %{l_shtool} subst \
-        -e 's;\(llvmc2\);\1 clang;' \
-        tools/Makefile
+    mv clang-%{version} tools/clang
+    %patch -p0
 
 %build
     CC="%{l_cc}" \
@@ -86,21 +85,20 @@ AutoReqProv:  no
     LDFLAGS="%{l_ldflags}" \
     ./configure \
         --prefix=%{l_prefix} \
-        --mandir=%{l_prefix}/man
+        --enable-pic \
+        --with-pic \
+        --enable-bindings=none \
+        --enable-optimized \
+        --disable-assertions
     %{l_make} %{l_mflags -O}
 
 %install
     rm -rf $RPM_BUILD_ROOT
     %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
-    %{l_shtool} mkdir -f -p -m 755 \
-       $RPM_BUILD_ROOT%{l_prefix}/share
-    mv $RPM_BUILD_ROOT%{l_prefix}/docs/llvm \
-       $RPM_BUILD_ROOT%{l_prefix}/share/llvm
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/docs
     find $RPM_BUILD_ROOT%{l_prefix} -name ".dir" -type f -print | xargs rm -f
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
-    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
-        %{l_files_std} \
-        '%config %{l_prefix}/etc/llvm/*'
+    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
 
 %files -f files