Attachment 170180 Details for Bug 209173 – patch-v1

[patch] patch-v1

perl.diff (text/plain), 5.29 KB, created by Mathieu Arnold on 2016-05-10 14:58:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Arnold

Created: 2016-05-10 14:58:02 UTC

Size: 5.29 KB

patch

obsolete

>diff --git lang/perl5-devel/Makefile lang/perl5-devel/Makefile
>index 5374c5b..4ac505e 100644
>--- lang/perl5-devel/Makefile
>+++ lang/perl5-devel/Makefile
>@@ -109,8 +109,8 @@ CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
> # shrpldflags is used for libperl.so, so remove all the extra bits inherited from lddlflags.
> # XXX change the soname to $$(LIBPERL:R)
> CONFIGURE_ARGS+= \
>-	-Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -lperl' \
>-	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL)'
>+	-Alddlflags='-L${WRKSRC} -lperl' \
>+	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-lperl) -Wl,-soname,$$(LIBPERL)'
> 
> # Give a hint of where libperl.so can be found.
> USE_LDCONFIG=	${PREFIX}/${_ARCH_LIB}/CORE
>@@ -280,7 +280,7 @@ post-patch-PTHREAD-off:
> 		${WRKSRC}/hints/freebsd.sh
> 
> post-build:
>-	@${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} ||' \
>+	@${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} |-L${PREFIX}/${_ARCH_LIB}/CORE |' \
> 		${WRKSRC}/lib/Config_heavy.pl
> .if ${CC} == /nxb-bin/usr/bin/cc
> 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
>diff --git lang/perl5.18/Makefile lang/perl5.18/Makefile
>index f9d3391..75d18d7 100644
>--- lang/perl5.18/Makefile
>+++ lang/perl5.18/Makefile
>@@ -99,8 +99,8 @@ CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
> # lddlflags is used for all .so linking
> # shrpldflags is used for libperl.so, so remove all the extra bits inherited from lddlflags.
> CONFIGURE_ARGS+= \
>-	-Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -lperl' \
>-	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL:R)'
>+	-Alddlflags='-L${WRKSRC} -lperl' \
>+	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-lperl) -Wl,-soname,$$(LIBPERL:R)'
> 
> # Give a hint of where libperl.so can be found.
> USE_LDCONFIG=	${PREFIX}/${_ARCH_LIB}/CORE
>@@ -243,7 +243,7 @@ post-patch-PTHREAD-off:
> 		${WRKSRC}/hints/freebsd.sh
> 
> post-build:
>-	@${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} ||' \
>+	@${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} |-L${PREFIX}/${_ARCH_LIB}/CORE |' \
> 		${WRKSRC}/lib/Config_heavy.pl
> .if ${CC} == /nxb-bin/usr/bin/cc
> 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
>diff --git lang/perl5.20/Makefile lang/perl5.20/Makefile
>index 201e370..07f96db 100644
>--- lang/perl5.20/Makefile
>+++ lang/perl5.20/Makefile
>@@ -92,8 +92,8 @@ CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
> # lddlflags is used for all .so linking
> # shrpldflags is used for libperl.so, so remove all the extra bits inherited from lddlflags.
> CONFIGURE_ARGS+= \
>-	-Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -lperl' \
>-	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL:R)'
>+	-Alddlflags='-L${WRKSRC} -lperl' \
>+	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-lperl) -Wl,-soname,$$(LIBPERL:R)'
> 
> # Give a hint of where libperl.so can be found.
> USE_LDCONFIG=	${PREFIX}/${_ARCH_LIB}/CORE
>@@ -234,7 +234,7 @@ post-patch-PTHREAD-off:
> 		${WRKSRC}/hints/freebsd.sh
> 
> post-build:
>-	@${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} ||' \
>+	@${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} |-L${PREFIX}/${_ARCH_LIB}/CORE |' \
> 		${WRKSRC}/lib/Config_heavy.pl
> .if ${CC} == /nxb-bin/usr/bin/cc
> 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
>diff --git lang/perl5.22/Makefile lang/perl5.22/Makefile
>index ae60c59..c0f0cb8 100644
>--- lang/perl5.22/Makefile
>+++ lang/perl5.22/Makefile
>@@ -91,8 +91,8 @@ CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
> # lddlflags is used for all .so linking
> # shrpldflags is used for libperl.so, so remove all the extra bits inherited from lddlflags.
> CONFIGURE_ARGS+= \
>-	-Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -lperl' \
>-	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL:R)'
>+	-Alddlflags='-L${WRKSRC} -lperl' \
>+	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-lperl) -Wl,-soname,$$(LIBPERL:R)'
> 
> # Give a hint of where libperl.so can be found.
> USE_LDCONFIG=	${PREFIX}/${_ARCH_LIB}/CORE
>@@ -233,7 +233,7 @@ post-patch-PTHREAD-off:
> 		${WRKSRC}/hints/freebsd.sh
> 
> post-build:
>-	@${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} ||' \
>+	@${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} |-L${PREFIX}/${_ARCH_LIB}/CORE |' \
> 		${WRKSRC}/lib/Config_heavy.pl
> .if ${CC} == /nxb-bin/usr/bin/cc
> 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
>diff --git lang/perl5.24/Makefile lang/perl5.24/Makefile
>index 0b431c5..9faef95 100644
>--- lang/perl5.24/Makefile
>+++ lang/perl5.24/Makefile
>@@ -91,8 +91,8 @@ CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
> # lddlflags is used for all .so linking
> # shrpldflags is used for libperl.so, so remove all the extra bits inherited from lddlflags.
> CONFIGURE_ARGS+= \
>-	-Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -lperl' \
>-	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL:R)'
>+	-Alddlflags='-L${WRKSRC} -lperl' \
>+	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-lperl) -Wl,-soname,$$(LIBPERL:R)'
> 
> # Give a hint of where libperl.so can be found.
> USE_LDCONFIG=	${PREFIX}/${_ARCH_LIB}/CORE
>@@ -233,7 +233,7 @@ post-patch-PTHREAD-off:
> 		${WRKSRC}/hints/freebsd.sh
> 
> post-build:
>-	@${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} ||' \
>+	@${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} |-L${PREFIX}/${_ARCH_LIB}/CORE |' \
> 		${WRKSRC}/lib/Config_heavy.pl
> .if ${CC} == /nxb-bin/usr/bin/cc
> 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \

Actions: View | Diff

Attachments on bug 209173: 170180