This is an automated email from the ASF dual-hosted git repository. damjan pushed a commit to branch scons-build in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit e3440cb4edd4c6fe74e05bdfa9ee2978a8e174d6 Author: Damjan Jovanovic <[email protected]> AuthorDate: Sat Feb 8 13:25:39 2020 +0200 Fix $ORIGIN escaping. Patch by: me --- main/site_scons/platform/freebsd.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/main/site_scons/platform/freebsd.py b/main/site_scons/platform/freebsd.py index c4558ed..8f0f188 100644 --- a/main/site_scons/platform/freebsd.py +++ b/main/site_scons/platform/freebsd.py @@ -42,12 +42,12 @@ class FreeBSD(aooplatform.Platform): self.libraryGroupLayers['UNOLIBS_OOO'] = 'OOO' self.libraryGroupLayers['UNOVERLIBS'] = 'URELIB' self.layerRPaths = {} - self.layerRPaths['URELIB'] = '$ORIGIN' - self.layerRPaths['UREBIN'] = '$ORIGIN/../lib:$ORIGIN' - self.layerRPaths['OOO'] = '$ORIGIN:$ORIGIN/../ure-link/lib' - self.layerRPaths['BRAND'] = '$ORIGIN:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' + self.layerRPaths['URELIB'] = '\$$ORIGIN' + self.layerRPaths['UREBIN'] = '\$$ORIGIN/../lib:\$$ORIGIN' + self.layerRPaths['OOO'] = '\$$ORIGIN:\$$ORIGIN/../ure-link/lib' + self.layerRPaths['BRAND'] = '\$$ORIGIN:\$$ORIGIN/../basis-link/program:\$$ORIGIN/../basis-link/ure-link/lib' self.layerRPaths['SDKBIN'] = '$ORIGIN/../../ure-link/lib' - self.layerRPaths['NONEBIN'] = '$ORIGIN/../lib:$ORIGIN' + self.layerRPaths['NONEBIN'] = '\$$ORIGIN/../lib:\$$ORIGIN' self.layerComponentPrefixes = {} self.layerComponentPrefixes['OOO'] = 'vnd.sun.star.expand:\\$$OOO_BASE_DIR/program/' self.layerComponentPrefixes['URELIB'] = 'vnd.sun.star.expand:\\$$URE_INTERNAL_LIB_DIR/'
