remove JITC_PROCESSOR_TYPE export for powerpc
long obsolete; there's no IBM JDK for 32-bit ppc anymore. And it breaks creating instdir/program/soffice with +x by cp (sed doesn't keep the permission, obviously) Change-Id: I9e8ffc6017056adb5142099a661761c2caaa87c4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195487 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@collabora.com>
This commit is contained in:
committed by
Stephan Bergmann
parent
c6633d2dd3
commit
8595bdadb9
@@ -389,7 +389,6 @@ export JDK=@JDK@
|
||||
export JDK_FOR_BUILD=@JDK_FOR_BUILD@
|
||||
export JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD=@JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD@
|
||||
export JFREEREPORT_JAR=@JFREEREPORT_JAR@
|
||||
export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@
|
||||
JOM=@JOM@
|
||||
export JQ=@JQ@
|
||||
export JVM_ONE_PATH_CHECK=@JVM_ONE_PATH_CHECK@
|
||||
|
||||
@@ -9069,14 +9069,6 @@ AC_SUBST(LD_PLUGIN)
|
||||
AC_CHECK_FUNCS(posix_fallocate, HAVE_POSIX_FALLOCATE=YES, [HAVE_POSIX_FALLOCATE=NO])
|
||||
AC_SUBST(HAVE_POSIX_FALLOCATE)
|
||||
|
||||
JITC_PROCESSOR_TYPE=""
|
||||
if test "$_os" = "Linux" -a "$host_cpu" = "powerpc"; then
|
||||
# IBMs JDK needs this...
|
||||
JITC_PROCESSOR_TYPE=6
|
||||
export JITC_PROCESSOR_TYPE
|
||||
fi
|
||||
AC_SUBST([JITC_PROCESSOR_TYPE])
|
||||
|
||||
if test $_os = "WINNT"; then
|
||||
for i in $PKGFORMAT; do
|
||||
if test "$i" = msi; then
|
||||
|
||||
@@ -35,11 +35,7 @@ $(gb_CustomTarget_workdir)/desktop/soffice/soffice.sh : \
|
||||
| $(gb_CustomTarget_workdir)/desktop/soffice/.dir
|
||||
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
|
||||
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),SED)
|
||||
ifneq ($(JITC_PROCESSOR_TYPE),)
|
||||
sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/export JITC_PROCESSOR_TYPE=$(JITC_PROCESSOR_TYPE)/" $< > $@
|
||||
else
|
||||
cp $< $@
|
||||
endif
|
||||
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),SED)
|
||||
|
||||
endif
|
||||
|
||||
@@ -37,8 +37,6 @@ export SAL_ENABLE_FILE_LOCKING
|
||||
# uncomment line below if you encounter problems starting soffice on your system
|
||||
# SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
|
||||
|
||||
#@JITC_PROCESSOR_TYPE_EXPORT@
|
||||
|
||||
# resolve installation directory
|
||||
sd_cwd=$(pwd)
|
||||
sd_res="$0"
|
||||
|
||||
Reference in New Issue
Block a user