From f7587e0dacf834d9a9fa86ec54dc94640d774180 Mon Sep 17 00:00:00 2001 From: maho Date: Wed, 17 Jan 2007 03:15:55 +0000 Subject: 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 --- editors/openoffice-3-devel/Makefile | 2 +- editors/openoffice-3-devel/files/patch-i66667 | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'editors/openoffice-3-devel') diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index bbfa7859ec18..cfd11844f655 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -182,7 +182,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-3-devel/files/patch-i66667 b/editors/openoffice-3-devel/files/patch-i66667 index a93aaea26176..c1d8cd362e9b 100644 --- a/editors/openoffice-3-devel/files/patch-i66667 +++ b/editors/openoffice-3-devel/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() ); -- cgit