Attachment 149924 Details for Bug 195434 – Use ${SETENV} instead of ${ENV}; add -f to ${LN}

[patch] Use ${SETENV} instead of ${ENV}; add -f to ${LN}

perl_use_setenv_macro.patch (text/plain), 1.10 KB, created by guyyur on 2014-11-26 23:57:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: guyyur

Created: 2014-11-26 23:57:06 UTC

Size: 1.10 KB

patch

obsolete

>--- Makefile.orig	2014-11-27 01:29:52.000000000 +0200
>+++ Makefile	2014-11-27 01:29:09.000000000 +0200
>@@ -194,7 +194,7 @@
> 	${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto
> 	${MKDIR} ${STAGEDIR}${SITE_PERL}/auto
> 	${RM} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/.packlist
>-	${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5
>+	${LN} -f ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION}
> 	${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc
> 	${FIND} ${STAGEDIR} -name '*.bs' -size 0 -delete
>@@ -202,7 +202,7 @@
> 	${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys
> 	# h2ph needs perl, but perl is not installed, it's only
> 	# staged, so, use the one in WRKDIR 
>-	(cd /usr/include && ${ENV} LD_LIBRARY_PATH=${WRKSRC} \
>+	(cd /usr/include && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
> 		${WRKSRC}/perl -I ${WRKSRC}/lib ${STAGEDIR}${PREFIX}/bin/h2ph \
> 		-d ${STAGEDIR}${SITE_ARCH} *.h machine/*.h sys/*.h >/dev/null)
> 	@${FIND} ${STAGEDIR}${SITE_ARCH} -name '*.ph' | sed -e 's|${STAGEDIR}||' >> ${TMPPLIST}

Actions: View | Diff

Attachments on bug 195434: 149924