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

(-)config_office/configure (-2 / +19 lines)
Lines 1-5 Link Here
1
#! /bin/sh
1
#! /bin/sh
2
# From configure.in Revision: 1.53.2.7  .
2
# From configure.in Revision: 1.53.2.8  .
3
# Guess values for system-dependent variables and create Makefiles.
3
# Guess values for system-dependent variables and create Makefiles.
4
# Generated by GNU Autoconf 2.57.
4
# Generated by GNU Autoconf 2.57.
5
#
5
#
Lines 271-277 Link Here
271
PACKAGE_STRING=
271
PACKAGE_STRING=
272
PACKAGE_BUGREPORT=
272
PACKAGE_BUGREPORT=
273
273
274
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH _cc CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXCPP JAVA XMKMF PERL TCSH PKG_CONFIG GTK_CFLAGS GTK_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS BISON FLEX PATCH CYGWIN ML_EXE ZIP_EXE ANT ANT_HOME GXX_INCLUDE_PATH GCC_HOME GNUMAKE JAVA_HOME XLIB XINC LOCAL_SOLENV LOCAL_SOLVER UPD COMEX STLPORT4 WITH_LANG WITH_DICT PSDK_HOME ASM_HOME UNZIP_HOME WITH_MINGWIN USE_SHELL EXCEPTIONS OSVERSION USE_GCC3 PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_DEBUG ENABLE_STATIC_GTK ENVCFLAGSCXX ENABLE_CRASHDUMP WITH_GPC LIBOBJS LTLIBOBJS'
274
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH _cc CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXCPP JAVA XMKMF PERL TCSH PKG_CONFIG GTK_CFLAGS GTK_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS BISON FLEX PATCH CYGWIN ML_EXE ZIP_EXE ANT ANT_HOME GXX_INCLUDE_PATH GCC_HOME GNUMAKE JAVA_HOME XLIB XINC LOCAL_SOLENV LOCAL_SOLVER UPD COMEX STLPORT4 WITH_LANG WITH_DICT PSDK_HOME ASM_HOME UNZIP_HOME WITH_MINGWIN USE_SHELL EXCEPTIONS OSVERSION USE_GCC3 PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_DEBUG ENABLE_GLIBC_2_1_3 ENABLE_STATIC_GTK ENVCFLAGSCXX ENABLE_CRASHDUMP WITH_GPC LIBOBJS LTLIBOBJS'
275
ac_subst_files=''
275
ac_subst_files=''
276
276
277
# Initialize some variables set by options.
277
# Initialize some variables set by options.
Lines 829-834 Link Here
829
                          plus extra debugging code.  Extra large build!
829
                          plus extra debugging code.  Extra large build!
830
                          (enables -g compiler flag and dmake debug=true)
830
                          (enables -g compiler flag and dmake debug=true)
831
831
832
  --enable-glibc-2-1-3:   Enables you to compile a linux build if you
833
                          are still using glibc 2.1.3.
834
832
  --enable-crashdump:     Enable the crashdump feature code.
835
  --enable-crashdump:     Enable the crashdump feature code.
833
836
834
  --enable-static-gtk:    Modules that are linked against gtk libraries use
837
  --enable-static-gtk:    Modules that are linked against gtk libraries use
Lines 1403-1408 Link Here
1403
  enableval="$enable_debug"
1406
  enableval="$enable_debug"
1404
1407
1405
fi;
1408
fi;
1409
# Check whether --enable-glibc-2-1-3 or --disable-glibc-2-1-3 was given.
1410
if test "${enable_glibc_2_1_3+set}" = set; then
1411
  enableval="$enable_glibc_2_1_3"
1412
1413
fi;
1406
# Check whether --enable-crashdump or --disable-crashdump was given.
1414
# Check whether --enable-crashdump or --disable-crashdump was given.
1407
if test "${enable_crashdump+set}" = set; then
1415
if test "${enable_crashdump+set}" = set; then
1408
  enableval="$enable_crashdump"
1416
  enableval="$enable_crashdump"
