Author: jim Date: Wed Jan 16 16:46:03 2019 New Revision: 1851469 URL: http://svn.apache.org/viewvc?rev=1851469&view=rev Log: Merge r1851464 from trunk:
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 Reviewed by: jim Modified: openoffice/branches/AOO42X/ (props changed) openoffice/branches/AOO42X/main/odk/setsdkenv_unix.sh.in openoffice/branches/AOO42X/main/odk/source/unoapploader/unx/unoapploader.c Propchange: openoffice/branches/AOO42X/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 16 16:46:03 2019 @@ -9,4 +9,4 @@ /openoffice/branches/ia2:1417739-1541842 /openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283 /openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617 -/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449 +/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464 Modified: openoffice/branches/AOO42X/main/odk/setsdkenv_unix.sh.in URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/odk/setsdkenv_unix.sh.in?rev=1851469&r1=1851468&r2=1851469&view=diff ============================================================================== --- openoffice/branches/AOO42X/main/odk/setsdkenv_unix.sh.in (original) +++ openoffice/branches/AOO42X/main/odk/setsdkenv_unix.sh.in Wed Jan 16 16:46:03 2019 @@ -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" Modified: openoffice/branches/AOO42X/main/odk/source/unoapploader/unx/unoapploader.c URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/odk/source/unoapploader/unx/unoapploader.c?rev=1851469&r1=1851468&r2=1851469&view=diff ============================================================================== --- openoffice/branches/AOO42X/main/odk/source/unoapploader/unx/unoapploader.c (original) +++ openoffice/branches/AOO42X/main/odk/source/unoapploader/unx/unoapploader.c Wed Jan 16 16:46:03 2019 @@ -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 {
