Attachment 909432 Details for Bug 1104192 – Patch

[patch] Patch

0001-Fix-python-wrapper-not-being-installed.patch (text/plain), 3.83 KB, created by Sandro Mani on 2014-06-17 07:24:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sandro Mani

Created: 2014-06-17 07:24:40 UTC

Size: 3.83 KB

patch

obsolete

>From 388aaf3300037394a0af6cc220327234de4e1c56 Mon Sep 17 00:00:00 2001
>From: Sandro Mani <manisandro@gmail.com>
>Date: Tue, 17 Jun 2014 09:22:19 +0200
>Subject: [PATCH] Fix python wrapper not being installed
>
>---
> lldb_python-destdir.patch | 27 +++++++++++++++++++++++++++
> llvm.spec                 | 12 +++++++++++-
> 2 files changed, 38 insertions(+), 1 deletion(-)
> create mode 100644 lldb_python-destdir.patch
>
>diff --git a/lldb_python-destdir.patch b/lldb_python-destdir.patch
>new file mode 100644
>index 0000000..3e83439
>--- /dev/null
>+++ b/lldb_python-destdir.patch
>@@ -0,0 +1,27 @@
>+diff -rupN llvm-3.4.1.src/tools/lldb/scripts/Python/finish-swig-Python-LLDB.sh llvm-3.4.1.src-new/tools/lldb/scripts/Python/finish-swig-Python-LLDB.sh
>+--- llvm-3.4.1.src/tools/lldb/scripts/Python/finish-swig-Python-LLDB.sh	2013-05-31 01:36:47.000000000 +0200
>++++ llvm-3.4.1.src-new/tools/lldb/scripts/Python/finish-swig-Python-LLDB.sh	2014-06-16 23:43:19.051705773 +0200
>+@@ -100,9 +100,9 @@ else
>+ 
>+     if [ -n "${PYTHON_INSTALL_DIR}" ]
>+     then
>+-        framework_python_dir=`/usr/bin/env python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True, False, \"${PYTHON_INSTALL_DIR}\");"`/lldb
>++        framework_python_dir=$DESTDIR`/usr/bin/env python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True, False, \"${PYTHON_INSTALL_DIR}\");"`/lldb
>+     else
>+-        framework_python_dir=`/usr/bin/env python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True, False);"`/lldb
>++        framework_python_dir=$DESTDIR`/usr/bin/env python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True, False);"`/lldb
>+     fi
>+ fi
>+ 
>+diff -rupN llvm-3.4.1.src/tools/lldb/source/Interpreter/Makefile llvm-3.4.1.src-new/tools/lldb/source/Interpreter/Makefile
>+--- llvm-3.4.1.src/tools/lldb/source/Interpreter/Makefile	2013-08-23 14:44:05.000000000 +0200
>++++ llvm-3.4.1.src-new/tools/lldb/source/Interpreter/Makefile	2014-06-16 23:47:03.034699155 +0200
>+@@ -39,7 +39,7 @@ LLDBWrapPython.cpp lldb.py: $(PROJ_SRC_D
>+ 
>+ install-local:: lldb.py
>+ 	$(Echo) Installing $(BuildMode) LLDB python modules
>+-	$(Verb) "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/finish-swig-wrapper-classes.sh" "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)" "$(PROJ_OBJ_DIR)" "$(PROJ_OBJ_DIR)" "" -m
>++	$(Verb) DESTDIR=$(DESTDIR) "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/finish-swig-wrapper-classes.sh" "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)" "$(PROJ_OBJ_DIR)" "$(PROJ_OBJ_DIR)" "" -m
>+ 
>+ clean-local::
>+ 	$(Verb) $(RM) -f LLDBWrapPython.cpp lldb.py
>diff --git a/llvm.spec b/llvm.spec
>index 2464624..9bfc3aa 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
>@@ -72,6 +72,9 @@ Patch21:	0001-PPC64LE-ELFv2-ABI-updates-for-the-.opd-section.patch
> # http://llvm.org/bugs/attachment.cgi?id=12586
> Patch22:	pr12586.patch
> 
>+# Fix lldb python wrapper not installing due to missing destdir
>+Patch23:	lldb_python-destdir.patch
>+
> BuildRequires:  bison
> BuildRequires:  chrpath
> BuildRequires:  flex
>@@ -314,6 +317,9 @@ mv lldb-%{version} tools/lldb
> %endif
> %patch21 -p1
> %patch22 -p1
>+%if %{with lldb}
>+%patch23 -p1
>+%endif
> 
> # fix library paths
> sed -i 's|/lib /usr/lib $lt_ld_extra|%{_libdir} $lt_ld_extra|' ./configure
>@@ -636,6 +642,7 @@ exit 0
> %{_bindir}/lldb
> %{_bindir}/lldb-platform
> %{_libdir}/%{name}/liblldb.so
>+%{python_sitearch}/lldb/
> %doc %{_mandir}/man1/lldb.1.*
> 
> %files -n lldb-devel
>@@ -679,6 +686,9 @@ exit 0
> %endif
> 
> %changelog
>+* Wed Jun 17 2014 Sandro Mani <manisandro@gmail.com> 3.4-12
>+- Add patch to fix installing the python wrapper
>+
> * Wed Jun 11 2014 Adam Jackson <ajax@redhat.com> 3.4-11
> - Different attempt to default to hard-float on arm (#803433)
> 
>-- 
>2.0.0
>

Actions: View | Diff

Attachments on bug 1104192: 901784 | 901785 | 909432