[lldb-dev] [PATCH] For bug 18124 - take 2 (make install fix for python packages)

[Todd Fiala]

Here's a proposed patch for bug 18124 with the addition of supporting the
optional DESTDIR argument to the make command.

I tested it with the original scenarios, plus the scenario of having a
DESTDIR specified as the overall root for the install.

Sylvestre, perhaps you can test this on your end to make sure it really
fixes your scenario, and if it looks good, commit it?

Thanks, and sorry for breaking you!

Sincerely,
Todd Fiala


On Wed, Dec 4, 2013 at 12:35 PM, Todd Fiala <tfiala at google.com> wrote:

> Hi all,
>
> This is the patch previously reviewed here for fixing the autotools-based
> install of python packages to the correct install tree.  Can I get a
> committer to commit this, please?  Thank you!
>
> The related bug report is here: http://llvm.org/bugs/show_bug.cgi?id=18124
>
> Sincerely,
> Todd Fiala
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/lldb-dev/attachments/20131205/43061b5b/attachment.html>
-------------- next part --------------
commit 723602c36bbc047b637431858da80ea4943c7c67
Author: Todd Fiala <tfiala at google.com>
Date:   Thu Dec 5 08:24:56 2013 -0800

    Fixed Makefile-based install to place python packages in the LLDB install tree.
    
    Failure to install python packages now fails the make install.
    This patch properly handles the optional DESTDIR variable.

diff --git a/scripts/finish-swig-wrapper-classes.sh b/scripts/finish-swig-wrapper-classes.sh
index f0bca4b..806f286 100755
--- a/scripts/finish-swig-wrapper-classes.sh
+++ b/scripts/finish-swig-wrapper-classes.sh
@@ -89,6 +89,11 @@ do
 
 
             ./finish-swig-${curlang}-LLDB.sh $SRC_ROOT $TARGET_DIR $CONFIG_BUILD_DIR "${PREFIX}" "${debug_flag}" "${makefile_flag}"
+            retval=$?
+            if [ $retval -ne 0 ]; then
+                echo "$(pwd)/finish-swig-${curlang}-LLDB.sh failed with exit code $retval"
+                exit $retval
+            fi
         fi
     fi
 done
diff --git a/source/Interpreter/Makefile b/source/Interpreter/Makefile
index 5a6ffba..a788b5b 100644
--- a/source/Interpreter/Makefile
+++ b/source/Interpreter/Makefile
@@ -35,7 +35,7 @@ LLDBWrapPython.cpp lldb.py: $(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/Python/modify-
 
 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) "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/finish-swig-wrapper-classes.sh" "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)" "$(PROJ_OBJ_DIR)" "$(PROJ_OBJ_DIR)" "$(DESTDIR)$(prefix)" -m
 
 clean-local::
 	$(Verb) $(RM) -f LLDBWrapPython.cpp lldb.py