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-2-RC | |
| 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 'editors/openoffice.org-2-RC')
| -rw-r--r-- | editors/openoffice.org-2-RC/Makefile | 2 | ||||
| -rw-r--r-- | editors/openoffice.org-2-RC/files/patch-i66667 | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index 1411e94d2902..a86ae59765cf 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -184,7 +184,7 @@ WITHOUT_MOZILLA= yes LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost CONFIGURE_ARGS+= --with-system-boost=yes #i58343# .endif -.if (${OSVERSION} <= 700021) +.if (${OSVERSION} <= 602102) EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667 .endif .if (${OSVERSION} <= 492000) diff --git a/editors/openoffice.org-2-RC/files/patch-i66667 b/editors/openoffice.org-2-RC/files/patch-i66667 index a93aaea26176..c1d8cd362e9b 100644 --- a/editors/openoffice.org-2-RC/files/patch-i66667 +++ b/editors/openoffice.org-2-RC/files/patch-i66667 @@ -33,7 +33,7 @@ }; //__________________________________________________________________________________________________ RTTI::RTTI() SAL_THROW( () ) -+#if __FreeBSD_version < 700022 ++#if __FreeBSD_version < 602103 : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) +#else + : m_hApp( dlopen( 0, RTLD_LAZY ) ) @@ -57,7 +57,7 @@ OString symName( buf.makeStringAndClear() ); -//#iZ 22253 -+#if __FreeBSD_version < 700022 /* #i22253# */ ++#if __FreeBSD_version < 602103 /* #i22253# */ rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); +#else + rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); @@ -117,7 +117,7 @@ }; //__________________________________________________________________________________________________ RTTI::RTTI() SAL_THROW( () ) -+#if __FreeBSD_version < 700022 ++#if __FreeBSD_version < 602103 : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) +#else + : m_hApp( dlopen( 0, RTLD_LAZY ) ) @@ -129,7 +129,7 @@ buf.append( 'E' ); OString symName( buf.makeStringAndClear() ); -+#if __FreeBSD_version < 700022 /* #i22253# */ ++#if __FreeBSD_version < 602103 /* #i22253# */ rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); +#else + rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); |