- Update to final 2.7 release
This commit is contained in:
Michel Alexandre Salim
parent
a1caa14611
commit
64041e30b5
@ -1,2 +1,2 @@
|
|||||||
llvm-2.7.tar.gz
|
clang-2.7.tgz
|
||||||
clang-2.7.tar.gz
|
llvm-2.7.tgz
|
||||||
|
|||||||
@ -1,11 +0,0 @@
|
|||||||
--- 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)`
|
|
||||||
@ -1,99 +0,0 @@
|
|||||||
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--
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,317 +0,0 @@
|
|||||||
diff -ru llvm-2.6.orig/docs/CommandGuide/Makefile llvm-2.6/docs/CommandGuide/Makefile
|
|
||||||
--- llvm-2.6.orig/docs/CommandGuide/Makefile 2009-08-31 02:25:32.000000000 -0400
|
|
||||||
+++ llvm-2.6/docs/CommandGuide/Makefile 2009-09-30 02:28:03.107649582 -0400
|
|
||||||
@@ -77,9 +77,9 @@
|
|
||||||
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) $(INSTALL_MANS) $(PS)
|
|
||||||
$(Echo) Installing HTML CommandGuide Documentation
|
|
||||||
diff -ru llvm-2.6.orig/docs/Makefile llvm-2.6/docs/Makefile
|
|
||||||
--- llvm-2.6.orig/docs/Makefile 2008-03-31 13:27:57.000000000 -0400
|
|
||||||
+++ llvm-2.6/docs/Makefile 2009-09-30 02:28:03.110650445 -0400
|
|
||||||
@@ -48,11 +48,11 @@
|
|
||||||
|
|
||||||
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 @@
|
|
||||||
|
|
||||||
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 @@
|
|
||||||
|
|
||||||
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 @@
|
|
||||||
|
|
||||||
uninstall-local::
|
|
||||||
$(Echo) Uninstalling Documentation
|
|
||||||
- $(Verb) $(RM) -rf $(PROJ_docsdir)
|
|
||||||
+ $(Verb) $(RM) -rf $(DESTDIR)$(PROJ_docsdir)
|
|
||||||
diff -ru llvm-2.6.orig/docs/tutorial/Makefile llvm-2.6/docs/tutorial/Makefile
|
|
||||||
--- llvm-2.6.orig/docs/tutorial/Makefile 2008-03-30 16:32:18.000000000 -0400
|
|
||||||
+++ llvm-2.6/docs/tutorial/Makefile 2009-09-30 02:28:03.112652092 -0400
|
|
||||||
@@ -12,7 +12,7 @@
|
|
||||||
|
|
||||||
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 -ru llvm-2.6.orig/lib/VMCore/Makefile llvm-2.6/lib/VMCore/Makefile
|
|
||||||
--- llvm-2.6.orig/lib/VMCore/Makefile 2009-01-09 11:44:42.000000000 -0500
|
|
||||||
+++ llvm-2.6/lib/VMCore/Makefile 2009-09-30 02:28:03.114651503 -0400
|
|
||||||
@@ -29,5 +29,5 @@
|
|
||||||
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 -ru llvm-2.6.orig/Makefile.config.in llvm-2.6/Makefile.config.in
|
|
||||||
--- llvm-2.6.orig/Makefile.config.in 2009-08-17 20:40:33.000000000 -0400
|
|
||||||
+++ llvm-2.6/Makefile.config.in 2009-09-30 02:28:03.099649281 -0400
|
|
||||||
@@ -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 := $(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 -ru llvm-2.6.orig/Makefile.rules llvm-2.6/Makefile.rules
|
|
||||||
--- llvm-2.6.orig/Makefile.rules 2009-09-12 18:25:41.000000000 -0400
|
|
||||||
+++ llvm-2.6/Makefile.rules 2009-09-30 02:28:03.104648788 -0400
|
|
||||||
@@ -725,7 +725,7 @@
|
|
||||||
# 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
|
|
||||||
@@ -847,22 +847,22 @@
|
|
||||||
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
|
|
||||||
|
|
||||||
@@ -949,7 +949,7 @@
|
|
||||||
ifdef BYTECODE_DESTINATION
|
|
||||||
ModuleDestDir := $(BYTECODE_DESTINATION)
|
|
||||||
else
|
|
||||||
-ModuleDestDir := $(PROJ_libdir)
|
|
||||||
+ModuleDestDir := $(DESTDIR)$(PROJ_libdir)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef NO_INSTALL
|
|
||||||
@@ -1028,17 +1028,17 @@
|
|
||||||
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
|
|
||||||
|
|
||||||
@@ -1083,7 +1083,7 @@
|
|
||||||
ifdef BYTECODE_DESTINATION
|
|
||||||
BytecodeDestDir := $(BYTECODE_DESTINATION)
|
|
||||||
else
|
|
||||||
-BytecodeDestDir := $(PROJ_libdir)
|
|
||||||
+BytecodeDestDir := $(DESTDIR)$(PROJ_libdir)
|
|
||||||
endif
|
|
||||||
|
|
||||||
DestBytecodeLib = $(BytecodeDestDir)/lib$(LIBRARYNAME).bca
|
|
||||||
@@ -1146,13 +1146,13 @@
|
|
||||||
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::
|
|
||||||
@@ -1230,11 +1230,11 @@
|
|
||||||
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)
|
|
||||||
|
|
||||||
@@ -1829,25 +1829,25 @@
|
|
||||||
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
|
|
||||||
@@ -1859,10 +1859,10 @@
|
|
||||||
$(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 -ru llvm-2.6.orig/tools/gccas/Makefile llvm-2.6/tools/gccas/Makefile
|
|
||||||
--- llvm-2.6.orig/tools/gccas/Makefile 2007-12-29 15:07:17.000000000 -0500
|
|
||||||
+++ llvm-2.6/tools/gccas/Makefile 2009-09-30 02:28:03.116650426 -0400
|
|
||||||
@@ -10,9 +10,9 @@
|
|
||||||
|
|
||||||
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 -ru llvm-2.6.orig/tools/gccld/Makefile llvm-2.6/tools/gccld/Makefile
|
|
||||||
--- llvm-2.6.orig/tools/gccld/Makefile 2007-12-29 15:07:17.000000000 -0500
|
|
||||||
+++ llvm-2.6/tools/gccld/Makefile 2009-09-30 02:28:03.117649993 -0400
|
|
||||||
@@ -11,9 +11,9 @@
|
|
||||||
|
|
||||||
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 -ru llvm-2.6.orig/tools/llvm-config/Makefile llvm-2.6/tools/llvm-config/Makefile
|
|
||||||
--- llvm-2.6.orig/tools/llvm-config/Makefile 2009-03-10 15:01:23.000000000 -0400
|
|
||||||
+++ llvm-2.6/tools/llvm-config/Makefile 2009-09-30 02:28:03.119650243 -0400
|
|
||||||
@@ -87,6 +87,6 @@
|
|
||||||
$(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)
|
|
||||||
|
|
||||||
32
llvm.spec
32
llvm.spec
@ -5,14 +5,14 @@
|
|||||||
|
|
||||||
Name: llvm
|
Name: llvm
|
||||||
Version: 2.7
|
Version: 2.7
|
||||||
Release: 0.1.pre1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: The Low Level Virtual Machine
|
Summary: The Low Level Virtual Machine
|
||||||
|
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
License: NCSA
|
License: NCSA
|
||||||
URL: http://llvm.org/
|
URL: http://llvm.org/
|
||||||
Source0: http://llvm.org/pre-releases/%{version}/pre-release1/llvm-%{version}.tar.gz
|
Source0: http://llvm.org/releases/%{version}/llvm-%{version}.tgz
|
||||||
Source1: http://llvm.org/pre-releases/%{version}/pre-release1/clang-%{version}.tar.gz
|
Source1: http://llvm.org/releases/%{version}/clang-%{version}.tgz
|
||||||
# Data files should be installed with timestamps preserved
|
# Data files should be installed with timestamps preserved
|
||||||
Patch0: llvm-2.6-timestamp.patch
|
Patch0: llvm-2.6-timestamp.patch
|
||||||
|
|
||||||
@ -66,7 +66,7 @@ Documentation for the LLVM compiler infrastructure.
|
|||||||
|
|
||||||
|
|
||||||
%package -n clang
|
%package -n clang
|
||||||
Summary: A C language family frontend for LLVM
|
Summary: A C language family front-end for LLVM
|
||||||
License: NCSA
|
License: NCSA
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
|
|
||||||
@ -78,7 +78,7 @@ clang: noun
|
|||||||
|
|
||||||
The goal of the Clang project is to create a new C, C++, Objective C
|
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
|
and Objective C++ front-end for the LLVM compiler. Its tools are built
|
||||||
as libraries and designed to be loosely-coupled and extendable.
|
as libraries and designed to be loosely-coupled and extensible.
|
||||||
|
|
||||||
|
|
||||||
%package -n clang-devel
|
%package -n clang-devel
|
||||||
@ -173,7 +173,7 @@ mv clang-%{version} tools/clang
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
# Disabling assertions now, rec. by pure and needed for OpenGTL
|
# Disabling assertions now, rec. by pure and needed for OpenGTL
|
||||||
# no PIC on ix86: http://llvm.org/bugs/show_bug.cgi?id=3239
|
# TESTFIX no PIC on ix86: http://llvm.org/bugs/show_bug.cgi?id=3801
|
||||||
mkdir obj && cd obj
|
mkdir obj && cd obj
|
||||||
../configure \
|
../configure \
|
||||||
--prefix=%{_prefix} \
|
--prefix=%{_prefix} \
|
||||||
@ -181,11 +181,7 @@ mkdir obj && cd obj
|
|||||||
--disable-assertions \
|
--disable-assertions \
|
||||||
--enable-debug-runtime \
|
--enable-debug-runtime \
|
||||||
--enable-jit \
|
--enable-jit \
|
||||||
%ifarch %{ix86}
|
|
||||||
--enable-pic=no
|
|
||||||
%else
|
|
||||||
--enable-shared
|
--enable-shared
|
||||||
%endif
|
|
||||||
|
|
||||||
# FIXME file this
|
# FIXME file this
|
||||||
# configure does not properly specify libdir
|
# configure does not properly specify libdir
|
||||||
@ -200,13 +196,10 @@ make %{_smp_mflags} \
|
|||||||
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
# pre1: some tests fail on PPC
|
|
||||||
# http://www.nabble.com/LLVM-2.6-pre1%3A-test-failures-on-Fedora-11.91-%28Rawhide%29-ppc-td25334198.html
|
|
||||||
# pre2: test failures on x86_64 as well
|
|
||||||
cd obj
|
cd obj
|
||||||
make check 2>&1 | tee ../llvm-testlog.txt || true
|
# no current unexpected failures. Use || true if they recur to force ignore
|
||||||
# some clang tests still fail, preserve test results
|
make check 2>&1 | tee ../llvm-testlog.txt
|
||||||
(cd tools/clang && make test 2>&1) | tee ../clang-testlog.txt || true
|
(cd tools/clang && make test 2>&1) | tee ../clang-testlog.txt
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -220,7 +213,7 @@ popd
|
|||||||
|
|
||||||
# Create ld.so.conf.d entry
|
# Create ld.so.conf.d entry
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
|
mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
|
||||||
cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/llvm-%{arch}.conf << EOF
|
cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/llvm-%{_arch}.conf << EOF
|
||||||
%{_libdir}/llvm
|
%{_libdir}/llvm
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
@ -289,7 +282,7 @@ rm -rf %{buildroot}
|
|||||||
%exclude %{_bindir}/llvm-config
|
%exclude %{_bindir}/llvm-config
|
||||||
%{_bindir}/llvm*
|
%{_bindir}/llvm*
|
||||||
%{_bindir}/opt
|
%{_bindir}/opt
|
||||||
%config %{_sysconfdir}/ld.so.conf.d/llvm-%{arch}.conf
|
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/llvm-%{_arch}.conf
|
||||||
%dir %{_libdir}/llvm
|
%dir %{_libdir}/llvm
|
||||||
%{_libdir}/llvm/*.so
|
%{_libdir}/llvm/*.so
|
||||||
%exclude %{_mandir}/man1/clang.1.*
|
%exclude %{_mandir}/man1/clang.1.*
|
||||||
@ -353,6 +346,9 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun May 2 2010 Michel Salim <salimma@fedoraproject.org> - 2.7-1
|
||||||
|
- Update to final 2.7 release
|
||||||
|
|
||||||
* Sun Mar 28 2010 Michel Salim <salimma@fedoraproject.org> - 2.7-0.1.pre1
|
* Sun Mar 28 2010 Michel Salim <salimma@fedoraproject.org> - 2.7-0.1.pre1
|
||||||
- Update to first 2.7 pre-release
|
- Update to first 2.7 pre-release
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user