Lines 6732-6737 Link Here
6732
echo "$as_me: error: libc is less than version 2.1.1, upgrade libc" >&2;}
6740
echo "$as_me: error: libc is less than version 2.1.1, upgrade libc" >&2;}
6733
   { (exit 1); exit 1; }; }
6741
   { (exit 1); exit 1; }; }
6734
   fi
6742
   fi
6743
   if test -n "$enable_glibc_2_1_3"; then
6744
      ENABLE_GLIBC_2_1_3="TRUE"
6745
   else
6746
      ENABLE_GLIBC_2_1_3="FALSE"
6747
   fi
6748
else
6749
   ENABLE_GLIBC_2_1_3="FALSE"
6735
fi
6750
fi
6736
if test \( "$_os" = "WINNT" \) ; then
6751
if test \( "$_os" = "WINNT" \) ; then
6737
	echo "$as_me:$LINENO: checking PSDK files" >&5
6752
	echo "$as_me:$LINENO: checking PSDK files" >&5
Lines 7357-7362 Link Here
7357
7372
7358
7373
7359
7374
7375
7360
          ac_config_files="$ac_config_files set_soenv"
7376
          ac_config_files="$ac_config_files set_soenv"
7361
cat >confcache <<\_ACEOF
7377
cat >confcache <<\_ACEOF
7362
# This file is a shell script that caches the results of configure
7378
# This file is a shell script that caches the results of configure
Lines 8051-8056 Link Here
8051
s,@PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t
8067
s,@PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t
8052
s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t
8068
s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t
8053
s,@ENABLE_DEBUG@,$ENABLE_DEBUG,;t t
8069
s,@ENABLE_DEBUG@,$ENABLE_DEBUG,;t t
8070
s,@ENABLE_GLIBC_2_1_3@,$ENABLE_GLIBC_2_1_3,;t t
8054
s,@ENABLE_STATIC_GTK@,$ENABLE_STATIC_GTK,;t t
8071
s,@ENABLE_STATIC_GTK@,$ENABLE_STATIC_GTK,;t t
8055
s,@ENVCFLAGSCXX@,$ENVCFLAGSCXX,;t t
8072
s,@ENVCFLAGSCXX@,$ENVCFLAGSCXX,;t t
8056
s,@ENABLE_CRASHDUMP@,$ENABLE_CRASHDUMP,;t t
8073
s,@ENABLE_CRASHDUMP@,$ENABLE_CRASHDUMP,;t t
(-)config_office/configure.in (+12 lines)
Lines 37-42 Link Here
37
                          plus extra debugging code.  Extra large build!
37
                          plus extra debugging code.  Extra large build!
38
                          (enables -g compiler flag and dmake debug=true)
38
                          (enables -g compiler flag and dmake debug=true)
39
],,)
39
],,)
40
AC_ARG_ENABLE(glibc-2-1-3,
41
[  --enable-glibc-2-1-3:   Enables you to compile a linux build if you
42
                          are still using glibc 2.1.3.
43
],,)
40
AC_ARG_ENABLE(crashdump,
44
AC_ARG_ENABLE(crashdump,
41
[  --enable-crashdump:     Enable the crashdump feature code.
45
[  --enable-crashdump:     Enable the crashdump feature code.
42
],,)
46
],,)
Lines 1112-1117 Link Here
1112
   else
1116
   else
1113
      AC_MSG_ERROR([libc is less than version 2.1.1, upgrade libc])
1117
      AC_MSG_ERROR([libc is less than version 2.1.1, upgrade libc])
1114
   fi
1118
   fi
1119
   if test -n "$enable_glibc_2_1_3"; then
1120
      ENABLE_GLIBC_2_1_3="TRUE"
1121
   else
1122
      ENABLE_GLIBC_2_1_3="FALSE"
1123
   fi
1124
else
1125
   ENABLE_GLIBC_2_1_3="FALSE"
