summaryrefslogtreecommitdiff
path: root/lang/perl5/Makefile
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-10-01 07:05:10 +0000
committerjlam <jlam@pkgsrc.org>2001-10-01 07:05:10 +0000
commit2eea86c39731f75d5a56605ec0385cad094ced59 (patch)
treeedcdd566800823ae52665ec13c27a081c1f81c19 /lang/perl5/Makefile
parent44b8ad0811c9e6d187b3df8cdb7439ee0363d58d (diff)
downloadpkgsrc-2eea86c39731f75d5a56605ec0385cad094ced59.tar.gz
Update perl to 5.6.1nb4. Changes from version 5.6.1nb3 include:
* Ensure that shared objects/libraries created by perl Makefiles include the correct run-time library search path by also including the local libraries directories. For example, shared objects are linked on ELF platforms with "cc -Wl,-R/usr/pkg/lib -L/usr/pkg/lib", and not just "cc -L/usr/pkg/lib" as before.
Diffstat (limited to 'lang/perl5/Makefile')
-rw-r--r--lang/perl5/Makefile25
1 files changed, 19 insertions, 6 deletions
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index eebed25d342..d3246092fb7 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.45 2001/09/26 03:12:14 jlam Exp $
+# $NetBSD: Makefile,v 1.46 2001/10/01 07:05:10 jlam Exp $
.include "../../lang/perl5/Makefile.common"
PKGNAME= perl-${PERL5_VERS}
-PERL5_PKG_VERS= nb3
+PERL5_PKG_VERS= nb4
CATEGORIES+= lang devel
MAINTAINER= jlam@netbsd.org
@@ -45,6 +45,18 @@ LIBSWANTED.SunOS= m crypt socket nsl
SYSLIBPATH.NetBSD= /usr/lib
SYSLIBPATH.SunOS= /usr/lib
+# Nail down the directories in which headers and libraries of
+# locally-installed software may be found.
+#
+LOCLIBPATH= ${LOCALBASE}/lib
+LOCINCPATH= ${LOCALBASE}/include
+
+.if ${OBJECT_FMT} == "a.out"
+LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/-R/g}
+.else
+LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/-Wl,-R/g}
+.endif
+
.if defined(LIBSWANTED.${OPSYS})
CONFIGURE_ARGS+= -Dlibswanted="${LIBSWANTED.${OPSYS}}"
.endif
@@ -87,10 +99,11 @@ post-patch:
hintdir="${WRKSRC}/hints"; \
for hints in $${hintdir}/*.sh; do \
${CHMOD} +w $${hints}; \
- ( ${ECHO} ""; \
- ${ECHO} "man3dir=none"; \
- ${ECHO} "locincpth='${LOCALBASE}/include'"; \
- ${ECHO} "loclibpth='${LOCALBASE}/lib'"; \
+ ( ${ECHO} ''; \
+ ${ECHO} 'man3dir=none'; \
+ ${ECHO} 'locincpth="${LOCINCPATH}"'; \
+ ${ECHO} 'loclibpth="${LOCLIBPATH}"'; \
+ ${ECHO} 'ldflags="${LOCLIBRPATHFLAGS} $$ldflags"'; \
) >> $${hints}; \
done
.if defined(SYSLIBPATH.${OPSYS})