diff options
| -rw-r--r-- | config_host.mk.in | 2 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | desktop/Module_desktop.mk | 2 | ||||
| -rw-r--r-- | desktop/Package_scripts.mk | 8 | ||||
| -rw-r--r-- | desktop/scripts/Makefile | 6 | ||||
| -rwxr-xr-x | set_soenv.in | 3 |
6 files changed, 8 insertions, 17 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 280c84432865..f8b0d8110f55 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 cef039eeebdf..84c1dcc24531 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 ed2c1fe51799..17fe079cde37 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 76117652a0c2..949230699107 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 349c5dd1c155..a654b6b22a6d 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 e558debcaccd..53b388f68772 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" ); |