1115
fi
1126
fi
1116
dnl =========================================
1127
dnl =========================================
1117
dnl Check for the Microsoft Platform SDK.
1128
dnl Check for the Microsoft Platform SDK.
Lines 1412-1417 Link Here
1412
AC_SUBST(PTHREAD_CFLAGS)
1423
AC_SUBST(PTHREAD_CFLAGS)
1413
AC_SUBST(PTHREAD_LIBS)
1424
AC_SUBST(PTHREAD_LIBS)
1414
AC_SUBST(ENABLE_DEBUG)
1425
AC_SUBST(ENABLE_DEBUG)
1426
AC_SUBST(ENABLE_GLIBC_2_1_3)
1415
AC_SUBST(ENABLE_STATIC_GTK)
1427
AC_SUBST(ENABLE_STATIC_GTK)
1416
AC_SUBST(ENVCFLAGSCXX)
1428
AC_SUBST(ENVCFLAGSCXX)
1417
AC_SUBST(ENABLE_CRASHDUMP)
1429
AC_SUBST(ENABLE_CRASHDUMP)
(-)config_office/set_soenv.in (-2 / +4 lines)
Lines 87-93 Link Here
87
     $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,
87
     $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,
88
     $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
88
     $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
89
     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $ENABLE_STATIC_GTK,
89
     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $ENABLE_STATIC_GTK,
90
     $PYTHONPATH, $PYTHONHOME );
90
     $ENABLE_GLIBC_2_1_3, $PYTHONPATH, $PYTHONHOME );
