summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2001-02-13 05:19:56 +0000
committerpeter <peter@FreeBSD.org>2001-02-13 05:19:56 +0000
commit268a1667c6b813157dade28d991839f35e21535e (patch)
tree02fe5257bcd26c09b44236ce78f03bf64c3f6b0d
parent44858d9ded687b771a7adf3671b4cfc175fef71e (diff)
downloadFreeBSD-src-268a1667c6b813157dade28d991839f35e21535e.zip
FreeBSD-src-268a1667c6b813157dade28d991839f35e21535e.tar.gz
When setproctitle() moved from libutil to libc, we forgot to back the
change out that made libperl.so dynamically depend on libutil.so to pick up setproctitle() in its old location. This breaks changes involving incomptabable libc's because ld looks for the dynamic dependency (which it has no business doing anyway) in the wrong place - /usr/lib!
-rw-r--r--gnu/usr.bin/perl/libperl/Makefile4
-rw-r--r--gnu/usr.bin/perl/miniperl/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/gnu/usr.bin/perl/libperl/Makefile b/gnu/usr.bin/perl/libperl/Makefile
index ea972bd..824ce61 100644
--- a/gnu/usr.bin/perl/libperl/Makefile
+++ b/gnu/usr.bin/perl/libperl/Makefile
@@ -10,8 +10,8 @@ SRCS= perl.c gv.c toke.c perly.c op.c regcomp.c dump.c util.c mg.c \
xsutils.c globals.c perlio.c perlapi.c \
config.h
-DPADD= ${LIBM} ${LIBUTIL}
-LDADD= -lm -lutil
+DPADD= ${LIBM}
+LDADD= -lm
NO_PERL_SCRIPT_MAKE= true
diff --git a/gnu/usr.bin/perl/miniperl/Makefile b/gnu/usr.bin/perl/miniperl/Makefile
index 81d29c9..cdc8bc1 100644
--- a/gnu/usr.bin/perl/miniperl/Makefile
+++ b/gnu/usr.bin/perl/miniperl/Makefile
@@ -11,8 +11,8 @@ MYLIBPERL= ${.OBJDIR}/../libperl/libperl.a
.else
MYLIBPERL= ${.CURDIR}/../libperl/libperl.a
.endif
-DPADD= ${MYLIBPERL} ${LIBM} ${LIBCRYPT} ${LIBUTIL}
-LDADD= ${MYLIBPERL} -lm -lcrypt -lutil
+DPADD= ${MYLIBPERL} ${LIBM} ${LIBCRYPT}
+LDADD= ${MYLIBPERL} -lm -lcrypt
build-tools: cleandepend
cd ${.CURDIR} && ${MAKE} ${PROG}
OpenPOWER on IntegriCloud