diff options
author | agc <agc@pkgsrc.org> | 2002-09-04 14:47:32 +0000 |
---|---|---|
committer | agc <agc@pkgsrc.org> | 2002-09-04 14:47:32 +0000 |
commit | cb0e38446b26c5bb3ee8b10360669165287c6faa (patch) | |
tree | c5f617edba6ae81af7be6e5d984ab9fdbe5a97f4 /misc/kdeutils2 | |
parent | e3796adbcd56281dbb92ae41375bc079d3fd02f2 (diff) | |
download | pkgsrc-cb0e38446b26c5bb3ee8b10360669165287c6faa.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/kdeutils2')
-rw-r--r-- | misc/kdeutils2/Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile index d4794169169..d53902dd188 100644 --- a/misc/kdeutils2/Makefile +++ b/misc/kdeutils2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/03/13 17:37:27 fredb Exp $ +# $NetBSD: Makefile,v 1.11 2002/09/04 14:47:38 agc Exp $ DISTNAME= kdeutils-2.2.2 PKGREVISION= 1 @@ -10,14 +10,13 @@ BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde USE_BUILDLINK_ONLY= YES -.include "../../mk/bsd.prefs.mk" +# Ensure we export symbols in the linked shared object. +LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} -.if ${OPSYS} == "NetBSD" -LIBS= -Wl,--export-dynamic +.include "../../mk/bsd.prefs.mk" -. if exists(/usr/include/machine/apmvar.h) +.if ${OPSYS} == "NetBSD" && exists(/usr/include/machine/apmvar.h) CPPFLAGS+= -D__NetBSD_APM__ -. endif .endif post-install: |