91
#
91
#
92
#-------------------------------------------
92
#-------------------------------------------
93
# IId. Declaring the aliases.
93
# IId. Declaring the aliases.
Lines 135-140 Link Here
135
$CXX		= '@CXX@';          # C++ compiler
135
$CXX		= '@CXX@';          # C++ compiler
136
$EXCEPTIONS	= '@EXCEPTIONS@';   # Exception handling type
136
$EXCEPTIONS	= '@EXCEPTIONS@';   # Exception handling type
137
$ENABLE_DEBUG	= '@ENABLE_DEBUG@';  # Enable a debug build
137
$ENABLE_DEBUG	= '@ENABLE_DEBUG@';  # Enable a debug build
138
$ENABLE_GLIBC_2_1_3 = '@ENABLE_GLIBC_2_1_3@';   # Enable glibc 2.1.3 build (only for glibc 2.1.3 systems)
138
$ENABLE_STATIC_GTK = '@ENABLE_STATIC_GTK@'; # Use static gtk libraries
139
$ENABLE_STATIC_GTK = '@ENABLE_STATIC_GTK@'; # Use static gtk libraries
139
$WRAPCMD	= "";				# Wrapper (only for winnt)
140
$WRAPCMD	= "";				# Wrapper (only for winnt)
140
141
Lines 807-813 Link Here
807
# see above for why the change
808
# see above for why the change
808
$XCLASSPATH           = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$ps.'.';
809
$XCLASSPATH           = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$ps.'.';
809
# Paths to run time shared libraries.
810
# Paths to run time shared libraries.
810
if ($platform eq "$Solaris") 
811
if ($platform eq "$Solaris")
811
{  $LD_LIBRARY_PATH   = $cur_dir.
812
{  $LD_LIBRARY_PATH   = $cur_dir.
812
                        $ps.$USR_DT.$LIB.
813
                        $ps.$USR_DT.$LIB.
813
                        $ps.$USR_OPENWIN.$LIB.
814
                        $ps.$USR_OPENWIN.$LIB.
Lines 1396-1401 Link Here
1396
if ($ENABLE_DEBUG eq "TRUE") {
1397
if ($ENABLE_DEBUG eq "TRUE") {
1397
ToFile( "debug",             "true",             "e" );
1398
ToFile( "debug",             "true",             "e" );
1398
}
1399
}
1400
ToFile( "ENABLE_GLIBC_2_1_3", $ENABLE_GLIBC_2_1_3, "e");
1399
ToFile( "ENABLE_STATIC_GTK", $ENABLE_STATIC_GTK, "e" );
1401
ToFile( "ENABLE_STATIC_GTK", $ENABLE_STATIC_GTK, "e" );
1400
ToFile( "PSPRINT",           "TRUE",             "e" );
1402
ToFile( "PSPRINT",           "TRUE",             "e" );
1401
# [ed] 5/14/02 If we're building Aqua graphics, insert a C macro to indicate this.
1403
# [ed] 5/14/02 If we're building Aqua graphics, insert a C macro to indicate this.
(-)desktop/source/pagein/file_image_unx.c (-1 / +48 lines)
Lines 66-72 Link Here
66
#include <errno.h>
66
#include <errno.h>
67
#include <fcntl.h>
67
#include <fcntl.h>
68
68
69
#if defined(LINUX)
69
#if defined(LINUX) && !defined(__USE_BSD)
70
#define __USE_BSD /* madvise, MADV_WILLNEED */
70
#define __USE_BSD /* madvise, MADV_WILLNEED */
71
#endif /* Linux */
71
#endif /* Linux */
72
72
Lines 75-80 Link Here
75
75
76
#include <string.h>
76
#include <string.h>
77
77
78
#if defined(LINUX) && defined(HAVE_GLIBC_2_1_3)
79
#include <gnu/libc-version.h>
80
81
#if !defined(MADV_WILLNEED)
82
#define MADV_WILLNEED 3
83
#endif
84
85
#endif /* LINUX && HAVE_GLIBC_2_1_3 */
86
78
/*
87
/*
79
 * file_image_open
88
 * file_image_open
80
 */
89
 */
Lines 122-127 Link Here
122
	long          s;
131
	long          s;
123
	size_t        k;
132
	size_t        k;
124
	volatile char c = 0;
133
	volatile char c = 0;
134
#if defined(LINUX) && defined(HAVE_GLIBC_2_1_3)
135
        char          *vstr;
136
        int           maj_ver;
137
        int           min_ver;
138
        int           mic_ver;
139
#endif /* LINUX && HAVE_GLIBC_2_1_3 */
125
140
126
	if (image == 0)
141
	if (image == 0)
127
		return (EINVAL);
142
		return (EINVAL);
Lines 131-138 Link Here
131
	if ((w.m_size = image->m_size) == 0)
146
	if ((w.m_size = image->m_size) == 0)
132
		return (0);
147
		return (0);
133
148
149
#if defined(LINUX) && defined(HAVE_GLIBC_2_1_3)
150
	/* Runtime check: Make sure glibc 2.1.3 builds take advantage */
151
	/*                of madvise() on >= glibc 2.2 systems */
152
	maj_ver = min_ver = mic_ver = 0;
153
	vstr = (char *) gnu_get_libc_version();
154
155
	if (NULL != vstr)
156
	{
157
		maj_ver = atoi (vstr);
158
		vstr = strchr (vstr, '.');
159
160
		if ((NULL != vstr) && (strlen (vstr) > 1))
161
		{
162
			min_ver = atoi (++vstr);
163
			vstr = strchr (vstr, '.');
164
165
			if ((NULL != vstr) && (strlen (vstr) > 1))
166
				mic_ver = atoi (++vstr);
167
		}
168
169
		if ((maj_ver > 2) || ((maj_ver == 2) && (min_ver >= 2)))
170
		{
171
			if (madvice (w.m_base, w.m_size, MADV_WILLNEED) == -1)
172
				return (errno);
173
		} else {
174
			return (0);
175
		}	
176
	} else {
177
		return (0);
178
	}
179
#else
134
	if (madvise (w.m_base, w.m_size, MADV_WILLNEED) == -1)
180
	if (madvise (w.m_base, w.m_size, MADV_WILLNEED) == -1)
135
		return (errno);
181
		return (errno);
182
#endif /* LINUX && HAVE_GLIBC_2_1_3 */
136
	
183
	
137
	if ((s = sysconf (_SC_PAGESIZE)) == -1)
184
	if ((s = sysconf (_SC_PAGESIZE)) == -1)
138
		s = 0x1000;
185
		s = 0x1000;
(-)desktop/source/pagein/makefile.mk (+6 lines)
Lines 89-94 Link Here
89
STDLIB+=-library=no%Crun
89
STDLIB+=-library=no%Crun
90
.ENDIF # sunpro5
90
.ENDIF # sunpro5
91
91
92
.IF "$(OS)"=="LINUX"
93
.IF "$(ENABLE_GLIBC_2_1_3)" == "TRUE"
94
CFLAGS+=-DHAVE_GLIBC_2_1_3
95
.ENDIF
96
.ENDIF # "$(OS)"=="LINUX"
97
92
# --- Targets ------------------------------------------------------
98
# --- Targets ------------------------------------------------------
93
99
94
ALL: \
100
ALL: \
(-)setup2/mow/source/loader/loader.c (-3 / +33 lines)
Lines 848-853 Link Here
848
848
849
#ifdef LINUX
849
#ifdef LINUX
850
#include <dlfcn.h>
850
#include <dlfcn.h>
851
/* returns: v0 < v1: -1, v0 == v1: 0, v0 > v1: 1 */
852
int cmp_ver_triple (int maj0, int min0, int mic0, /* v0 */
853
                    int maj1, int min1, int mic1) /* v1 */
854
{
855
    if (maj0 < maj1) {
856
        return -1;
857
    } else if (maj0 > maj1) {
858
        return 1;
859
    } else if (min0 < min1) {
860
        return -1;
861
    } else if (min0 > min1) {
862
        return 1;
863
    } else if (mic0 < mic1) {
864
        return -1;
865
    } else if (mic0 > mic1) {
866
        return 1;
867
    }
868
    return 0;
869
}
870
851
void check_glibc()
871
void check_glibc()
852
{
872
{
853
    void *handle;
873
    void *handle;
Lines 883-898 Link Here
883
        }
903
        }
884
        dlclose (handle);
904
        dlclose (handle);
885
905
886
        if ((maj_ver > 2) || ((maj_ver == 2) && (min_ver >= 2)))
906
#ifndef HAVE_GLIBC_2_1_3
907
        if (cmp_ver_triple (maj_ver, min_ver, mic_ver, 2, 2, 0) >= 0)
887
            return;
908
            return;
909
#else
910
        if (cmp_ver_triple (maj_ver, min_ver, mic_ver, 2, 1, 3) >= 0)
911
            return;
912
#endif
888
    } else {
913
    } else {
889
        dlclose (handle);
914
        dlclose (handle);
890
    }
915
    }
