Merge lp:~vanvugt/mir/append-libpath into lp:mir

[Daniel van Vugt]

wrapper: Append LD_LIBRARY_PATH instead of replacing it. This allows
deploy-and-test.sh to work correctly again. (LP: #1413479)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2246
http://jenkins.qa.ubuntu.com/job/mir-ci/2764/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/996
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/995
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/957
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/761
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/761/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/957
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/957/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4048
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17337

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2764/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Sure

review: Approve

=== modified file 'src/wrapper.c'
--- src/wrapper.c	2015-01-14 06:39:13 +0000
+++ src/wrapper.c	2015-01-22 05:14:51 +0000
@@ -21,6 +21,20 @@
 #include <stdio.h>
 #include <unistd.h>
 
+static void appendenv(const char* varname, const char* append)
+{
+    char buf[1024] = "";
+    const char* value = append;
+    const char* old = getenv(varname);
+    if (old != NULL)
+    {
+        snprintf(buf, sizeof(buf)-1, "%s:%s", old, append);
+        buf[sizeof(buf)-1] = '\0';
+        value = buf;
+    }
+    setenv(varname, value, 1);
+}
+
 int main(int argc, char** argv)
 {
     char path[1024], *dest = path, *dest_max = path+sizeof(path)-1;
@@ -48,8 +62,8 @@
     printf("MIR_CLIENT_PLATFORM_PATH=%s\n", path);
 
     pivot[6] = '\0';  /* truncate lib/client-modules to just lib */
-    setenv("LD_LIBRARY_PATH", path, 1);
-    printf("LD_LIBRARY_PATH=%s\n", path);
+    appendenv("LD_LIBRARY_PATH", path);
+    printf("LD_LIBRARY_PATH=%s\n", getenv("LD_LIBRARY_PATH"));
 
     snprintf(pivot, pivot_max, EXECUTABLE_FORMAT, name);
     *dest_max = '\0';