sb116: #i106891# evaluate conditional expression in soffice script at build time (based on a patch by mmeeks)

desktop/prj/d.lst

@@ -93,7 +93,7 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms
 
 ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
 
-..\%__SRC%\misc\soffice.sh %_DEST%\bin%_EXT%\soffice
+..\%__SRC%\misc\soffice.sh-expanded %_DEST%\bin%_EXT%\soffice
 ..\%__SRC%\misc\sbase.sh %_DEST%\bin%_EXT%\sbase
 ..\%__SRC%\misc\scalc.sh %_DEST%\bin%_EXT%\scalc
 ..\%__SRC%\misc\sdraw.sh %_DEST%\bin%_EXT%\sdraw

desktop/scripts/makefile.mk

@@ -54,7 +54,18 @@ UNIXTEXT= \
     $(MISC)$/unopkg.sh
 
 .IF "$(OS)" != "MACOSX"
+
+ALLTAR: $(MISC)$/soffice.sh-expanded
+
+$(MISC)/soffice.sh-expanded: $(MISC)/soffice.sh
+.IF "$(OS)" == "LINUX" && "$(CPUNAME)" == "POWERPC"
+    $(SED) 's/^#@# //' $< > $@
+.ELSE
+    $(COPY) $< $@
+.ENDIF
+
 UNIXTEXT+= $(MISC)$/soffice.sh
+
 .ENDIF
 
 .INCLUDE :  target.mk

desktop/scripts/soffice.sh

@@ -43,11 +43,8 @@ export SAL_ENABLE_FILE_LOCKING
 # working on your system.
 # SAL_NOOPENGL=true; export SAL_NOOPENGL
 
-# the following test is needed on Linux PPC with IBM j2sdk142
-if [ "`uname -s`" = "Linux" -a "`uname -m`" = "ppc" ] ; then
-    JITC_PROCESSOR_TYPE=6
-    export JITC_PROCESSOR_TYPE
-fi
+# The following is needed on Linux PPC with IBM j2sdk142:
+#@# export JITC_PROCESSOR_TYPE=6
 
 # resolve installation directory
 sd_cwd="`pwd`"