Re: www/nginx fix -perl subpackage for ARCH != MACHINE_ARCH

On Mon, Nov 26, 2018 at 10:21:00PM +0100, Landry Breuil wrote:
> On Sat, Nov 24, 2018 at 06:03:55PM +0100, Peter Hessler wrote:
> > Found while looking through a bulk on arm64. The Makefile references
> > ARCH, while the PLIST references P5ARCH, which is uses MACHINE_ARCH.
> > On amd64, they are the same, but on arm64 one of them is aarch64. A few
> > of our other platforms have this difference as well.
> >
> > the '/auto/' prefix seems unused, so I simply removed it as well.
> >
> > No REVISION bump because non-affected arches won't see a difference, and
> > affected arches didn't build.
>
> It wont package because PLIST-perl still has the /auto/ dir - so either
> keep the /auto/ dir, or bump REVISION :)

I think if you want it to work you'll need to keep the auto/ directory.

DynaLoader's bootstrap looks for an auto/$module directory which is how
XS modules generally work:
https://metacpan.org/pod/distribution/perl/ext/DynaLoader/DynaLoader_pm.PL#bootstrap()

In MakeMaker it's the INST_ARCHAUTODIR, although I strangely don't find
that documented particularly well. Not actually something I've needed
to fix before so didn't look too hard.


> I came to the same conclusion to fix nginx on macppc, but imo the
> nginx.so should go under auto/nginx/nginx.so, as it seems the "right
> dir" for .so stuff (pkg_locate openbsd/auto shows all perl .so there)
> and that's what other packaging is doing
> (https://centos.pkgs.org/6/epel-x86_64/nginx-mod-http-perl-1.10.2-1.el6.x86_64.rpm.html
> as an example)
>
> ofc runtime testing would confirm that..
>
> So here's my own variation.
>
> Landry

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/www/nginx/Makefile,v
> retrieving revision 1.127
> diff -u -r1.127 Makefile
> --- Makefile 10 Nov 2018 08:43:34 -0000 1.127
> +++ Makefile 26 Nov 2018 21:16:16 -0000
> @@ -31,6 +31,7 @@
> PKGNAME-headers_more= nginx-headers-more-${VERSION}
> PKGNAME-perl= nginx-perl-${VERSION}
> PKGNAME-passenger= nginx-passenger-${VERSION}
> +REVISION-perl=0
>
> MASTER_SITES= https://nginx.org/download/
> MASTER_SITES0= https://github.com/simpl/ngx_devel_kit/archive/
> @@ -199,10 +200,10 @@
> ${INSTALL_DATA} ${WRKSRC}/html/* ${PREFIX}/share/nginx/html/
> ${INSTALL_DATA_DIR} ${WRKINST}/var/www/modules/
> ${INSTALL_DATA} ${WRKSRC}/objs/*.so ${WRKINST}/var/www/modules/
> - ${INSTALL_DATA_DIR} ${PREFIX}/libdata/perl5/site_perl/${ARCH}-openbsd/auto/
> + ${INSTALL_DATA_DIR} ${PREFIX}/${P5ARCH}/auto/nginx/
> ${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \
> - ${PREFIX}/libdata/perl5/site_perl/${ARCH}-openbsd/
> + ${PREFIX}/${P5ARCH}/
> ${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so \
> - ${PREFIX}/libdata/perl5/site_perl/${ARCH}-openbsd/
> + ${PREFIX}/${P5ARCH}/auto/nginx/
>
> .include <bsd.port.mk>
> Index: pkg/PLIST-perl
> ===================================================================
> RCS file: /cvs/ports/www/nginx/pkg/PLIST-perl,v
> retrieving revision 1.2
> diff -u -r1.2 PLIST-perl
> --- pkg/PLIST-perl 28 Sep 2018 14:36:17 -0000 1.2
> +++ pkg/PLIST-perl 26 Nov 2018 21:16:16 -0000
> @@ -1,7 +1,8 @@
> @comment $OpenBSD: PLIST-perl,v 1.2 2018/09/28 14:36:17 sthen Exp $
> ${P5ARCH}/
> ${P5ARCH}/auto/
> +${P5ARCH}/auto/nginx/
> +${P5ARCH}/auto/nginx/nginx.so
> ${P5ARCH}/nginx.pm
> -${P5ARCH}/nginx.so
> @cwd /var/www/modules
> ngx_http_perl_module.so


--
andrew - http://afresh1.com

Computer analyst to programmer:
"You start coding. I'll go find out what they want."