891
916
892
    printf("error: wrong glibc version, you need at least 2.2.0\n" );
917
    printf("error: wrong glibc version, you need at least %s\n",
918
#ifndef HAVE_GLIBC_2_1_3
919
           "2.2.0");
920
#else
921
           "2.1.3");
922
#endif
893
    exit(1);
923
    exit(1);
894
}
924
}
895
#endif
925
#endif /* #ifdef LINUX */
896
926
897
Bool b_xerror = False;
927
Bool b_xerror = False;
898
928
(-)setup2/mow/source/loader/makefile.mk (+6 lines)
Lines 101-106 Link Here
101
APP1STDLIBS=$(SVUNZIPLIB) $(LOADERLIB) -ldl
101
APP1STDLIBS=$(SVUNZIPLIB) $(LOADERLIB) -ldl
102
.ENDIF
102
.ENDIF
103
103
104
.IF "$(OS)"=="LINUX"
105
.IF "$(ENABLE_GLIBC_2_1_3)" == "TRUE"
106
CFLAGS+=-DHAVE_GLIBC_2_1_3
107
.ENDIF
108
.ENDIF # "$(OS)"=="LINUX"
109
104
.ENDIF			# "$(OS)"=="MACOSX"
110
.ENDIF			# "$(OS)"=="MACOSX"
105
111
106
# --- Targets ------------------------------------------------------
112
# --- Targets ------------------------------------------------------

Return to issue 16150