From 4de979bbff39085f06e055c85802837a7e12ab8b Mon Sep 17 00:00:00 2001 From: Dave Johansen Date: Fri, 2 Jan 2015 19:55:41 -0700 Subject: [PATCH] Fix for LLDB --- 0006-fix-python-package-installation.patch | 20 ++++++++++++++++++++ llvm.spec | 7 ++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 0006-fix-python-package-installation.patch diff --git a/0006-fix-python-package-installation.patch b/0006-fix-python-package-installation.patch new file mode 100644 index 0000000..938937f --- /dev/null +++ b/0006-fix-python-package-installation.patch @@ -0,0 +1,20 @@ +--- a/tools/lldb/scripts/Python/finish-swig-Python-LLDB.sh 2014-02-10 18:35:27.913085487 +0100 ++++ b/tools/lldb/scripts/Python/finish-swig-Python-LLDB.sh 2014-02-10 17:54:59.359789538 +0100 +@@ -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 e69bbf8..9295ffc 100644 --- a/llvm.spec +++ b/llvm.spec @@ -49,7 +49,7 @@ Obsoletes: pure <= 0.55 Name: llvm Version: %{version_base}.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The Low Level Virtual Machine Group: Development/Languages @@ -74,6 +74,7 @@ Patch2: 0002-linker-flags-speedup-memory.patch Patch3: 0003-amazon-triples.patch Patch4: 0004-devtoolset.patch Patch5: 0005-scan-build-dir.patch +Patch6: 0006-fix-python-package-installation.patch BuildRequires: bison BuildRequires: chrpath @@ -303,6 +304,7 @@ mv lldb-%{version_base} tools/lldb %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 # fix library paths sed -i 's|/lib /usr/lib $lt_ld_extra|%{_libdir} $lt_ld_extra|' ./configure @@ -671,6 +673,9 @@ exit 0 %endif %changelog +* Fri Jan 02 2015 Dave Johansen 3.4.2-5 +- Fix for LLDB + * Fri Jan 02 2015 Dave Johansen 3.4.2-4 - Adding X_SCLS for turning on devtoolset use at runtime