diff options
author | agc <agc> | 2002-09-04 14:47:32 +0000 |
---|---|---|
committer | agc <agc> | 2002-09-04 14:47:32 +0000 |
commit | 5c18ecbd1e9c2dd9ee1b1599ca35d0578b2e188d (patch) | |
tree | c5f617edba6ae81af7be6e5d984ab9fdbe5a97f4 /misc/koffice | |
parent | c1e1344cf693a2f7f40a257987f12caad992a0fc (diff) | |
download | pkgsrc-5c18ecbd1e9c2dd9ee1b1599ca35d0578b2e188d.tar.gz |
Apply patches from Lubomir Sedlacik <salo@Xtrmntr.org> in PR 18115 to
generalise the linker flags used to export symbols by setting them on
a per-OS basis.
> many packages force -Wl,-export-dynamic which is not portable outside GNU ld
> and cause problems e.g. on Solaris. some of these packages use if
> conditionals either only for NetBSD or except SunOS, but the state is not
> coherent and it may complicate later when support for new OS is added to
> pkgsrc (e.g. ongoing work on HP-UX support).
>
> jlam proposed the following framework in discussion on tech-pkg:
>
> http://mail-index.netbsd.org/tech-pkg/2002/06/21/0009.html
>
> now, ${EXPORT_SYMBOLS_LDFLAGS} is used instead of directly defining
> -Wl,-export-dynamic which is set in appropriate defs.*.mk to reasonable
> values. packages should be converted to this framework by:
>
> 1) replacing LDFLAGS+= -Wl,-export-dynamic and LIBS+= -export-dynamic with:
>
> LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
>
> 2) for use in patchfiles, add this variable to MAKE_ENV if needed:
>
> MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS}
>
> 3) replace occurances of -Wl,-export-dynamic and -export-dynamic in patch
> files with:
>
> $(EXPORT_SYMBOLS_LDFLAGS)
Diffstat (limited to 'misc/koffice')
-rw-r--r-- | misc/koffice/Makefile.common | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/misc/koffice/Makefile.common b/misc/koffice/Makefile.common index 7f13cc2baad..ab075e32806 100644 --- a/misc/koffice/Makefile.common +++ b/misc/koffice/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1 2002/06/20 19:13:50 jschauma Exp $ +# $NetBSD: Makefile.common,v 1.2 2002/09/04 14:47:38 agc Exp $ CATEGORIES= misc kde VERSION= 1.1.1 @@ -11,9 +11,10 @@ USE_BUILDLINK_ONLY= YES REPLACE_PERL= kpresenter/kprconverter.pl -.if ${OPSYS} == "NetBSD" -LIBS+= -Wl,--export-dynamic +# Ensure we export symbols in the linked shared object. +LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} +.if ${OPSYS} == "NetBSD" # On egcs-1.1.2, the C++ compiler system isn't quite ISO-compliant. It lacks # a std::auto_ptr implementation in <memory>, doesn't handle static inline # functions in headers properly (although that concept, in itself, is quite |