mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00
Code Issues Releases Activity

RTLD hack is gone for FreeBSD_version >= 602103 (MFC'ed from current)

Browse Source 
http://docs.freebsd.org/cgi/mid.cgi?200701160751.l0G7p4gH046864
http://docs.freebsd.org/cgi/mid.cgi?200701160940.l0G9eOQv074301

Submitted by:	jkim
This commit is contained in:
Maho Nakata 2007-01-17 03:15:55 +00:00
parent e024658518
commit 870c5d1cf2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=182567
20 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editors/openoffice-3-devel/Makefile
View File

@ -182,7 +182,7 @@ WITHOUT_MOZILLA= yes
LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost
CONFIGURE_ARGS+= --with-system-boost=yes #i58343# CONFIGURE_ARGS+= --with-system-boost=yes #i58343#
.endif .endif
.if (${OSVERSION} <= 700021) .if (${OSVERSION} <= 602102)
EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667 EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667
.endif .endif
.if (${OSVERSION} <= 492000) .if (${OSVERSION} <= 492000)

8
editors/openoffice-3-devel/files/patch-i66667
View File

@ -33,7 +33,7 @@
}; };
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () ) RTTI::RTTI() SAL_THROW( () )
+#if __FreeBSD_version < 700022 +#if __FreeBSD_version < 602103
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+#else +#else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) ) + : m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -57,7 +57,7 @@
OString symName( buf.makeStringAndClear() ); OString symName( buf.makeStringAndClear() );
-//#iZ 22253 -//#iZ 22253
+#if __FreeBSD_version < 700022 /* #i22253# */ +#if __FreeBSD_version < 602103 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+#else +#else
+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); + rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
@ -117,7 +117,7 @@
}; };
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () ) RTTI::RTTI() SAL_THROW( () )
+#if __FreeBSD_version < 700022 +#if __FreeBSD_version < 602103
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+#else +#else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) ) + : m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -129,7 +129,7 @@
buf.append( 'E' ); buf.append( 'E' );
OString symName( buf.makeStringAndClear() ); OString symName( buf.makeStringAndClear() );
+#if __FreeBSD_version < 700022 /* #i22253# */ +#if __FreeBSD_version < 602103 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+#else +#else
+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); + rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

2
editors/openoffice-3/Makefile
View File

@ -182,7 +182,7 @@ WITHOUT_MOZILLA= yes
LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost
CONFIGURE_ARGS+= --with-system-boost=yes #i58343# CONFIGURE_ARGS+= --with-system-boost=yes #i58343#
.endif .endif
.if (${OSVERSION} <= 700021) .if (${OSVERSION} <= 602102)
EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667 EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667
.endif .endif
.if (${OSVERSION} <= 492000) .if (${OSVERSION} <= 492000)

8
editors/openoffice-3/files/patch-i66667
View File

@ -33,7 +33,7 @@
}; };
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () ) RTTI::RTTI() SAL_THROW( () )
+#if __FreeBSD_version < 700022 +#if __FreeBSD_version < 602103
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+#else +#else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) ) + : m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -57,7 +57,7 @@
OString symName( buf.makeStringAndClear() ); OString symName( buf.makeStringAndClear() );
-//#iZ 22253 -//#iZ 22253
+#if __FreeBSD_version < 700022 /* #i22253# */ +#if __FreeBSD_version < 602103 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+#else +#else
+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); + rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
@ -117,7 +117,7 @@
}; };
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () ) RTTI::RTTI() SAL_THROW( () )
+#if __FreeBSD_version < 700022 +#if __FreeBSD_version < 602103
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+#else +#else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) ) + : m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -129,7 +129,7 @@
buf.append( 'E' ); buf.append( 'E' );
OString symName( buf.makeStringAndClear() ); OString symName( buf.makeStringAndClear() );
+#if __FreeBSD_version < 700022 /* #i22253# */ +#if __FreeBSD_version < 602103 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+#else +#else
+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); + rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

4
editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
View File

@ -35,7 +35,7 @@ diff -u -r1.4 except.cxx
}; };
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () ) RTTI::RTTI() SAL_THROW( () )
+#if __FreeBSD_version < 700022 /* #i22253# */ +#if __FreeBSD_version < 602103 /* #i22253# */
+ : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) + : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+#else +#else
: m_hApp( dlopen( 0, RTLD_LAZY ) ) : m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -47,7 +47,7 @@ diff -u -r1.4 except.cxx
buf.append( 'E' ); buf.append( 'E' );
OString symName( buf.makeStringAndClear() ); OString symName( buf.makeStringAndClear() );
+#if __FreeBSD_version < 700022 +#if __FreeBSD_version < 602103 /* #i22253# */
+ rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); + rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+#else +#else
rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

