View | Details | Raw Unified | Return to issue 10150
Collapse All | Expand All

(-)oo_1.0.1_src/config_office/set_soenv.1.bak (+11 lines)
Lines 389-394 Link Here
389
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
390
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
390
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
391
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
391
   }
392
   }
393
   elsif ($machine_type eq "s390")
394
   {  print "Setting Linux S/390 specific values... ";
395
      $outfile        = "LinuxS390Env.Set";
396
      $CPU            = "3";
397
      $CPUNAME        = "S390";
398
      $DLLSUFFIX      = "l3";
399
      $OUTPATH        = "unxlngs390";
400
      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."s390";
401
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."s390".$ds."client";
402
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."s390".$ds."native_threads";
403
       }
392
   elsif ($machine_type eq "alpha") 
404
   elsif ($machine_type eq "alpha") 
393
   {  print "Setting Linux Alpha specific values... ";
405
   {  print "Setting Linux Alpha specific values... ";
394
      $outfile        = "LinuxAlphaEnv.Set"; 
406
      $outfile        = "LinuxAlphaEnv.Set"; 
(-)oo_1.0.1_src/solenv/inc.bak/unx.mk (+4 lines)
Lines 124-129 Link Here
124
.INCLUDE : unxlngppc4.mk 
124
.INCLUDE : unxlngppc4.mk 
125
.ENDIF 
125
.ENDIF 
126
 
126
 
127
.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC300LINUX32REDHAT60" 
128
.INCLUDE : unxlngs3904.mk 
129
.ENDIF 
130
 
127
.IF "$(COM)$(OS)$(CPU)$(GLIBC)" == "GCCLINUXR2REDHAT60"
131
.IF "$(COM)$(OS)$(CPU)$(GLIBC)" == "GCCLINUXR2REDHAT60"
128
.INCLUDE : unxlngr.mk
132
.INCLUDE : unxlngr.mk
129
.ENDIF
133
.ENDIF
(-)oo_1.0.1_src/solenv/inc.bak/unxlngs3904.mk (+228 lines)
Line 0 Link Here
1
#*************************************************************************
2
#
3
#   $RCSfile: unxlngs3904.mk,v $
4
#
5
#   $Revision: 1.1.2.3 $
6
#
7
#   last change: $Author: khendricks $ $Date: 2002/06/07 14:11:58 $
8
#
9
#   The Contents of this file are made available subject to the terms of
10
#   either of the following licenses
11
#
12
#          - GNU Lesser General Public License Version 2.1
13
#          - Sun Industry Standards Source License Version 1.1
14
#
15
#   Sun Microsystems Inc., October, 2000
16
#
17
#   GNU Lesser General Public License Version 2.1
18
#   =============================================
19
#   Copyright 2000 by Sun Microsystems, Inc.
20
#   901 San Antonio Road, Palo Alto, CA 94303, USA
21
#
22
#   This library is free software; you can redistribute it and/or
23
#   modify it under the terms of the GNU Lesser General Public
24
#   License version 2.1, as published by the Free Software Foundation.
25
#
26
#   This library is distributed in the hope that it will be useful,
27
#   but WITHOUT ANY WARRANTY; without even the implied warranty of
28
#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
29
#   Lesser General Public License for more details.
30
#
31
#   You should have received a copy of the GNU Lesser General Public
32
#   License along with this library; if not, write to the Free Software
33
#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
34
#   MA  02111-1307  USA
35
#
36
#
37
#   Sun Industry Standards Source License Version 1.1
38
#   =================================================
39
#   The contents of this file are subject to the Sun Industry Standards
40
#   Source License Version 1.1 (the "License"); You may not use this file
41
#   except in compliance with the License. You may obtain a copy of the
42
#   License at http://www.openoffice.org/license.html.
43
#
44
#   Software provided under this License is provided on an "AS IS" basis,
45
#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
46
#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
47
#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
48
#   See the License for the specific provisions governing your rights and
49
#   obligations concerning the Software.
50
#
51
#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
52
#
53
#   Copyright: 2000 by Sun Microsystems, Inc.
54
#
55
#   All Rights Reserved.
56
#
57
#   Contributor(s): _______________________________________
58
#
59
#
60
#
61
#*************************************************************************
62
63
# mk file for linux s390 using gcc 3.X
64
ASM=
65
AFLAGS=
66
67
SOLAR_JAVA=TRUE
68
JAVAFLAGSDEBUG=-g
69
70
# filter for supressing verbose messages from linker
71
#not needed at the moment
72
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
73
74
# _PTHREADS is needed for the stl
75
CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
76
77
# this is a platform with JAVA support
78
.IF "$(SOLAR_JAVA)"!=""
79
JAVADEF=-DSOLAR_JAVA
80
.IF "$(debug)"==""
81
JAVA_RUNTIME=-ljava
82
.ELSE
83
JAVA_RUNTIME=-ljava_g
84
.ENDIF
85
.ENDIF 
86
87
# name of C++ Compiler
88
CC=$(CXXCOMP)
89
# name of C Compiler
90
cc=$(CCCOMP)
91
92
# flags for C and C++ Compiler
93
# do not use standard header search paths
94
# if installed elsewhere
95
.IF "$(BUILD_SOSL)"!=""
96
CFLAGS= 
97
.ENDIF
98
CFLAGS+=-fsigned-char -fmessage-length=0 -c $(INCLUDE)
99
100
# flags for the C++ Compiler
101
CFLAGSCC= -fsigned-char -pipe 
102
103
# Flags for enabling exception handling
104
CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
105
106
# Flags for disabling exception handling
107
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
108
109
# -fpermissive should be removed as soon as possible
110
#CFLAGSCXX= -fsigned-char -pipe -fno-for-scope -fpermissive -fno-rtti 
111
CFLAGSCXX= -fsigned-char -pipe -fno-for-scope -fpermissive
112
113
114
# Compiler flags for compiling static object in single threaded environment with graphical user interface
115
CFLAGSOBJGUIST=-fPIC
116
# Compiler flags for compiling static object in single threaded environment with character user interface
117
CFLAGSOBJCUIST=-fPIC
118
# Compiler flags for compiling static object in multi threaded environment with graphical user interface
119
CFLAGSOBJGUIMT=-fPIC
120
# Compiler flags for compiling static object in multi threaded environment with character user interface
121
CFLAGSOBJCUIMT=-fPIC
122
# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
123
CFLAGSSLOGUIMT=-fPIC
124
# Compiler flags for compiling shared object in multi threaded environment with character user interface
125
CFLAGSSLOCUIMT=-fPIC
126
127
# Compiler flags for profiling
128
CFLAGSPROF=
129
130
# Compiler flags for debugging
131
CFLAGSDEBUG=-g
132
CFLAGSDBGUTIL=
133
134
# Compiler flags for enabling optimazations
135
#CFLAGSOPT=-O2 -fno-schedule-insns -fno-strict-aliasing -fno-schedule-insns2
136
CFLAGSOPT=-O2 -fno-strict-aliasing
137
138
# Compiler flags for disabling optimazations
139
# don't change - require dto work around optimization bugs
140
CFLAGSNOOPT=-O0
141
142
# Compiler flags for discibing the output path
143
CFLAGSOUTOBJ=-o
144
145
# Enable all warnings
146
CFLAGSWALL=-Wall
147
148
# Set default warn level
149
CFLAGSDFLTWARN=-w
150
151
# switches for dynamic and static linking
152
STATIC		= -Wl,-Bstatic
153
DYNAMIC		= -Wl,-Bdynamic
154
155
# name of linker
156
LINK=$(CXXCOMP)
157
# default linker flags
158
LINKFLAGS=
159
160
# linker flags for linking applications
161
LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
162
LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
163
164
# linker flags for linking shared libraries
165
LINKFLAGSSHLGUI= -shared
166
LINKFLAGSSHLCUI= -shared
167
168
LINKFLAGSTACK=
169
LINKFLAGSPROF=
170
LINKFLAGSDEBUG=-g
171
LINKFLAGSOPT=
172
173
.IF "$(NO_BSYMBOLIC)"==""
174
.IF "$(PRJNAME)" != "envtest"
175
LINKFLAGSSHLGUI+=-Wl,-Bsymbolic
176
LINKFLAGSSHLCUI+=-Wl,-Bsymbolic
177
.ENDIF
178
.ENDIF				# "$(NO_BSYMBOLIC)"==""
179
180
LINKVERSIONMAPFLAG=-Wl,--version-script
181
182
SONAME_SWITCH=-Wl,-h
183
184
# Sequence of libs does matter !
185
186
STDLIBCPP=-lstdc++
187
188
# default objectfilenames to link
189
STDOBJGUI=
190
STDSLOGUI=
191
STDOBJCUI=
192
STDSLOCUI=
193
194
# libraries for linking applications
195
STDLIBCUIST=-ldl -lm
196
STDLIBGUIMT=-lX11 -ldl -lpthread -lm
197
STDLIBCUIMT=-ldl -lpthread -lm
198
STDLIBGUIST=-lX11 -ldl -lm
199
# libraries for linking shared libraries
200
STDSHLGUIMT=-lX11 -lXext -ldl -lpthread -lm
201
STDSHLCUIMT=-ldl -lpthread -lm
202
203
LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++
204
LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
205
206
#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
207
208
# name of library manager
209
LIBMGR=ar
210
LIBFLAGS=-r
211
212
# tool for generating import libraries
213
IMPLIB=
214
IMPLIBFLAGS=
215
216
MAPSYM=
217
MAPSYMFLAGS=
218
219
RC=irc
220
RCFLAGS=-fo$@ $(RCFILES)
221
RCLINK=
222
RCLINKFLAGS=
223
RCSETVERSION=
224
225
# platform specific identifier for shared libs
226
DLLPOSTFIX=l3
227
DLLPRE=lib
228
DLLPOST=.so
(-)oo_1.0.1_src/psprint/source/fontsubset/sft.h.bak (+6 lines)
Lines 122-127 Link Here
122
#endif
122
#endif
123
#endif
123
#endif
124
124
125
#if defined(__s390__)
126
#ifndef G_BIG_ENDIAN
127
#define G_BIG_ENDIAN
128
#endif
129
#endif
130
125
#ifdef __i386
131
#ifdef __i386
126
#ifndef G_LITTLE_ENDIAN
132
#ifndef G_LITTLE_ENDIAN
127
#define G_LITTLE_ENDIAN
133
#define G_LITTLE_ENDIAN
(-)oo_1.0.1_src/tools/inc/solar.h.bak (+4 lines)
Lines 416-421 Link Here
416
#define SYSTEM_UNXBSDS		25
416
#define SYSTEM_UNXBSDS		25
417
#define SYSTEM_UNXLNXR		26
417
#define SYSTEM_UNXLNXR		26
418
#define SYSTEM_UNXBSDP		27
418
#define SYSTEM_UNXBSDP		27
419
#define SYSTEM_UNXLNX3         28
419
420
420
#if defined WNT
421
#if defined WNT
421
  #define __DLLEXTENSION "mi"
422
  #define __DLLEXTENSION "mi"
Lines 454-459 Link Here
454
#elif defined LINUX && defined POWERPC
455
#elif defined LINUX && defined POWERPC
455
  #define __DLLEXTENSION "lp.so"
456
  #define __DLLEXTENSION "lp.so"
456
  #define SYSTEM_ID 		SYSTEM_UNXLNXP
457
  #define SYSTEM_ID 		SYSTEM_UNXLNXP
458
#elif defined LINUX && defined S390
459
  #define __DLLEXTENSION "l3.so"
460
  #define SYSTEM_ID 		SYSTEM_UNXLNX3
457
#elif defined LINUX && defined ARM32
461
#elif defined LINUX && defined ARM32
458
  #define __DLLEXTENSION "lr.so"
462
  #define __DLLEXTENSION "lr.so"
459
  #define SYSTEM_ID 	SYSTEM_UNXLNXR
463
  #define SYSTEM_ID 	SYSTEM_UNXLNXR
(-)oo_1.0.1_src/setup2/source/custom/jvmsetup/unx/jvmscan.cxx.bak (+2 lines)
Lines 111-116 Link Here
111
#define ARCH "ppc"
111
#define ARCH "ppc"
112
#elif defined (MIPS)
112
#elif defined (MIPS)
113
#define ARCH "mips"
113
#define ARCH "mips"
114
#elif defined (S390)
115
#define ARCH "s390"
114
#else
116
#else
115
#error unknown plattform
117
#error unknown plattform
116
#endif
118
#endif
(-)oo_1.0.1_src/config_office/configure.in.bak (+12 lines)
Lines 829-834 Link Here
829
   if test "$_os" = "Linux" -a "$_machine_type" = "armv4l"; then
829
   if test "$_os" = "Linux" -a "$_machine_type" = "armv4l"; then
830
      _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
830
      _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
831
   fi
831
   fi
832
   if test "$_os" = "Linux" -a "$_machine_type" = "s390"; then
833
      _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
834
      _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
835
836
      if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
837
         _jdk_minor="true"
838
      fi
839
840
   fi
832
   if test "$_os" = "WINNT"; then
841
   if test "$_os" = "WINNT"; then
833
      _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
842
      _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
834
      _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
843
      _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
Lines 863-868 Link Here
863
         if test "$_machine_type" = "armv4l"; then
872
         if test "$_machine_type" = "armv4l"; then
864
            _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
873
            _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
865
         fi 
874
         fi 
875
         if test "$_machine_type" = "s390"; then
876
            _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
877
         fi 
866
      fi
878
      fi
867
      if test "$_os" = "OSF1"; then
879
      if test "$_os" = "OSF1"; then
868
         _jdk_minor=`echo $_jdk | $AWK -F- '{print $1}' | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
880
         _jdk_minor=`echo $_jdk | $AWK -F- '{print $1}' | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`

Return to issue 10150