[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in desktop/Module_desktop.mk desktop/Package_scripts.mk desktop/scripts set_soenv.in

[David Tardon]

 config_host.mk.in          |    2 +-
 configure.in               |    4 ++--
 desktop/Module_desktop.mk  |    5 ++++-
 desktop/Package_scripts.mk |    8 --------
 desktop/scripts/Makefile   |    6 +++++-
 set_soenv.in               |    3 ---
 6 files changed, 12 insertions(+), 16 deletions(-)

New commits:
commit c475316c00056ab2c59438fb78705c2a851f292b
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Jan 14 10:23:57 2012 +0100

    simplify handling of JITC_PROCESSOR_TYPE

diff --git a/config_host.mk.in b/config_host.mk.in
index 280c844..f8b0d81 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -173,7 +173,7 @@ export INSTALLDIR="@INSTALLDIR@"
 export INSTALLDIRNAME="@INSTALLDIRNAME@"
 export INTRO_BIPMAP="@INTRO_BITMAP@"
 @x_JAVALIB@ export JAVALIB="@JAVALIB@"
-export JITC_PROCESSOR_TYPE_EXPORT="@JITC_PROCESSOR_TYPE_EXPORT@"
+export JITC_PROCESSOR_TYPE="@JITC_PROCESSOR_TYPE@"
 export JFREEREPORT_JAR="@JFREEREPORT_JAR@"
 export KDE4_CFLAGS="@KDE4_CFLAGS@"
 export KDE4_LIBS="@KDE4_LIBS@"
diff --git a/configure.in b/configure.in
index cef039e..84c1dcc 100644
--- a/configure.in
+++ b/configure.in
@@ -4309,13 +4309,13 @@ dnl empty or non-empty.
 
 dnl SOLAR_JAVA="" indicate no java support at all
 
+JITC_PROCESSOR_TYPE=""
 if test "$_os" = "Linux" && test "$host_cpu" = "powerpc"; then
     # IBMs JDK needs this...
     JITC_PROCESSOR_TYPE=6
     export JITC_PROCESSOR_TYPE
-    JITC_PROCESSOR_TYPE_EXPORT="export JITC_PROCESSOR_TYPE=$JITC_PROCESSOR_TYPE"
 fi
-AC_SUBST([JITC_PROCESSOR_TYPE_EXPORT])
+AC_SUBST([JITC_PROCESSOR_TYPE])
 
 if test $_os = "WINNT"; then
     WITH_VC_REDIST="TRUE"
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index ed2c1fe..17fe079 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -71,14 +71,12 @@ $(eval $(call gb_Module_add_targets,desktop,\
 
 ifneq ($(OS),MACOSX)
 ifneq ($(OS),WNT)
-ifneq ($(JITC_PROCESSOR_TYPE_EXPORT),)
 $(eval $(call gb_Module_add_targets,desktop,\
     Package_soffice_sh \
 ))
 endif
 endif
 endif
-endif
 
 ifeq ($(OS),WNT)
 
diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
index 7611765..9492306 100644
--- a/desktop/Package_scripts.mk
+++ b/desktop/Package_scripts.mk
@@ -46,14 +46,6 @@ $(eval $(call gb_Package_add_file,desktop_scripts,bin/swriter,swriter.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/unoinfo,unoinfo.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/unopkg,unopkg.sh))
 
-ifneq ($(OS),MACOSX)
-ifeq ($(JITC_PROCESSOR_TYPE_EXPORT),)
-
-$(eval $(call gb_Package_add_file,desktop_scripts,bin/soffice,soffice.sh))
-
-endif
-endif
-
 endif
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/scripts/Makefile b/desktop/scripts/Makefile
index 349c5dd..a654b6b 100644
--- a/desktop/scripts/Makefile
+++ b/desktop/scripts/Makefile
@@ -26,7 +26,11 @@
 # instead of those above.
 
 soffice.sh : $(SRCDIR)/desktop/scripts/soffice.sh
-	sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/$(JITC_PROCESSOR_TYPE_EXPORT)/" $< > $@
+ifneq ($(JITC_PROCESSOR_TYPE),)
+	sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/export JITC_PROCESSOR_TYPE=$(JITC_PROCESSOR_TYPE)/" $< > $@
+else
+	cp $< $@
+endif
 
 .DEFAULT_GOAL := all
 .PHONY : all
diff --git a/set_soenv.in b/set_soenv.in
index e558deb..53b388f 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -888,9 +888,6 @@ if ("@ENABLE_WERROR@" eq "FALSE") {
 ToFile( "EXTERNAL_WARNINGS_NOT_ERRORS", "TRUE",  "e" );
 }
 ToFile( "PROEXT",            $PROEXT,            "e" );
-if ($platform =~ m/linux/ && $platform =~ m/powerpc/) {
-ToFile( "JITC_PROCESSOR_TYPE","6",                 "e" );
-}
 ToFile( "nodep",             "@nodep@",          "e" );
 ToFile( "TARFILE_LOCATION",  $TARFILE_LOCATION,  "e" );
 
commit f4092cb7657b0a403078d593cb612431858150ca
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Jan 14 15:28:10 2012 +0100

    do not build on macosx and win

diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 267cc2c..ed2c1fe 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -68,12 +68,17 @@ $(eval $(call gb_Module_add_targets,desktop,\
     Pagein_impress \
     Pagein_writer \
 ))
+
+ifneq ($(OS),MACOSX)
+ifneq ($(OS),WNT)
 ifneq ($(JITC_PROCESSOR_TYPE_EXPORT),)
 $(eval $(call gb_Module_add_targets,desktop,\
     Package_soffice_sh \
 ))
 endif
 endif
+endif
+endif
 
 ifeq ($(OS),WNT)