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 /www/php4/patches | |
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 'www/php4/patches')
-rw-r--r-- | www/php4/patches/patch-aa | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/www/php4/patches/patch-aa b/www/php4/patches/patch-aa index 39eb7c9a362..8c517419aa1 100644 --- a/www/php4/patches/patch-aa +++ b/www/php4/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.7 2001/10/16 04:54:24 jlam Exp $ +$NetBSD: patch-aa,v 1.8 2002/09/04 14:47:40 agc Exp $ --- Makefile.in.orig Sat Apr 21 21:09:12 2001 +++ Makefile.in @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.7 2001/10/16 04:54:24 jlam Exp $ PROGRAM_SOURCES = stub.c PROGRAM_LDADD = libphp4.la $(EXT_PROGRAM_LDADD) -PROGRAM_LDFLAGS = -export-dynamic -+PROGRAM_LDFLAGS = -static -export-dynamic $(LINK_LIBGCC_LDFLAGS) ++PROGRAM_LDFLAGS = -static ${EXPORT_SYMBOLS_LDFLAGS} $(LINK_LIBGCC_LDFLAGS) PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD) targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM) |