diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2007-01-17 03:15:55 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2007-01-17 03:15:55 +0000 |
| commit | 870c5d1cf2f57519db65e670c78e691d8c4cea6f (patch) | |
| tree | 599c0de3aed3a3eea3a29d7c253304ff447da225 /editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel | |
| parent | Update to 2.12.9 to fix the ABI break in 2.12.8 release. (diff) | |
RTLD hack is gone for FreeBSD_version >= 602103 (MFC'ed from current)
http://docs.freebsd.org/cgi/mid.cgi?200701160751.l0G7p4gH046864
http://docs.freebsd.org/cgi/mid.cgi?200701160940.l0G9eOQv074301
Submitted by: jkim
Notes
Notes:
svn path=/head/; revision=182567
Diffstat (limited to '')
| -rw-r--r-- | editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel index ae3ff61e295b..5726cb84a6d7 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel +++ b/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel @@ -35,7 +35,7 @@ diff -u -r1.4 except.cxx }; //__________________________________________________________________________________________________ RTTI::RTTI() SAL_THROW( () ) -+#if __FreeBSD_version < 700022 /* #i22253# */ ++#if __FreeBSD_version < 602103 /* #i22253# */ + : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) +#else : m_hApp( dlopen( 0, RTLD_LAZY ) ) @@ -47,7 +47,7 @@ diff -u -r1.4 except.cxx buf.append( 'E' ); OString symName( buf.makeStringAndClear() ); -+#if __FreeBSD_version < 700022 ++#if __FreeBSD_version < 602103 /* #i22253# */ + rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); +#else rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); |