diff options
| author | maho <maho@FreeBSD.org> | 2007-01-17 03:15:55 +0000 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2007-01-17 03:15:55 +0000 |
| commit | f7587e0dacf834d9a9fa86ec54dc94640d774180 (patch) | |
| tree | a5c89a62b48cc74e53d4c77210b4b8bc68fee7b0 /editors/openoffice.org-1.1 | |
| parent | 91df0541cc47418b5c604c81c305a7583bda9156 (diff) | |
| download | FreeBSD-ports-f7587e0dacf834d9a9fa86ec54dc94640d774180.zip FreeBSD-ports-f7587e0dacf834d9a9fa86ec54dc94640d774180.tar.gz | |
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
Diffstat (limited to 'editors/openoffice.org-1.1')
| -rw-r--r-- | editors/openoffice.org-1.1/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/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel index ae3ff61..5726cb8 100644 --- a/editors/openoffice.org-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel +++ b/editors/openoffice.org-1.1/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() ); |
