1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
From f154bce7304938cd85ff92086afab5d9f5622e5f Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@rene-engelhard.de>
Date: Thu, 11 Dec 2025 19:26:02 +0100
Subject: [PATCH] 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
---
diff --git a/config_host.mk.in b/config_host.mk.in
index abbdb3f..2103814 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -389,7 +389,6 @@
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@
diff --git a/configure.ac b/configure.ac
index 6b51d0a..db70f46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9069,14 +9069,6 @@
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
diff --git a/desktop/CustomTarget_soffice.mk b/desktop/CustomTarget_soffice.mk
index 26e661e..0c895c7 100644
--- a/desktop/CustomTarget_soffice.mk
+++ b/desktop/CustomTarget_soffice.mk
@@ -35,11 +35,7 @@
| $(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
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 7188f39..1f3c4cd1 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -37,8 +37,6 @@
# 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"
|