4
editors/openoffice.org-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
View File

@ -35,7 +35,7 @@ diff -u -r1.4 except.cxx
}; };
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () ) RTTI::RTTI() SAL_THROW( () )
+#if __FreeBSD_version < 700022 /* #i22253# */ +#if __FreeBSD_version < 602103 /* #i22253# */
+ : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) + : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+#else +#else
: m_hApp( dlopen( 0, RTLD_LAZY ) ) : m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -47,7 +47,7 @@ diff -u -r1.4 except.cxx
buf.append( 'E' ); buf.append( 'E' );
OString symName( buf.makeStringAndClear() ); OString symName( buf.makeStringAndClear() );
+#if __FreeBSD_version < 700022 +#if __FreeBSD_version < 602103 /* #i22253# */
+ rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); + rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+#else +#else
rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

2
editors/openoffice.org-2-RC/Makefile
View File

@ -184,7 +184,7 @@ WITHOUT_MOZILLA= yes
LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost
CONFIGURE_ARGS+= --with-system-boost=yes #i58343# CONFIGURE_ARGS+= --with-system-boost=yes #i58343#
.endif .endif
.if (${OSVERSION} <= 700021) .if (${OSVERSION} <= 602102)
EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667 EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667
.endif .endif
.if (${OSVERSION} <= 492000) .if (${OSVERSION} <= 492000)

8
editors/openoffice.org-2-RC/files/patch-i66667
View File

@ -33,7 +33,7 @@
}; };
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () ) RTTI::RTTI() SAL_THROW( () )
+#if __FreeBSD_version < 700022 +#if __FreeBSD_version < 602103
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+#else +#else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) ) + : m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -57,7 +57,7 @@
OString symName( buf.makeStringAndClear() ); OString symName( buf.makeStringAndClear() );
-//#iZ 22253 -//#iZ 22253
+#if __FreeBSD_version < 700022 /* #i22253# */ +#if __FreeBSD_version < 602103 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+#else +#else
+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); + rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
@ -117,7 +117,7 @@
}; };
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () ) RTTI::RTTI() SAL_THROW( () )
+#if __FreeBSD_version < 700022 +#if __FreeBSD_version < 602103
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+#else +#else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) ) + : m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -129,7 +129,7 @@
buf.append( 'E' ); buf.append( 'E' );
OString symName( buf.makeStringAndClear() ); OString symName( buf.makeStringAndClear() );
+#if __FreeBSD_version < 700022 /* #i22253# */ +#if __FreeBSD_version < 602103 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+#else +#else
+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); + rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

2
editors/openoffice.org-2-devel/Makefile
View File

@ -182,7 +182,7 @@ WITHOUT_MOZILLA= yes
LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost
CONFIGURE_ARGS+= --with-system-boost=yes #i58343# CONFIGURE_ARGS+= --with-system-boost=yes #i58343#
.endif .endif
.if (${OSVERSION} <= 700021) .if (${OSVERSION} <= 602102)
EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667 EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667
.endif .endif
.if (${OSVERSION} <= 492000) .if (${OSVERSION} <= 492000)

8
editors/openoffice.org-2-devel/files/patch-i66667
View File

@ -33,7 +33,7 @@
}; };
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () ) RTTI::RTTI() SAL_THROW( () )
+#if __FreeBSD_version < 700022 +#if __FreeBSD_version < 602103
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+#else +#else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) ) + : m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -57,7 +57,7 @@
OString symName( buf.makeStringAndClear() ); OString symName( buf.makeStringAndClear() );
-//#iZ 22253 -//#iZ 22253
+#if __FreeBSD_version < 700022 /* #i22253# */ +#if __FreeBSD_version < 602103 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+#else +#else
+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); + rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
@ -117,7 +117,7 @@
}; };
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () ) RTTI::RTTI() SAL_THROW( () )
+#if __FreeBSD_version < 700022 +#if __FreeBSD_version < 602103
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+#else +#else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) ) + : m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -129,7 +129,7 @@
buf.append( 'E' ); buf.append( 'E' );
OString symName( buf.makeStringAndClear() ); OString symName( buf.makeStringAndClear() );
+#if __FreeBSD_version < 700022 /* #i22253# */ +#if __FreeBSD_version < 602103 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+#else +#else
+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); + rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

