diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2007-04-07 02:04:28 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2007-04-07 02:04:28 +0000 |
| commit | 10fd89d9b828878015756d29e1e5ae502ec9fb4f (patch) | |
| tree | 2ddd4295018f707f6e5bdb53b7cc074a2973451b /editors/openoffice.org-2-RC/files/patch-i76141 | |
| parent | - Update to 1.5 (diff) | |
Fix build breakage. The patch for openoffice.org-2-devel was accidently
committed here. Pointyhat to me.
Reported by: Carlos F. A. Paniago (carlos dot paniago at gmail dot com)
Notes
Notes:
svn path=/head/; revision=189402
Diffstat (limited to '')
| -rw-r--r-- | editors/openoffice.org-2-RC/files/patch-i76141 | 53 |
1 files changed, 37 insertions, 16 deletions
diff --git a/editors/openoffice.org-2-RC/files/patch-i76141 b/editors/openoffice.org-2-RC/files/patch-i76141 index df70a3ea7055..03edb6bcf94b 100644 --- a/editors/openoffice.org-2-RC/files/patch-i76141 +++ b/editors/openoffice.org-2-RC/files/patch-i76141 @@ -1,6 +1,6 @@ ---- berkeleydb/db-4.2.52.patch Thu Apr 5 14:04:49 2007 -+++ berkeleydb/db-4.2.52.patch Thu Apr 5 14:26:49 2007 -@@ -552,6 +552,23 @@ +--- berkeleydb/db-4.2.52.patch Fri Apr 6 21:51:24 2007 ++++ berkeleydb/db-4.2.52.patch Fri Apr 6 21:51:52 2007 +@@ -255,6 +255,23 @@ test "$with_gnu_ld" != no && break ;; *************** @@ -21,14 +21,13 @@ + case $version_type in + freebsd-elf*) +*************** - *** 11180,11186 **** - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on -@@ -568,6 +585,57 @@ - fi - - # Commands to make compiler produce verbose output that lists -+*************** + *** 10398,10404 **** + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! +@@ -321,8 +338,59 @@ + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + *************** +*** 12872,12878 **** + ;; + @@ -37,7 +36,7 @@ + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) -+--- 12872,12878 ---- ++--- 12883,12889 ---- + ;; + + freebsd*) @@ -54,7 +53,7 @@ + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) -+--- 15849,15855 ---- ++--- 15860,15866 ---- + ;; + + freebsd*) @@ -71,7 +70,7 @@ + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) -+--- 18114,18120 ---- ++--- 18125,18131 ---- + ;; + + freebsd*) @@ -79,9 +78,31 @@ + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) - *************** ++*************** *** 28556,28561 **** - --- 28556,28606 ---- +---- 28556,28606 ---- ++--- 28567,28617 ---- + rm -f conftest.$ac_objext conftest.$ac_ext + fi + +@@ -376,7 +444,7 @@ + cat >conftest.$ac_ext <<_ACEOF + *************** + *** 28971,28976 **** +---- 29016,29028 ---- ++--- 29027,29039 ---- + x86/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS" + cat >>confdefs.h <<\_ACEOF + #define HAVE_MUTEX_X86_GCC_ASSEMBLY 1 +@@ -388,7 +456,7 @@ + + cat >>confdefs.h <<\_ACEOF + + #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1 + _ACEOF +- ++ + + *** misc/db-4.2.52.NC/dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200 + --- misc/build/db-4.2.52.NC/dist/ltmain.sh 2006-12-01 13:57:19.000000000 +0100 --- curl/curl-7.12.2.patch 25 Sep 2006 13:33:49 -0000 1.9 +++ curl/curl-7.12.2.patch 5 Apr 2007 00:01:20 -0000 @@ -1,3 +1,73 @@ |