[llvm/f20] Fix for LLDB

Dave Johansen daveisfera at fedoraproject.org
Sat Jan 3 16:27:57 UTC 2015


commit 062a4c50ac62c64d615087656220e740804bbe49
Author: Dave Johansen <davejohansen at gmail.com>
Date:   Sat Jan 3 07:20:36 2015 -0700

    Fix for LLDB

 0006-fix-python-package-installation.patch |   20 ++++++++++++++++++++
 llvm.spec                                  |   10 +++++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/0006-fix-python-package-installation.patch b/0006-fix-python-package-installation.patch
new file mode 100644
index 0000000..89a549e
--- /dev/null
+++ b/0006-fix-python-package-installation.patch
@@ -0,0 +1,20 @@
+--- a/tools/lldb/scripts/Python/finish-swig-Python-LLDB.sh
++++ b/tools/lldb/scripts/Python/finish-swig-Python-LLDB.sh
+@@ -118,6 +118,8 @@
+     echo "Python files will be put in ${framework_python_dir}"
+ fi
+ 
++framework_python_dir=$DESTDIR/$framework_python_dir
++
+ python_dirs="${framework_python_dir}"
+ 
+ for python_dir in $python_dirs
+@@ -157,7 +159,7 @@
+     then
+         ln -s "../../../LLDB" _lldb.so
+     else
+-        ln -s "../../../liblldb${SOEXT}" _lldb.so
++        ln -s "../../../llvm/liblldb${SOEXT}" _lldb.so
+     fi
+ else
+     if [ $Debug -eq 1 ]
diff --git a/llvm.spec b/llvm.spec
index 8a77fc5..3a7e11a 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -36,7 +36,7 @@
 
 Name:           llvm
 Version:        3.4
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
@@ -62,6 +62,7 @@ Source11:       llvm-Config-llvm-config.h
 # patches
 Patch11:         0001-data-install-preserve-timestamps.patch
 Patch12:         0002-linker-flags-speedup-memory.patch
+Patch6:         0006-fix-python-package-installation.patch
 
 # sledgehammer to default to hard-float on arm
 Patch20:	clang-3.4-arm-hard-float.patch
@@ -303,6 +304,9 @@ mv lldb-%{version} tools/lldb
 
 %patch11 -p1
 %patch12 -p1
+%if %{with lldb}
+%patch6 -p1
+%endif
 %if %{with clang}
 %patch20 -p1
 %patch21 -p1
@@ -630,6 +634,7 @@ exit 0
 %{_bindir}/lldb
 %{_bindir}/lldb-platform
 %{_libdir}/%{name}/liblldb.so
+%{python_sitearch}/lldb/
 %doc %{_mandir}/man1/lldb.1.*
 
 %files -n lldb-devel
@@ -673,6 +678,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Jan 02 2015 Dave Johansen <davejohansen at gmail.com> 3.4-12
+- Fix for LLDB
+
 * Fri Dec 26 2014 Jan Vcelak <jvcelak at fedoraproject.org> 3.4-11
 - clang-analyzer: fix insecure temporary file handling (CVE-2014-2893)
 


More information about the scm-commits mailing list