Date: Thu, 1 Nov 2018 10:36:33 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483655 - in head/lang: perl5-devel perl5.24 perl5.26 perl5.28 Message-ID: <201811011036.wA1AaXCU064157@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Thu Nov 1 10:36:32 2018 New Revision: 483655 URL: https://svnweb.freebsd.org/changeset/ports/483655 Log: Make $^X is deterministic. Its output can vary, and not be the correct one because of hard links. So replace the hard links with symlinks so that there is only one perl. PR: 232501 Reported by: Helge Oldach Modified: head/lang/perl5-devel/Makefile (contents, props changed) head/lang/perl5.24/Makefile (contents, props changed) head/lang/perl5.26/Makefile (contents, props changed) head/lang/perl5.28/Makefile (contents, props changed) Modified: head/lang/perl5-devel/Makefile ============================================================================== --- head/lang/perl5-devel/Makefile Thu Nov 1 10:24:15 2018 (r483654) +++ head/lang/perl5-devel/Makefile Thu Nov 1 10:36:32 2018 (r483655) @@ -7,7 +7,7 @@ PORTNAME= perl DISTVERSIONPREFIX= v DISTVERSION= ${GH_TAGNAME:C/^v//:C/-g[0-9a-f]*$//} DISTVERSIONSUFFIX= ${GH_TAGNAME:C/.*-g/-g/} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= lang devel perl5 # XXX Leave only CPAN. MASTER_SITES= LOCAL/mat/perl GH @@ -303,6 +303,9 @@ post-install: ${MKDIR} ${STAGEDIR}${SITE_MAN1} ${STAGEDIR}${SITE_MAN3} ${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto ${MKDIR} ${STAGEDIR}${SITE_PERL}/auto +.if defined(IAMDEFAULTPERL) + ${LN} -sf perl ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} +.endif ${LN} -sf libperl.so.${LIBPERL_VER} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so ${LN} -sf libperl.so.${LIBPERL_VER} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so.${PERL_VER} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} Modified: head/lang/perl5.24/Makefile ============================================================================== --- head/lang/perl5.24/Makefile Thu Nov 1 10:24:15 2018 (r483654) +++ head/lang/perl5.24/Makefile Thu Nov 1 10:36:32 2018 (r483655) @@ -3,6 +3,7 @@ PORTNAME= perl DISTVERSION= ${PERL_VERSION} +PORTREVISION= 1 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN/../../src/5.0 CPAN/../by-authors/id/S/SH/SHAY DIST_SUBDIR= perl @@ -256,7 +257,10 @@ post-install: ${MKDIR} ${STAGEDIR}${SITE_MAN1} ${STAGEDIR}${SITE_MAN3} ${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto ${MKDIR} ${STAGEDIR}${SITE_PERL}/auto - ${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5 +.if defined(IAMDEFAULTPERL) + ${LN} -sf perl ${STAGEDIR}${PREFIX}/bin/perl5 + ${LN} -sf perl ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} +.endif ${LN} -sf libperl.so.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so ${LN} -sf libperl.so.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so.${PERL_VER} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} Modified: head/lang/perl5.26/Makefile ============================================================================== --- head/lang/perl5.26/Makefile Thu Nov 1 10:24:15 2018 (r483654) +++ head/lang/perl5.26/Makefile Thu Nov 1 10:36:32 2018 (r483655) @@ -3,6 +3,7 @@ PORTNAME= perl DISTVERSION= ${PERL_VERSION} +PORTREVISION= 1 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN/../../src/5.0/ DIST_SUBDIR= perl @@ -254,7 +255,10 @@ post-install: ${MKDIR} ${STAGEDIR}${SITE_MAN1} ${STAGEDIR}${SITE_MAN3} ${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto ${MKDIR} ${STAGEDIR}${SITE_PERL}/auto - ${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5 +.if defined(IAMDEFAULTPERL) + ${LN} -sf perl ${STAGEDIR}${PREFIX}/bin/perl5 + ${LN} -sf perl ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} +.endif ${LN} -sf libperl.so.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so ${LN} -sf libperl.so.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so.${PERL_VER} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} Modified: head/lang/perl5.28/Makefile ============================================================================== --- head/lang/perl5.28/Makefile Thu Nov 1 10:24:15 2018 (r483654) +++ head/lang/perl5.28/Makefile Thu Nov 1 10:36:32 2018 (r483655) @@ -3,7 +3,7 @@ PORTNAME= perl DISTVERSION= ${PERL_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN/../../src/5.0 CPAN/../../authors/id/X/XS/XSAWYERX/ DIST_SUBDIR= perl @@ -255,7 +255,10 @@ post-install: ${MKDIR} ${STAGEDIR}${SITE_MAN1} ${STAGEDIR}${SITE_MAN3} ${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto ${MKDIR} ${STAGEDIR}${SITE_PERL}/auto - ${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5 +.if defined(IAMDEFAULTPERL) + ${LN} -sf perl ${STAGEDIR}${PREFIX}/bin/perl5 + ${LN} -sf perl ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} +.endif ${LN} -sf libperl.so.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so ${LN} -sf libperl.so.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so.${PERL_VER} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811011036.wA1AaXCU064157>