[Libreoffice-commits] core.git: Branch 'aoo/trunk' - odk/setsdkenv_unix.sh.in odk/source

[Libreoffice Gerrit user]

 odk/setsdkenv_unix.sh.in                   |   10 ++++++++++
 odk/source/unoapploader/unx/unoapploader.c |   15 +++++++++++++++
 2 files changed, 25 insertions(+)

New commits:
commit 593e4a8325457c7a73a0b94517a234e5444edab0
Author:     Jim Jagielski <jim at apache.org>
AuthorDate: Wed Jan 16 16:09:04 2019 +0000
Commit:     Jim Jagielski <jim at apache.org>
CommitDate: Wed Jan 16 16:09:04 2019 +0000

    Try to address https://bz.apache.org/ooo/show_bug.cgi?id=127965
    
    Be sure that /usr/local/bin is in PATH. Just in case, add it at the end

diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in
index d361b7319a1d..c7942b0268dc 100644
--- a/odk/setsdkenv_unix.sh.in
+++ b/odk/setsdkenv_unix.sh.in
@@ -166,6 +166,8 @@ case ${sdk_platform} in
     platform=MacOSX
     stldebug=_stldebug
     DYLD_LIBRARY_PATH=/usr/lib:${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_OFFICE_LIB_DIR}:.:${DYLD_LIBRARY_PATH}
+    # Below for https://bz.apache.org/ooo/show_bug.cgi?id=127965
+    PATH=${PATH}:/usr/local/bin
     export DYLD_LIBRARY_PATH
     ;;
 
@@ -341,6 +343,14 @@ echo " * Boost = $OO_SDK_BOOST_HOME"
 echo " * SDK Output directory = $OO_SDK_OUT"
 echo " * Auto deployment = $SDK_AUTO_DEPLOYMENT"
 echo " *"
+echo " * PATH = $PATH"
+if [ "${platform}" = "MacOSX" ]
+then
+    echo " * DYLD_LIBRARY_PATH = $DYLD_LIBRARY_PATH"
+else
+    echo " * LD_LIBRARY_PATH = $LD_LIBRARY_PATH"
+fi
+echo " *"
 echo " ************************************************************************"
 
 echo "]2;Shell prepared with the SDK environment"
diff --git a/odk/source/unoapploader/unx/unoapploader.c b/odk/source/unoapploader/unx/unoapploader.c
index 552c8784a2d7..f825885403e4 100644
--- a/odk/source/unoapploader/unx/unoapploader.c
+++ b/odk/source/unoapploader/unx/unoapploader.c
@@ -206,6 +206,21 @@ int main( int argc, char *argv[] )
             strcat( envstr, value );
         }
         putenv( envstr );
+    #ifdef MACOSX
+        /* https://bz.apache.org/ooo/show_bug.cgi?id=127965 */
+        value = getenv( "PATH" );
+        size = strlen( "PATH" ) + strlen( "=/usr/local/bin" );
+        if ( value != NULL )
+            size += strlen( PATHSEPARATOR ) + strlen( value );
+        envstr = (char*) malloc( size );
+        strcpy( envstr, "PATH=" );
+        if ( value != NULL ) {
+            strcat( envstr, value);
+            strcat( envstr, PATHSEPARATOR);
+        }
+        strcat( envstr, "/usr/local/bin" ); /* We are adding at the end */
+        putenv( envstr );
+    #endif
     }
     else
     {