summaryrefslogtreecommitdiff
path: root/editors/openoffice.org-3
diff options
context:
space:
mode:
authorMartin Blapp <mbr@FreeBSD.org>2002-03-09 22:41:53 +0000
committerMartin Blapp <mbr@FreeBSD.org>2002-03-09 22:41:53 +0000
commit006f3e56bc19cfdbe01dbba9fb9aea415d9f885a (patch)
treee8e75922d5cd621254475c87713cbee5dc418d14 /editors/openoffice.org-3
parentUpdate to version checkbot-1.67 (diff)
Use PTHREAD_CFLAGS and PTHREAD_LIBS for the threaded parts.
Requested by: cvs-comitters
Notes
Notes: svn path=/head/; revision=55786
Diffstat (limited to 'editors/openoffice.org-3')
-rw-r--r--editors/openoffice.org-3/Makefile3
-rw-r--r--editors/openoffice.org-3/files/patch-config_office+configure.in4
-rw-r--r--editors/openoffice.org-3/files/patch-config_office::configure.in4
-rw-r--r--editors/openoffice.org-3/files/patch-set_soenv.133
-rw-r--r--editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk46
-rw-r--r--editors/openoffice.org-3/files/patch-solenv::inc::unxfbsdi.mk46
6 files changed, 74 insertions, 62 deletions
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 3a03ca43fef0..2a13d0efec88 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -42,6 +42,9 @@ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \
--with-jdk-home=${JDK13DIR} \
--with-os-version=${OSVERSION}
+CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
+ PTHREAD_LIBS=${PTHREAD_LIBS}
+
.include <bsd.port.pre.mk>
pre-fetch:
diff --git a/editors/openoffice.org-3/files/patch-config_office+configure.in b/editors/openoffice.org-3/files/patch-config_office+configure.in
index fc2a394482f7..755c69de6129 100644
--- a/editors/openoffice.org-3/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-3/files/patch-config_office+configure.in
@@ -1,5 +1,5 @@
--- configure.in.orig Mon Nov 12 22:45:53 2001
-+++ configure.in Fri Mar 8 23:53:42 2002
++++ configure.in Sat Mar 9 23:08:27 2002
@@ -98,6 +98,12 @@
Usage: --with-asm-home=<path to ml.exe directory>
@@ -87,7 +87,7 @@
# Executing the set_soenv script to setup the environment variables.
if test -z "$enable_check_only"; then
- './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home
-+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $with_os_version
++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS
else
echo
echo Test Complete
diff --git a/editors/openoffice.org-3/files/patch-config_office::configure.in b/editors/openoffice.org-3/files/patch-config_office::configure.in
index fc2a394482f7..755c69de6129 100644
--- a/editors/openoffice.org-3/files/patch-config_office::configure.in
+++ b/editors/openoffice.org-3/files/patch-config_office::configure.in
@@ -1,5 +1,5 @@
--- configure.in.orig Mon Nov 12 22:45:53 2001
-+++ configure.in Fri Mar 8 23:53:42 2002
++++ configure.in Sat Mar 9 23:08:27 2002
@@ -98,6 +98,12 @@
Usage: --with-asm-home=<path to ml.exe directory>
@@ -87,7 +87,7 @@
# Executing the set_soenv script to setup the environment variables.
if test -z "$enable_check_only"; then
- './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home
-+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $with_os_version
++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS
else
echo
echo Test Complete
diff --git a/editors/openoffice.org-3/files/patch-set_soenv.1 b/editors/openoffice.org-3/files/patch-set_soenv.1
index be73d3047dcf..9eb4e979c741 100644
--- a/editors/openoffice.org-3/files/patch-set_soenv.1
+++ b/editors/openoffice.org-3/files/patch-set_soenv.1
@@ -1,24 +1,27 @@
--- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Sat Mar 9 00:32:14 2002
++++ set_soenv.1 Sat Mar 9 23:19:31 2002
@@ -40,7 +40,7 @@
#
# Set this value equal to the corresponding amount of
# command line arguments.
-my $numArgs = 17;
-+my $numArgs = 18;
++my $numArgs = 20;
# Determining the amount of arguments in the call.
my $numEnter = $#ARGV + 1;
if ( $numEnter != $numArgs )
-@@ -72,7 +72,7 @@
+@@ -72,8 +72,9 @@
#
# Platform dependent constant values.
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
+- $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
- $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
++ $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $PTHREAD_CFLAGS,
++ $PTHREAD_LIBS );
#
#-------------------------------------------
-@@ -301,7 +301,7 @@
+ # IIc. Declaring the environment variables.
+@@ -301,7 +302,7 @@
$PROSWITCH = "-DPRODUCT";
$XPVERSION = "3";
$SOLAR_JAVA = "TRUE";
@@ -27,25 +30,29 @@
}
elsif ( $platform eq "$FreeBSD" )
{ print "Setting FreeBSD specific values... ";
-@@ -324,6 +324,7 @@
+@@ -324,6 +325,9 @@
$PATH_SEPERATOR = $ps;
$PROSWITCH = "-DPRODUCT";
$XPVERSION = "3";
+ $OSVERSION = $ARGV[ 17 ];
++ $PTHREAD_CFLAGS = $ARGV[ 18 ];
++ $PTHREAD_LIBS = $ARGV[ 19 ];
}
elsif ( $platform eq "$Linux" )
{
-@@ -857,7 +858,8 @@
+@@ -857,7 +861,10 @@
$D.$OS.
$D.$CPUNAME;
if ($platform eq "$FreeBSD")
-{ $SOLARDEF .= $D."X86";
+{ $SOLARDEF .= $D."X86".
-+ $D."OSVERSION=$OSVERSION";
++ $D."OSVERSION=$OSVERSION".
++ $D."PTHREAD_CFLAGS=$PTHREAD_CFLAGS".
++ $D."PTHREAD_LIBS=$PTHREAD_LIBS";
}
$SOLARDEF .= $D."_REENTRANT".
$D."_POSIX_PTHREAD_SEMANTICS";
-@@ -954,7 +956,7 @@
+@@ -954,7 +961,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
}
@@ -54,7 +61,7 @@
{ $PATH = $cur_dir.
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
-@@ -968,6 +970,22 @@
+@@ -968,6 +975,22 @@
$ps.$USR.$BIN.$ds."X11".
$ps.$USR.$LIB;
}
@@ -77,7 +84,7 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
-@@ -1067,25 +1085,19 @@
+@@ -1067,25 +1090,19 @@
{
$SOLARINC .= $I.$USR.$INCLUDE.
$STLPORT_stlport;
@@ -107,11 +114,13 @@
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
$I.'$JAVA_HOME'.$INCLUDE;
-@@ -1273,6 +1285,7 @@
+@@ -1273,6 +1290,9 @@
ToFile( "GUIENV", $GUIENV, "e" );
ToFile( "GVER", $GVER, "e" );
ToFile( "OS", $OS, "e" );
+ToFile( "OSVERSION", $OSVERSION, "e" );
++ToFile( "PTHREAD_CFLAGS", $PTHREAD_CFLAGS, "e" );
++ToFile( "PTHREAD_LIBS", $PTHREAD_LIBS, "e" );
ToFile( "OUTPATH", $OUTPATH, "e" );
ToFile( "INPATH", $INPATH, "e" );
ToFile( "GVERDIR", $GVERDIR, "e" );
diff --git a/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk
index 52aee7ac8b51..ab5e980366fb 100644
--- a/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk
@@ -1,6 +1,6 @@
--- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001
-+++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 20:46:20 2002
-@@ -1,84 +1,146 @@
++++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 23:28:50 2002
+@@ -1,84 +1,145 @@
-
# mak file fuer unxfbsdi
@@ -24,7 +24,7 @@
+
+# options for C and C++ Compiler
+CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION)
-+CDEFS+=-pthread
++CDEFS+=$(PTHREAD_CFLAGS)
+
+# this is a platform with JAVA support
+.IF "$(SOLAR_JAVA)"!=""
@@ -57,18 +57,6 @@
+# Compiler flags for compiling static object in single threaded
+# environment with character user interface
+CFLAGSOBJCUIST=-fPIC
-+
-+# Compiler flags for compiling static object in multi threaded
-+# environment with graphical user interface
-+CFLAGSOBJGUIMT=-fPIC
-+
-+# Compiler flags for compiling static object in multi threaded
-+# environment with character user interface
-+CFLAGSOBJCUIMT=-fPIC
-+
-+# Compiler flags for compiling shared object in multi threaded
-+# environment with graphical user interface
-+CFLAGSSLOGUIMT=-fPIC
-cc= gcc
-CC= g++
@@ -88,6 +76,18 @@
-CFLAGSSLOCUIMT= -fPIC
-CFLAGSPROF= -pg
-CFLAGSDEBUG= -g
++# Compiler flags for compiling static object in multi threaded
++# environment with graphical user interface
++CFLAGSOBJGUIMT=-fPIC
++
++# Compiler flags for compiling static object in multi threaded
++# environment with character user interface
++CFLAGSOBJCUIMT=-fPIC
++
++# Compiler flags for compiling shared object in multi threaded
++# environment with graphical user interface
++CFLAGSSLOGUIMT=-fPIC
++
+# Compiler flags for compiling shared object in multi threaded
+# environment with character user interface
+CFLAGSSLOCUIMT=-fPIC
@@ -162,16 +162,16 @@
+# libraries for linking applications
+STDLIBCUIST=-lm
+STDLIBGUIST=-lXaw -lXt -lX11 -lm
-+STDLIBGUIMT=-lXaw -lXt -lX11 -pthread -lm -lstlport_gcc
-+STDLIBCUIMT=-pthread -lm -lstlport_gcc
++STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm -lstlport_gcc
++STDLIBCUIMT=$(PTHREAD_LIBS) -lm -lstlport_gcc
+
+# libraries for linking shared libraries
-+STDSHLGUIMT=-lXaw -lXt -lX11 -lXext -pthread -lm -lstlport_gcc
-+STDSHLCUIMT=-pthread -lm -lstlport_gcc
++STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm -lstlport_gcc
++STDSHLCUIMT=$(PTHREAD_LIBS) -lm -lstlport_gcc
+
+# STLport always needs pthread.
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -pthread
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -pthread
++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(PTHREAD_LIBS)
++LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
+# default objectfilenames to lin
STDOBJGUI=
@@ -185,7 +185,7 @@
-STDLIBCUIMT=-pthread -lm -lstlport_gcc
-STDSHLGUIMT=-lX11 -lXext -pthread -lm -lstlport_gcc
-STDSHLCUIMT=-pthread -lm -lstlport_gcc
-
+-
-LIBMGR= ar
-LIBFLAGS= -r
-LIBEXT= .a
@@ -195,7 +195,7 @@
IMPLIB=
IMPLIBFLAGS=
-@@ -87,12 +149,12 @@
+@@ -87,12 +148,12 @@
MAPSYMFLAGS=
RC=irc
diff --git a/editors/openoffice.org-3/files/patch-solenv::inc::unxfbsdi.mk b/editors/openoffice.org-3/files/patch-solenv::inc::unxfbsdi.mk
index 52aee7ac8b51..ab5e980366fb 100644
--- a/editors/openoffice.org-3/files/patch-solenv::inc::unxfbsdi.mk
+++ b/editors/openoffice.org-3/files/patch-solenv::inc::unxfbsdi.mk
@@ -1,6 +1,6 @@
--- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001
-+++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 20:46:20 2002
-@@ -1,84 +1,146 @@
++++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 23:28:50 2002
+@@ -1,84 +1,145 @@
-
# mak file fuer unxfbsdi
@@ -24,7 +24,7 @@
+
+# options for C and C++ Compiler
+CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION)
-+CDEFS+=-pthread
++CDEFS+=$(PTHREAD_CFLAGS)
+
+# this is a platform with JAVA support
+.IF "$(SOLAR_JAVA)"!=""
@@ -57,18 +57,6 @@
+# Compiler flags for compiling static object in single threaded
+# environment with character user interface
+CFLAGSOBJCUIST=-fPIC
-+
-+# Compiler flags for compiling static object in multi threaded
-+# environment with graphical user interface
-+CFLAGSOBJGUIMT=-fPIC
-+
-+# Compiler flags for compiling static object in multi threaded
-+# environment with character user interface
-+CFLAGSOBJCUIMT=-fPIC
-+
-+# Compiler flags for compiling shared object in multi threaded
-+# environment with graphical user interface
-+CFLAGSSLOGUIMT=-fPIC
-cc= gcc
-CC= g++
@@ -88,6 +76,18 @@
-CFLAGSSLOCUIMT= -fPIC
-CFLAGSPROF= -pg
-CFLAGSDEBUG= -g
++# Compiler flags for compiling static object in multi threaded
++# environment with graphical user interface
++CFLAGSOBJGUIMT=-fPIC
++
++# Compiler flags for compiling static object in multi threaded
++# environment with character user interface
++CFLAGSOBJCUIMT=-fPIC
++
++# Compiler flags for compiling shared object in multi threaded
++# environment with graphical user interface
++CFLAGSSLOGUIMT=-fPIC
++
+# Compiler flags for compiling shared object in multi threaded
+# environment with character user interface
+CFLAGSSLOCUIMT=-fPIC
@@ -162,16 +162,16 @@
+# libraries for linking applications
+STDLIBCUIST=-lm
+STDLIBGUIST=-lXaw -lXt -lX11 -lm
-+STDLIBGUIMT=-lXaw -lXt -lX11 -pthread -lm -lstlport_gcc
-+STDLIBCUIMT=-pthread -lm -lstlport_gcc
++STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm -lstlport_gcc
++STDLIBCUIMT=$(PTHREAD_LIBS) -lm -lstlport_gcc
+
+# libraries for linking shared libraries
-+STDSHLGUIMT=-lXaw -lXt -lX11 -lXext -pthread -lm -lstlport_gcc
-+STDSHLCUIMT=-pthread -lm -lstlport_gcc
++STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm -lstlport_gcc
++STDSHLCUIMT=$(PTHREAD_LIBS) -lm -lstlport_gcc
+
+# STLport always needs pthread.
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -pthread
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -pthread
++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(PTHREAD_LIBS)
++LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
+# default objectfilenames to lin
STDOBJGUI=
@@ -185,7 +185,7 @@
-STDLIBCUIMT=-pthread -lm -lstlport_gcc
-STDSHLGUIMT=-lX11 -lXext -pthread -lm -lstlport_gcc
-STDSHLCUIMT=-pthread -lm -lstlport_gcc
-
+-
-LIBMGR= ar
-LIBFLAGS= -r
-LIBEXT= .a
@@ -195,7 +195,7 @@
IMPLIB=
IMPLIBFLAGS=
-@@ -87,12 +149,12 @@
+@@ -87,12 +148,12 @@
MAPSYMFLAGS=
RC=irc
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 02:10:19 +0000