commit d756c46077430549a4d3de60ae557670a3d8f319
Author: Jakub Bogusz <[email protected]>
Date: Sat Oct 18 23:11:55 2014 +0200
- more changes to fix lib64 related problems (config patch, lldb patch,
spec)
- enable LFS for 64-bit inodes support
llvm-config.patch | 11 +++++++++++
llvm-lldb.patch | 16 ++++++++++++++++
llvm.spec | 8 +++++++-
3 files changed, 34 insertions(+), 1 deletion(-)
---
diff --git a/llvm.spec b/llvm.spec
index f9e2519..32968a7 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -427,9 +427,14 @@ grep -rl /usr/bin/env tools utils | xargs sed -i -e '1{
s,^#!.*bin/env perl,#!%{__perl},
}'
+%build
install -d obj
+%if "%{_lib}" != "lib"
+# workaround for clang relative search paths building
+install -d obj/Release
+ln -snf lib obj/Release/%{_lib}
+%endif
-%build
cd autoconf
%{__aclocal} -I m4
%{__autoconf} -o ../configure configure.ac
@@ -449,6 +454,7 @@ cd ../..
#
# bash specific 'test a < b'
cd obj
+CPPFLAGS="%{rpmcppflags} -D_FILE_OFFSET_BITS=64"
bash ../%configure \
--datadir=%{_datadir}/%{name}-%{version} \
--disable-assertions \
diff --git a/llvm-config.patch b/llvm-config.patch
index d59109c..87c331c 100644
--- a/llvm-config.patch
+++ b/llvm-config.patch
@@ -145,3 +145,14 @@
llvm::Triple::ArchType Arch = T.getArch();
switch (Arch) {
case llvm::Triple::x86:
+--- llvm-3.5.0.src/tools/clang/runtime/compiler-rt/Makefile.orig
2014-05-22 23:13:30.000000000 +0200
++++ llvm-3.5.0.src/tools/clang/runtime/compiler-rt/Makefile 2014-10-18
22:10:17.008329250 +0200
+@@ -20,7 +20,7 @@
+ $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
+
+ ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
+-PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)
++PROJ_resources := $(DESTDIR)$(PROJ_libdir)/clang/$(CLANG_VERSION)
+
+ ResourceLibDir := $(ResourceDir)/lib
+ ResourceIncludeDir := $(ResourceDir)/include
diff --git a/llvm-lldb.patch b/llvm-lldb.patch
index aa970cf..0b4ee39 100644
--- a/llvm-lldb.patch
+++ b/llvm-lldb.patch
@@ -9,3 +9,19 @@
endif
ifeq (,$(findstring -DLLDB_DISABLE_PYTHON,$(CXXFLAGS)))
+--- llvm-3.5.0.src/tools/lldb/scripts/Python/modules/readline/Makefile.orig
2014-02-26 16:05:48.000000000 +0100
++++ llvm-3.5.0.src/tools/lldb/scripts/Python/modules/readline/Makefile
2014-10-18 20:28:35.057301669 +0200
+@@ -91,9 +91,9 @@
+ # Target to move the shared library from the build python lib dir to
+ # the install python lib dir.
+ install-local:: $(LLDB_PYTHON_MODULE_DIR)/$(LIBRARYNAME)$(SHLIBEXT)
+- $(Echo) Installing $(BuildMode)
$(LLDB_PYTHON_MODULE_DIR)/$(LIBRARYNAME)$(SHLIBEXT) to
$(DESTDIR)$(prefix)/lib/$(LLDB_PYTHON_MODULE_REL_DIR)
+- $(Verb) $(MKDIR) "$(DESTDIR)$(prefix)/lib/$(LLDB_PYTHON_MODULE_REL_DIR)"
+- $(Verb) $(ProgInstall)
"$(LLDB_PYTHON_MODULE_DIR)/$(LIBRARYNAME)$(SHLIBEXT)"
"$(DESTDIR)$(prefix)/lib/$(LLDB_PYTHON_MODULE_REL_DIR)"
+- $(Verb) $(RM) "$(DESTDIR)$(prefix)/lib/$(LIBRARYNAME)$(SHLIBEXT)"
++ $(Echo) Installing $(BuildMode)
$(LLDB_PYTHON_MODULE_DIR)/$(LIBRARYNAME)$(SHLIBEXT) to
$(DESTDIR)$(PROJ_libdir)/$(LLDB_PYTHON_MODULE_REL_DIR)
++ $(Verb) $(MKDIR)
"$(DESTDIR)$(PROJ_libdir)/$(LLDB_PYTHON_MODULE_REL_DIR)"
++ $(Verb) $(ProgInstall)
"$(LLDB_PYTHON_MODULE_DIR)/$(LIBRARYNAME)$(SHLIBEXT)"
"$(DESTDIR)$(PROJ_libdir)/$(LLDB_PYTHON_MODULE_REL_DIR)"
++ $(Verb) $(RM) "$(DESTDIR)$(PROJ_libdir)/$(LIBRARYNAME)$(SHLIBEXT)"
+
+ endif # if !defined(LLDB_DISABLE_PYTHON)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/llvm.git/commitdiff/d756c46077430549a4d3de60ae557670a3d8f319
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
