diff options
Diffstat (limited to 'mk/buildlink2')
| -rw-r--r-- | mk/buildlink2/NOTES | 14 | ||||
| -rw-r--r-- | mk/buildlink2/libtool-fix-la | 12 |
2 files changed, 16 insertions, 10 deletions
diff --git a/mk/buildlink2/NOTES b/mk/buildlink2/NOTES index b9a5f273e21..0edd7b130cd 100644 --- a/mk/buildlink2/NOTES +++ b/mk/buildlink2/NOTES @@ -1,4 +1,4 @@ -$NetBSD: NOTES,v 1.11 2002/12/28 23:01:25 schmonz Exp $ +$NetBSD: NOTES,v 1.11.6.1 2003/09/02 03:09:50 jlam Exp $ Caching ======= @@ -22,14 +22,14 @@ and performing the tests above, but only building the packages is needed. Platform Working? Full caching? -------- -------- ------------- -FreeBSD 4.7 N/A N/A +FreeBSD 4.7 IRIX 6.5 (jschauma) Yes! Yes! -Linux N/A N/A +Linux Darwin 5.5 (schmonz) Yes! No Darwin 6.2 (grant) Yes! Yes! -NetBSD 1.5.x (gendalia) N/A N/A +NetBSD 1.5.x (gendalia) NetBSD 1.6 (jlam) Yes! Yes! -OpenBSD (cjep) N/A N/A -Solaris 7 N/A N/A +OpenBSD (cjep) +Solaris 7 Solaris 8 (grant) Yes! Yes! -Solaris 9 (salo) N/A N/A +Solaris 9 (salo) Yes! Yes! diff --git a/mk/buildlink2/libtool-fix-la b/mk/buildlink2/libtool-fix-la index 29a82c68e75..a417c1d64ff 100644 --- a/mk/buildlink2/libtool-fix-la +++ b/mk/buildlink2/libtool-fix-la @@ -1,4 +1,4 @@ -# $NetBSD: libtool-fix-la,v 1.18.6.2 2003/08/30 07:57:58 jlam Exp $ +# $NetBSD: libtool-fix-la,v 1.18.6.3 2003/09/02 03:09:51 jlam Exp $ # # For *.la files, in the "relink_command" line, we make the following # replacements: @@ -144,11 +144,17 @@ if $test -f $lafile; then case "$i" in $prev) ;; + -R*) + # skip all -R* options... rpath info shouldn't + # go into the dependency_libs line. + ;; -L*) case "$i" in - -L${BUILDLINK_DIR}/*|-L${BUILDLINK_X11_DIR}/*) + -L${BUILDLINK_DIR}|-L${BUILDLINK_DIR}/*) + ;; + -L${BUILDLINK_X11_DIR}|-L${BUILDLINK_X11_DIR}/*) ;; - -L@WRKSRC@/*) + -L@WRKSRC@|-L@WRKSRC@/*) ;; *) case "$L" in |