[arch-commits] Commit in llvm/trunk (PKGBUILD llvm-3.5.0-fix-cmake-llvm-exports.patch)

[Evangelos Foutras]

    Date: Wednesday, January 14, 2015 @ 05:29:02
  Author: foutrelis
Revision: 228994

upgpkg: llvm 3.5.1-1

New upstream release.

Modified:
  llvm/trunk/PKGBUILD
Deleted:
  llvm/trunk/llvm-3.5.0-fix-cmake-llvm-exports.patch

-----------------------------------------+
 PKGBUILD                                |   21 ++++++----------
 llvm-3.5.0-fix-cmake-llvm-exports.patch |   39 ------------------------------
 2 files changed, 8 insertions(+), 52 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-13 23:20:44 UTC (rev 228993)
+++ PKGBUILD	2015-01-14 04:29:02 UTC (rev 228994)
@@ -11,8 +11,8 @@
 
 pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'clang' 'clang-analyzer'
          'clang-tools-extra')
-pkgver=3.5.0
-pkgrel=3
+pkgver=3.5.1
+pkgrel=1
 _ocaml_ver=4.02.1
 arch=('i686' 'x86_64')
 url="http://llvm.org/"
@@ -26,24 +26,23 @@
         http://llvm.org/releases/$pkgver/clang-tools-extra-$pkgver.src.tar.xz{,.sig}
         http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.xz{,.sig}
         llvm-3.5.0-force-link-pass.o.patch
-        llvm-3.5.0-fix-cmake-llvm-exports.patch
         llvm-3.5.0-fix-ocaml-as-needed.patch
         llvm-Config-config.h
         llvm-Config-llvm-config.h)
-sha256sums=('28e199f368ef0a4666708f31c7991ad3bcc3a578342b0306526dd35f07595c03'
+sha256sums=('bf3275d2d7890015c8d8f5e6f4f882f8cf3bf51967297ebe74111d6d8b53be15'
             'SKIP'
-            'fc80992e004b06f6c7afb612de1cdaa9ac9d25811c55f94fcf7331d9b81cdb8b'
+            '6773f3f9cf815631cc7e779ec134ddd228dc8e9a250e1ea3a910610c59eb8f5c'
             'SKIP'
-            '2981beb378afb5aa5c50ed017720a42a33e77e902c7086ad2d412ef4fa931f69'
+            'e8d011250389cfc36eb51557ca25ae66ab08173e8d53536a0747356105d72906'
             'SKIP'
-            'a4b3e655832bf8d9a357ea2c771db347237460e131988cbb96cda40ff39a8136'
+            'adf4b526f33e681aff5961f0821f5b514d3fc375410008842640b56a2e6a837a'
             'SKIP'
             '5702053503d49448598eda1b8dc8c263f0df9ad7486833273e3987b5dec25a19'
-            '841a153d0e9d2d196ea5318388ff295e69c41547eb73b24edf92a1b2cc3cccdd'
             '0d8b268cf101b0a08dbe458a041c33be0500d09b1a62ed0a16f205758647a5fc'
             '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
             '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
-validpgpkeys=('54E3BDE33185D9F69664D22455F5CD70BB5A0569')
+validpgpkeys=('54E3BDE33185D9F69664D22455F5CD70BB5A0569'
+              '11E521D646982372EB577A1F8F0871F202119294')
 
 prepare() {
   cd "$srcdir/llvm-$pkgver.src"
@@ -68,10 +67,6 @@
   # http://llvm.org/bugs/show_bug.cgi?id=20067
   patch -Np1 -i ../llvm-3.5.0-force-link-pass.o.patch
 
-  # Fix generation of broken LLVMExports.cmake file
-  # http://llvm.org/bugs/show_bug.cgi?id=20884
-  patch -Np0 -i ../llvm-3.5.0-fix-cmake-llvm-exports.patch
-
   # Fix OCaml bindings linking with -Wl,--as-needed
   # http://llvm.org/bugs/show_bug.cgi?id=22014
   patch -Np1 -i ../llvm-3.5.0-fix-ocaml-as-needed.patch

Deleted: llvm-3.5.0-fix-cmake-llvm-exports.patch
===================================================================
--- llvm-3.5.0-fix-cmake-llvm-exports.patch	2015-01-13 23:20:44 UTC (rev 228993)
+++ llvm-3.5.0-fix-cmake-llvm-exports.patch	2015-01-14 04:29:02 UTC (rev 228994)
@@ -1,39 +0,0 @@
-Index: cmake/modules/Makefile
-===================================================================
---- cmake/modules/Makefile	(revision 217483)
-+++ cmake/modules/Makefile	(revision 217484)
-@@ -33,6 +33,16 @@
- 	LLVM_ENABLE_RTTI := 0
- endif
- 
-+LLVM_LIBS_TO_EXPORT := $(subst -l,,$(shell $(LLVM_CONFIG) --libs $(LINK_COMPONENTS) || echo Error))
-+
-+ifeq ($(LLVM_LIBS_TO_EXPORT),Error)
-+$(error llvm-config --libs failed)
-+endif
-+
-+ifndef LLVM_LIBS_TO_EXPORT
-+$(error LLVM_LIBS_TO_EXPORT cannot be empty)
-+endif
-+
- OBJMODS := LLVMConfig.cmake LLVMConfigVersion.cmake LLVMExports.cmake
- 
- $(PROJ_OBJ_DIR)/LLVMConfig.cmake: LLVMConfig.cmake.in $(LLVMBuildCMakeFrag)
-@@ -45,7 +55,7 @@
- 	  -e 's/@LLVM_VERSION_PATCH@/'"$(LLVM_VERSION_PATCH)"'/' \
- 	  -e 's/@PACKAGE_VERSION@/'"$(LLVMVersion)"'/' \
- 	  -e 's/@LLVM_COMMON_DEPENDS@//' \
--	  -e 's/@LLVM_AVAILABLE_LIBS@/'"$(subst -l,,$(LLVMConfigLibs))"'/' \
-+	  -e 's/@LLVM_AVAILABLE_LIBS@/'"$(LLVM_LIBS_TO_EXPORT)"'/' \
- 	  -e 's/@LLVM_ALL_TARGETS@/'"$(ALL_TARGETS)"'/' \
- 	  -e 's/@LLVM_TARGETS_TO_BUILD@/'"$(TARGETS_TO_BUILD)"'/' \
- 	  -e 's/@LLVM_TARGETS_WITH_JIT@/'"$(TARGETS_WITH_JIT)"'/' \
-@@ -83,7 +93,7 @@
- 	$(Echo) 'Generating LLVM CMake target exports file'
- 	$(Verb) ( \
- 	  echo '# LLVM CMake target exports.  Do not include directly.' && \
--	  for lib in $(subst -l,,$(LLVMConfigLibs)); do \
-+	  for lib in $(LLVM_LIBS_TO_EXPORT); do \
- 	    echo 'add_library('"$$lib"' STATIC IMPORTED)' && \
- 	    echo 'set_property(TARGET '"$$lib"' PROPERTY IMPORTED_LOCATION "'"$(PROJ_libdir)/lib$$lib.a"'")' ; \
- 	  done && \