summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorjlam <jlam>2004-11-10 20:16:57 +0000
committerjlam <jlam>2004-11-10 20:16:57 +0000
commit5ce854d129289772a68c4ed69f73a7bac1ff413a (patch)
tree71fb900f994d4233aaa72e53d5ba6ef309867fc6 /lang
parent45d95b8eefad81098372aa8b7605875811a1f2b0 (diff)
downloadpkgsrc-5ce854d129289772a68c4ed69f73a7bac1ff413a.tar.gz
Nuke the code that rebuilt the perl binary as a statically-linked
executable. Until someone produces benchmarks that show that this actually makes a difference, this is just added complexity with no measurable benefit. Bump the PKGREVISION.
Diffstat (limited to 'lang')
-rw-r--r--lang/perl58/Makefile59
1 files changed, 4 insertions, 55 deletions
diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile
index f80d55468d5..bf867004fb0 100644
--- a/lang/perl58/Makefile
+++ b/lang/perl58/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2004/11/07 16:20:11 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2004/11/10 20:16:57 jlam Exp $
# The following two variables should have empty values unless we're
# building a perl snapshot or release candidate.
@@ -9,6 +9,7 @@ PERL5_RC_VERS= # empty
.if empty(PERL5_SNAPSHOT) && empty(PERL5_RC_VERS)
DISTNAME= perl-${PERL5_VERS}
PKGNAME= perl${PERL5_PKGSUFFIX}-${PERL5_VERS}
+PKGREVISION= 1
SNAPSHOT_SITES= # empty
.else
. if !empty(PERL5_SNAPSHOT)
@@ -54,6 +55,7 @@ CONFIGURE_ARGS+= -Dscriptdir="${PREFIX}/bin"
CONFIGURE_ARGS+= -Darchname="${MACHINE_ARCH}-${LOWER_OPSYS}"
CONFIGURE_ARGS+= -Doptimize="${CFLAGS}"
CONFIGURE_ARGS+= -Dinstallstyle="lib/perl5"
+CONFIGURE_ARGS+= -Duseshrplib
CONFIGURE_ARGS+= -Ui_malloc
CONFIGURE_ARGS+= -Uusemymalloc
CONFIGURE_ARGS+= -Uinstallusrbinperl
@@ -97,30 +99,16 @@ CONFIGURE_ARGS+= -Duseithreads
. include "../../mk/pthread.buildlink3.mk"
.endif
-MKPIC?= yes
-
CONFIGURE_ARGS+= -Dcc="${CC}"
MAKE_ENV+= LANG=""
-.if ${OPSYS} == "Interix"
-#
-# On Interix, the shared perl is actually faster, so default to that.
-#
-STATIC_PERL?= no
-
-.elif ${OPSYS} == "Darwin"
+.if ${OPSYS} == "Darwin"
#
# The perl build attempts to work around case-insensitivity problems on
# HFS filesystems by using GNUmakefiles, so we need to use GNU make.
#
USE_GNU_TOOLS+= make
#
-# Perl is _always_ built using shared libraries on Darwin; there's no
-# way to build a statically-linked perl binary.
-#
-MKPIC= yes
-STATIC_PERL= no
-#
# "installarchlib" and "installsitearch" have different forms between
# Darwin and NetBSD (and between older and newer versions of Darwin)
#
@@ -179,12 +167,6 @@ FIX_RPATH+= LOCLIBRPATHFLAGS
CONFIGURE_ARGS+= -Dlibswanted="${LIBSWANTED.${OPSYS}}"
.endif
-.if ${OPSYS} == "NetBSD"
-. if !exists(/usr/libexec/ld.so) && !exists(/usr/libexec/ld.elf_so)
-MKPIC= no
-. endif
-.endif
-
.include "../../mk/compiler.mk"
.if ${OPSYS} == "IRIX" && ${ABI} == "64"
@@ -214,10 +196,6 @@ CFLAGS+= -g -msoft-quad-float -O2
. endif
.endif
-.if ${MKPIC} == "yes"
-CONFIGURE_ARGS+= -Duseshrplib
-.endif
-
PERL5= ${PREFIX}/bin/perl${PERL5_VERS}
PERL5_PRIVLIB?= ${PREFIX}/lib/perl5/${PERL5_VERS}
PERL5_ARCHLIB?= ${PREFIX}/lib/perl5/${PERL5_VERS}/${MACHINE_ARCH}-${LOWER_OPSYS}
@@ -265,37 +243,8 @@ pre-configure:
done
.endif
-# By default, on platforms that build shared libraries, rebuild the perl
-# binary as a statically-linked binary as a speed optimization. Performance
-# increase is only by word-of-mouth -- no actual benchmarks have been
-# produced. However, it has been remarked that the advantage of having a
-# statically-linked perl is pretty much non-existent on any platform with
-# any reasonable number of registers. These platforms should be added to
-# the list below to bypass the build of the statically-linked perl.
-#
-.if ${MKPIC} == "yes"
-. for _arch_ in mipsel mipseb powerpc
-. if !empty(MACHINE_ARCH:M${_arch_})
-STATIC_PERL?= no
-. endif
-. endfor
-.endif
-STATIC_PERL?= yes
-
WRKSRC_PERL5= ${WRKSRC}/perl
-.if defined(STATIC_PERL) && !empty(STATIC_PERL:M[yY][eE][sS])
-STATIC_WRKDIR= ${WRKDIR}/static
-STATIC_MAKEFLAGS= MKPIC=no STATIC_PERL=no
-STATIC_MAKEFLAGS+= WRKDIR=${STATIC_WRKDIR}
-STATIC_MAKEFLAGS+= ALL_TARGET=perl
-WRKSRC_PERL5= ${STATIC_WRKDIR}/${WRKSRC:T}/perl
-UNLIMIT_RESOURCES= datasize
-
-post-build:
- cd ${.CURDIR} && ${MAKE} build ${STATIC_MAKEFLAGS}
-.endif
-
post-install:
${RM} -f ${PREFIX}/bin/perl ${PREFIX}/bin/perl${PERL5_VERS}
${INSTALL_PROGRAM_DIR} ${PREFIX}/bin