On 5/11/2015 7:53 PM, Xin Li wrote: > On 05/11/15 17:23, Bryan Drewery wrote: >> The libmd changes break pkg - so all packages. > >> http://beefy6.nyi.freebsd.org/data/head-amd64-default/p386108_s282785/ > logs/pkg-1.5.2.log > > > >>> CCLD pkg-static /usr/lib/liblzma.a(check.o): In function >>> `lzma_check_init': >>> /usr/local/poudriere/jails/head-amd64/usr/src/lib/liblzma/../../contr > ib/xz/src/liblzma/check/check.c:(.text+0x5e): >>> undefined reference to `_libmd_SHA256_Init' >>> /usr/lib/liblzma.a(check.o): In function `lzma_check_update': >>> /usr/local/poudriere/jails/head-amd64/usr/src/lib/liblzma/../../contr > ib/xz/src/liblzma/check/check.c:(.text+0xbf): >>> undefined reference to `_libmd_SHA256_Update' >>> /usr/lib/liblzma.a(check.o): In function `lzma_check_finish': >>> /usr/local/poudriere/jails/head-amd64/usr/src/lib/liblzma/../../contr > ib/xz/src/liblzma/check/check.c:(.text+0x10d): >>> undefined reference to `_libmd_SHA256_Final' cc: error: linker >>> command failed with exit code 1 (use -v to see invocation) *** >>> [pkg-static] Error code 1 > > >> Can you please just revert this and 282726 until they are working >> and have a passing exp-run? > > Looks like this is because my change (r282775) which makes libmd a > dependency of liblzma, while pkg didn't catch up with, and it's > unrelated to libmd change. > > A quick hack would be: > > --- src/Makefile.in.orig 2015-05-11 17:49:52.690333554 -0700 > +++ src/Makefile.in 2015-05-11 17:50:03.427853585 -0700 > @@ -617,7 +617,7 @@ > $(top_builddir)/compat/libbsd_compat.la \ > $(top_builddir)/external/libsbuf_static.la $(pkg_OBJECTS) \ > @LIBJAIL_LIB@ @LDNS_LIBS@ @OS_LIBS@ -larchive -lz -lutil -lbz2 \ > - -llzma -lssl -lcrypto -lm $(am__append_1) $(am__append_2) \ > + -lmd -llzma -lssl -lcrypto -lm $(am__append_1) $(am__append_2) \ > $(am__append_3) > DYNPROG = pkg > @BUILD_STATIC_TRUE@pkg_static_LDFLAGS = -all-static > > But it would break earlier FreeBSD. Should I revert my change and > request for a exp-run?
Please. -- Regards, Bryan Drewery
signature.asc
Description: OpenPGP digital signature
