Re: CVS commit: pkgsrc/pkgtools/pkg_install

[Jonathan Perkin <jperkin%joyent.com@localhost>]

* On 2020-05-04 at 20:15 BST, Alistair G. Crooks wrote:

> Module Name:  pkgsrc
> Committed By: agc
> Date:         Mon May  4 19:14:59 UTC 2020
> 
> Modified Files:
>       pkgsrc/pkgtools/pkg_install: Makefile
> 
> Log Message:
> libnetpgpverify now uses its own protected symbols, update build process to
> account for this.
> 
> -     cd ${WRKDIR}/netpgp &&                                  \
> -     ${SED} -e '/zlib/d' Makefile.lib.in >Makefile.in &&             \
> -     ${RM} -f bzlib.h zlib.h &&                                      \
> +     cd ${WRKDIR}/netpgp &&                                          \

Hey Al,

I don't think this is correct - it's removing the part that ensures we
are using the library Makefile.  My bulk builds are still failing the
bootstrap, but now because they can't find libnetpgpverify:

  --- pkg_add ---
  cc -L/tmp/pkgsrc-el6-trunk-x86_64/wrk/pkgtools/pkg_install/work/bzip2 -L/tmp/pkgsrc-el6-trunk-x86_64/wrk/pkgtools/pkg_install/work/zlib 
-L/tmp/pkgsrc-el6-trunk-x86_64/wrk/pkgtools/pkg_install/work/libarchive/.libs -L/tmp/pkgsrc-el6-trunk-x86_64/wrk/pkgtools/pkg_install/work/libfetch 
-L/tmp/pkgsrc-el6-trunk-x86_64/wrk/pkgtools/pkg_install/work/netpgp -L/tmp/pkgsrc-el6-trunk-x86_64/wrk/pkgtools/pkg_install/work/libnbcompat -Wl,-R/usr/pkg/lib -L../lib -o pkg_add main.o perform.o 
-linstall -lnetpgpverify -larchive -lbz2 -lz -lfetch -lbz2 -lz -lnbcompat -lnbcompat
  /usr/bin/ld: cannot find -lnetpgpverify
  collect2: ld returned 1 exit status
  *** [pkg_add] Error code 1

If I look earlier in the log I find this:

  cc b64.o bignum.o bufgap.o digest.o libverify.o main.o misc.o pgpsum.o rsa.o bzlib.o zlib.o sha1.o sha2.o md5c.o rmd160.o -o netpgpverify

but nothing that creates the library.

Sorry, it's getting late here so I'm out of time to test, but I think
just copying Makefile.lib.in to Makefile.in should now suffice.

Thanks,

-- 
Jonathan Perkin  -  Joyent, Inc.  -  www.joyent.com