diff options
| author | mbr <mbr@FreeBSD.org> | 2002-03-11 06:03:45 +0800 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2002-03-11 06:03:45 +0800 |
| commit | 6607457ff5032e65a795dd6046fddcff5f7c17f2 (patch) | |
| tree | 5048bd11df8f81e68db90e06c614913e349d0314 /editors/openoffice | |
| parent | 95c02730343f0ad3fcf71820e2d9be4fd2cbe8af (diff) | |
| download | freebsd-ports-gnome-6607457ff5032e65a795dd6046fddcff5f7c17f2.tar.gz freebsd-ports-gnome-6607457ff5032e65a795dd6046fddcff5f7c17f2.tar.zst freebsd-ports-gnome-6607457ff5032e65a795dd6046fddcff5f7c17f2.zip | |
Add the PTHREAD_CFLAGS correctly to SOLARDEF, even if this is not yet used
and the CFLAGS are hardcoded in solenv/inc/unxfbsd.mk
Diffstat (limited to 'editors/openoffice')
| -rw-r--r-- | editors/openoffice/files/patch-config_office+set_soenv.1 | 21 | ||||
| -rw-r--r-- | editors/openoffice/files/patch-set_soenv.1 | 21 |
2 files changed, 24 insertions, 18 deletions
diff --git a/editors/openoffice/files/patch-config_office+set_soenv.1 b/editors/openoffice/files/patch-config_office+set_soenv.1 index 0281f98a02d0..cb0b90d9bb02 100644 --- a/editors/openoffice/files/patch-config_office+set_soenv.1 +++ b/editors/openoffice/files/patch-config_office+set_soenv.1 @@ -1,5 +1,5 @@ ---- set_soenv.1.orig Tue Nov 20 18:26:33 2001 -+++ set_soenv.1 Sun Mar 10 22:44:58 2002 +--- ../config_office/set_soenv.1.orig Tue Nov 20 18:26:33 2001 ++++ ../config_office/set_soenv.1 Sun Mar 10 22:56:18 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of @@ -40,15 +40,18 @@ } elsif ( $platform eq "$Linux" ) { -@@ -857,11 +861,14 @@ +@@ -853,15 +857,16 @@ + $D.$COM. + $D.$CVER. + $D.$GVER. +- $D."_PTHREADS". $D.$OS. $D.$CPUNAME; if ($platform eq "$FreeBSD") -{ $SOLARDEF .= $D."X86"; +{ $SOLARDEF .= $D."X86". + $D."OSVERSION=$OSVERSION". -+ $D."PTHREAD_CFLAGS=$PTHREAD_CFLAGS". -+ $D."PTHREAD_LIBS=$PTHREAD_LIBS"; ++ " ".$PTHREAD_CFLAGS; } $SOLARDEF .= $D."_REENTRANT". $D."_POSIX_PTHREAD_SEMANTICS"; @@ -57,7 +60,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -954,7 +961,7 @@ +@@ -954,7 +959,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -66,7 +69,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -968,6 +975,22 @@ +@@ -968,6 +973,22 @@ $ps.$USR.$BIN.$ds."X11". $ps.$USR.$LIB; } @@ -89,7 +92,7 @@ elsif ($platform eq "$Winnt") { $COMPATH_ROOT = $COMPATH; $COMPATH_ROOT =~ s/\/vc98$//; -@@ -1067,25 +1090,19 @@ +@@ -1067,25 +1088,19 @@ { $SOLARINC .= $I.$USR.$INCLUDE. $STLPORT_stlport; @@ -119,7 +122,7 @@ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31". $I.'$JAVA_HOME'.$INCLUDE; -@@ -1273,6 +1290,9 @@ +@@ -1273,6 +1288,9 @@ ToFile( "GUIENV", $GUIENV, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); diff --git a/editors/openoffice/files/patch-set_soenv.1 b/editors/openoffice/files/patch-set_soenv.1 index 0281f98a02d0..cb0b90d9bb02 100644 --- a/editors/openoffice/files/patch-set_soenv.1 +++ b/editors/openoffice/files/patch-set_soenv.1 @@ -1,5 +1,5 @@ ---- set_soenv.1.orig Tue Nov 20 18:26:33 2001 -+++ set_soenv.1 Sun Mar 10 22:44:58 2002 +--- ../config_office/set_soenv.1.orig Tue Nov 20 18:26:33 2001 ++++ ../config_office/set_soenv.1 Sun Mar 10 22:56:18 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of @@ -40,15 +40,18 @@ } elsif ( $platform eq "$Linux" ) { -@@ -857,11 +861,14 @@ +@@ -853,15 +857,16 @@ + $D.$COM. + $D.$CVER. + $D.$GVER. +- $D."_PTHREADS". $D.$OS. $D.$CPUNAME; if ($platform eq "$FreeBSD") -{ $SOLARDEF .= $D."X86"; +{ $SOLARDEF .= $D."X86". + $D."OSVERSION=$OSVERSION". -+ $D."PTHREAD_CFLAGS=$PTHREAD_CFLAGS". -+ $D."PTHREAD_LIBS=$PTHREAD_LIBS"; ++ " ".$PTHREAD_CFLAGS; } $SOLARDEF .= $D."_REENTRANT". $D."_POSIX_PTHREAD_SEMANTICS"; @@ -57,7 +60,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -954,7 +961,7 @@ +@@ -954,7 +959,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -66,7 +69,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -968,6 +975,22 @@ +@@ -968,6 +973,22 @@ $ps.$USR.$BIN.$ds."X11". $ps.$USR.$LIB; } @@ -89,7 +92,7 @@ elsif ($platform eq "$Winnt") { $COMPATH_ROOT = $COMPATH; $COMPATH_ROOT =~ s/\/vc98$//; -@@ -1067,25 +1090,19 @@ +@@ -1067,25 +1088,19 @@ { $SOLARINC .= $I.$USR.$INCLUDE. $STLPORT_stlport; @@ -119,7 +122,7 @@ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31". $I.'$JAVA_HOME'.$INCLUDE; -@@ -1273,6 +1290,9 @@ +@@ -1273,6 +1288,9 @@ ToFile( "GUIENV", $GUIENV, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); |