2
editors/openoffice.org-2/Makefile
View File

@ -182,7 +182,7 @@ WITHOUT_MOZILLA= yes
LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost
CONFIGURE_ARGS+= --with-system-boost=yes #i58343# CONFIGURE_ARGS+= --with-system-boost=yes #i58343#
.endif .endif
.if (${OSVERSION} <= 700021) .if (${OSVERSION} <= 602102)
EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667 EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667
.endif .endif
.if (${OSVERSION} <= 492000) .if (${OSVERSION} <= 492000)

8
editors/openoffice.org-2/files/patch-i66667
View File

@ -33,7 +33,7 @@
}; };
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () ) RTTI::RTTI() SAL_THROW( () )
+#if __FreeBSD_version < 700022 +#if __FreeBSD_version < 602103
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+#else +#else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) ) + : m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -57,7 +57,7 @@
OString symName( buf.makeStringAndClear() ); OString symName( buf.makeStringAndClear() );
-//#iZ 22253 -//#iZ 22253
+#if __FreeBSD_version < 700022 /* #i22253# */ +#if __FreeBSD_version < 602103 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+#else +#else
+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); + rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
@ -117,7 +117,7 @@
}; };
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () ) RTTI::RTTI() SAL_THROW( () )
+#if __FreeBSD_version < 700022 +#if __FreeBSD_version < 602103
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+#else +#else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) ) + : m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -129,7 +129,7 @@
buf.append( 'E' ); buf.append( 'E' );
OString symName( buf.makeStringAndClear() ); OString symName( buf.makeStringAndClear() );
+#if __FreeBSD_version < 700022 /* #i22253# */ +#if __FreeBSD_version < 602103 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+#else +#else
+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); + rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

2
editors/openoffice.org-3-RC/Makefile
View File

@ -184,7 +184,7 @@ WITHOUT_MOZILLA= yes
LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost
CONFIGURE_ARGS+= --with-system-boost=yes #i58343# CONFIGURE_ARGS+= --with-system-boost=yes #i58343#
.endif .endif
.if (${OSVERSION} <= 700021) .if (${OSVERSION} <= 602102)
EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667 EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667
.endif .endif
.if (${OSVERSION} <= 492000) .if (${OSVERSION} <= 492000)

8
editors/openoffice.org-3-RC/files/patch-i66667
View File

@ -33,7 +33,7 @@
}; };
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () ) RTTI::RTTI() SAL_THROW( () )
+#if __FreeBSD_version < 700022 +#if __FreeBSD_version < 602103
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+#else +#else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) ) + : m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -57,7 +57,7 @@
OString symName( buf.makeStringAndClear() ); OString symName( buf.makeStringAndClear() );
-//#iZ 22253 -//#iZ 22253
+#if __FreeBSD_version < 700022 /* #i22253# */ +#if __FreeBSD_version < 602103 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+#else +#else
+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); + rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
@ -117,7 +117,7 @@
}; };
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () ) RTTI::RTTI() SAL_THROW( () )
+#if __FreeBSD_version < 700022 +#if __FreeBSD_version < 602103
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+#else +#else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) ) + : m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -129,7 +129,7 @@
buf.append( 'E' ); buf.append( 'E' );
OString symName( buf.makeStringAndClear() ); OString symName( buf.makeStringAndClear() );
+#if __FreeBSD_version < 700022 /* #i22253# */ +#if __FreeBSD_version < 602103 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+#else +#else
+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); + rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

2
editors/openoffice.org-3-devel/Makefile
View File

@ -182,7 +182,7 @@ WITHOUT_MOZILLA= yes
LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost
CONFIGURE_ARGS+= --with-system-boost=yes #i58343# CONFIGURE_ARGS+= --with-system-boost=yes #i58343#
.endif .endif
.if (${OSVERSION} <= 700021) .if (${OSVERSION} <= 602102)
EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667 EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667
.endif .endif
.if (${OSVERSION} <= 492000) .if (${OSVERSION} <= 492000)

8
editors/openoffice.org-3-devel/files/patch-i66667
View File

