diff --git a/clang-max_align_t.patch b/clang-max_align_t.patch deleted file mode 100644 index 142e5c5..0000000 --- a/clang-max_align_t.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -ru llvm.orig/tools/clang/lib/Headers/stddef.h llvm/tools/clang/lib/Headers/stddef.h ---- llvm.orig/tools/clang/lib/Headers/stddef.h 2014-06-21 14:04:14.578588219 +0200 -+++ llvm/tools/clang/lib/Headers/stddef.h 2014-06-21 14:04:35.729587594 +0200 -@@ -84,6 +84,16 @@ - #endif - #endif - -+#if __STDC_VERSION__ >= 201112L || __cplusplus >= 201103L -+typedef struct { -+ long long __clang_max_align_nonce1 -+ __attribute__((__aligned__(__alignof__(long long)))); -+ long double __clang_max_align_nonce2 -+ __attribute__((__aligned__(__alignof__(long double)))); -+} max_align_t; -+#define __CLANG_MAX_ALIGN_T_DEFINED -+#endif -+ - #define offsetof(t, d) __builtin_offsetof(t, d) - - #endif /* __STDDEF_H */ -diff -ru llvm.orig/tools/clang/test/Headers/c11.c llvm/tools/clang/test/Headers/c11.c ---- llvm.orig/tools/clang/test/Headers/c11.c 2014-06-21 14:04:14.505588221 +0200 -+++ llvm/tools/clang/test/Headers/c11.c 2014-06-21 14:07:30.305582436 +0200 -@@ -22,6 +22,10 @@ - #define __STDC_WANT_LIB_EXT1__ 1 - #include - rsize_t x = 0; -+_Static_assert(sizeof(max_align_t) >= sizeof(long long), ""); -+_Static_assert(alignof(max_align_t) >= alignof(long long), ""); -+_Static_assert(sizeof(max_align_t) >= sizeof(long double), ""); -+_Static_assert(alignof(max_align_t) >= alignof(long double), ""); - - // If we are freestanding, then also check RSIZE_MAX (in a hosted implementation - // we will use the host stdint.h, which may not yet have C11 support). diff --git a/cmake-patchversion.patch b/cmake-patchversion.patch new file mode 100644 index 0000000..dba8e06 --- /dev/null +++ b/cmake-patchversion.patch @@ -0,0 +1,14 @@ +Index: llvm-3.4.2/include/llvm/Config/config.h.cmake +=================================================================== +--- llvm-3.4.2.orig/include/llvm/Config/config.h.cmake ++++ llvm-3.4.2/include/llvm/Config/config.h.cmake +@@ -603,6 +603,9 @@ + /* Minor version of the LLVM API */ + #cmakedefine LLVM_VERSION_MINOR ${LLVM_VERSION_MINOR} + ++/* Patch version of the LLVM API */ ++#cmakedefine LLVM_VERSION_PATCH ${LLVM_VERSION_PATCH} ++ + /* Define if the OS needs help to load dependent libraries for dlopen(). */ + #cmakedefine LTDL_DLOPEN_DEPLIBS ${LTDL_DLOPEN_DEPLIBS} + diff --git a/llvm-3.4.2.tar.bz2 b/llvm-3.4.2.tar.bz2 new file mode 100644 index 0000000..81c9700 --- /dev/null +++ b/llvm-3.4.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11198f9f9bc7321aa5da950378fab116eef8f1fc99460a00a9c61edee7e5eed5 +size 27916196 diff --git a/llvm-3.4.tar.bz2 b/llvm-3.4.tar.bz2 deleted file mode 100644 index d5f0d9e..0000000 --- a/llvm-3.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29c1121d34d0309b9c2e5a39b7c79a1e83ac11c3b54acd6654d1ebf81ba1c08e -size 27905661 diff --git a/llvm.changes b/llvm.changes index cc484ff..c5d1709 100644 --- a/llvm.changes +++ b/llvm.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Jul 23 19:45:30 UTC 2014 - idonmez@suse.com + +- Add baselibs.conf to source files + +------------------------------------------------------------------- +Wed Jul 23 17:00:40 UTC 2014 - idonmez@suse.com + +- Add cmake-patchversion.patch to sync config.h.in + with config.h.cmake + +------------------------------------------------------------------- +Tue Jul 22 12:09:53 UTC 2014 - idonmez@suse.com + +- Update to llvm 3.4.2 + * Minor bugfix release +- Drop clang-max_align_t.patch, applied upstream. + ------------------------------------------------------------------- Sat Jun 21 13:40:52 UTC 2014 - arnaud@versini.eu diff --git a/llvm.spec b/llvm.spec index c32ba0d..66af0e4 100644 --- a/llvm.spec +++ b/llvm.spec @@ -16,11 +16,11 @@ # -%define _revision 198681 -%define _release_version 3.4 +%define _revision 213642 +%define _release_version 3.4.2 Name: llvm -Version: 3.4 +Version: 3.4.2 Release: 0 Summary: Low Level Virtual Machine License: NCSA @@ -28,6 +28,7 @@ Group: Development/Languages/Other Url: http://www.llvm.org Source0: %{name}-%{version}.tar.bz2 Source100: %{name}-rpmlintrc +Source101: baselibs.conf # PATCH-FIX-OPENSUSE set-revision.patch idoenmez@suse.de -- Allow us to set revision Patch1: set-revision.patch # PATCH-FIX-OPENSUSE assume-opensuse.patch idoenmez@suse.de -- Always enable openSUSE/SUSE features @@ -46,7 +47,7 @@ Patch9: arm-remove-xfails.diff # PATCH-FIX-OPENSUSE asan-disable-hugemalloctest.patch -- Disable ASAN HugeMallocTest Patch10: asan-disable-hugemalloctest.patch Patch11: clang-resourcedirs.patch -Patch12: clang-max_align_t.patch +Patch12: cmake-patchversion.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -142,7 +143,7 @@ Requires: python This package contains the Python bindings to clang (C language) frontend for LLVM. %prep -%setup -q -n %{name} +%setup -q %patch1 -p1 %patch2 -p1 %patch3 -p1