diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-10-22 23:20:14 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-10-22 23:20:14 +0000 |
| commit | b0bdc9e3950e7e1e4cd0b1e6601da7744ecccf08 (patch) | |
| tree | a0ef43a85df03df285cd86aa66c5c4b2477af0cc /editors/openoffice.org-3/files/patch-product+inc+scp+udk_basefiles.scp | |
| parent | 643_OO did not get tagged for the ${cc} -> ${CC} change. (diff) | |
Add merged patches which conflicted.
Notes
Notes:
svn path=/head/; revision=68622
Diffstat (limited to 'editors/openoffice.org-3/files/patch-product+inc+scp+udk_basefiles.scp')
| -rw-r--r-- | editors/openoffice.org-3/files/patch-product+inc+scp+udk_basefiles.scp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editors/openoffice.org-3/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice.org-3/files/patch-product+inc+scp+udk_basefiles.scp index 7b55cc064156..693a57bb041e 100644 --- a/editors/openoffice.org-3/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice.org-3/files/patch-product+inc+scp+udk_basefiles.scp @@ -6,13 +6,13 @@ // (setup is linked against it). +#if ( defined ( LINUX )) #if ( defined( _gcc3 ) && defined( C300 ) ) - File gid_File_Lib_gcc -@@ -42,6 +43,7 @@ - Name = STRING(libstdc++.so.3); + BIN_FILE_BODY; +@@ -31,6 +32,7 @@ Styles = (NETWORK,RELATIVE); End + +#endif #endif - #endif + File gid_File_Lib_Sal |