@ -33,7 +33,7 @@
}; };
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () ) RTTI::RTTI() SAL_THROW( () )
+#if __FreeBSD_version < 700022 +#if __FreeBSD_version < 602103
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+#else +#else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) ) + : m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -57,7 +57,7 @@
OString symName( buf.makeStringAndClear() ); OString symName( buf.makeStringAndClear() );
-//#iZ 22253 -//#iZ 22253
+#if __FreeBSD_version < 700022 /* #i22253# */ +#if __FreeBSD_version < 602103 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+#else +#else
+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); + rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
@ -117,7 +117,7 @@
}; };
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () ) RTTI::RTTI() SAL_THROW( () )
+#if __FreeBSD_version < 700022 +#if __FreeBSD_version < 602103
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+#else +#else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) ) + : m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -129,7 +129,7 @@
buf.append( 'E' ); buf.append( 'E' );
OString symName( buf.makeStringAndClear() ); OString symName( buf.makeStringAndClear() );
+#if __FreeBSD_version < 700022 /* #i22253# */ +#if __FreeBSD_version < 602103 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+#else +#else
+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); + rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

2
editors/openoffice.org-3/Makefile
View File

@ -182,7 +182,7 @@ WITHOUT_MOZILLA= yes
LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost
CONFIGURE_ARGS+= --with-system-boost=yes #i58343# CONFIGURE_ARGS+= --with-system-boost=yes #i58343#
.endif .endif
.if (${OSVERSION} <= 700021) .if (${OSVERSION} <= 602102)
EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667 EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667
.endif .endif
.if (${OSVERSION} <= 492000) .if (${OSVERSION} <= 492000)

8
editors/openoffice.org-3/files/patch-i66667
View File

@ -33,7 +33,7 @@
}; };
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () ) RTTI::RTTI() SAL_THROW( () )
+#if __FreeBSD_version < 700022 +#if __FreeBSD_version < 602103
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+#else +#else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) ) + : m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -57,7 +57,7 @@
OString symName( buf.makeStringAndClear() ); OString symName( buf.makeStringAndClear() );
-//#iZ 22253 -//#iZ 22253
+#if __FreeBSD_version < 700022 /* #i22253# */ +#if __FreeBSD_version < 602103 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+#else +#else
+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); + rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
@ -117,7 +117,7 @@
}; };
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () ) RTTI::RTTI() SAL_THROW( () )
+#if __FreeBSD_version < 700022 +#if __FreeBSD_version < 602103
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+#else +#else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) ) + : m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -129,7 +129,7 @@
buf.append( 'E' ); buf.append( 'E' );
OString symName( buf.makeStringAndClear() ); OString symName( buf.makeStringAndClear() );
+#if __FreeBSD_version < 700022 /* #i22253# */ +#if __FreeBSD_version < 602103 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+#else +#else
+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); + rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

2
editors/openoffice.org-vcltesttool/Makefile
View File

@ -182,7 +182,7 @@ WITHOUT_MOZILLA= yes
LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost
CONFIGURE_ARGS+= --with-system-boost=yes #i58343# CONFIGURE_ARGS+= --with-system-boost=yes #i58343#
.endif .endif
.if (${OSVERSION} <= 700021) .if (${OSVERSION} <= 602102)
EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667 EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667
.endif .endif
.if (${OSVERSION} <= 492000) .if (${OSVERSION} <= 492000)

8
editors/openoffice.org-vcltesttool/files/patch-i66667
View File

@ -33,7 +33,7 @@
}; };
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () ) RTTI::RTTI() SAL_THROW( () )
+#if __FreeBSD_version < 700022 +#if __FreeBSD_version < 602103
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+#else +#else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) ) + : m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -57,7 +57,7 @@
OString symName( buf.makeStringAndClear() ); OString symName( buf.makeStringAndClear() );
-//#iZ 22253 -//#iZ 22253
+#if __FreeBSD_version < 700022 /* #i22253# */ +#if __FreeBSD_version < 602103 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+#else +#else
+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); + rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
@ -117,7 +117,7 @@
}; };
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () ) RTTI::RTTI() SAL_THROW( () )
+#if __FreeBSD_version < 700022 +#if __FreeBSD_version < 602103
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+#else +#else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) ) + : m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -129,7 +129,7 @@
buf.append( 'E' ); buf.append( 'E' );
OString symName( buf.makeStringAndClear() ); OString symName( buf.makeStringAndClear() );
+#if __FreeBSD_version < 700022 /* #i22253# */ +#if __FreeBSD_version < 602103 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+#else +#else
+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); + rtti = (type_info *)dlsym( m_hApp, symName.getStr() );