svn commit: r282736 - in head: . lib/libmd

[Xin Li]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

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 at pkg_static_LDFLAGS = -all-static

But it would break earlier FreeBSD.  Should I revert my change and
request for a exp-run?

Cheers,
- -- 
Xin LI <delphij at delphij.net>    https://www.delphij.net/
FreeBSD - The Power to Serve!           Live free or die
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1.2 (FreeBSD)

iQIcBAEBCgAGBQJVUU76AAoJEJW2GBstM+nsg2cP/i/t3SB59mnwdoqQi72KQNA0
z+N4FGufh0ULnsOTtkW5M+iUhTLqPk64NHYlQd7MlqQEle5UZgmKj8db35j/UJjL
r1b+ERwOIgg8415umMPUVnexwwwOngxGIcaa7moE1HTKz2SCuC1NAypuXmhqyQ9p
It49A9MKhkNKt9sVbV2vfm8R6UA2T9suwjOxvyEpf0fihdp2XcbNZ3raL6yPTNoN
O/nxeWL4O2UQju17nKKMsTLBqWeJCGrY1htwyvpR8kDi53UDAeyZUF3MOnj9jIa7
L4RJg38hjZlctV5UzOlz1ThbOCI4hsz9jaIEsN/OCAWsh+RLHTIA21w09KT8mnkn
Ch8ARY0na9sWOLxbYgF2uqK/Y4Cv64P0W33Smd9WtqlX84FY+sm/FjEbAglmCD0d
KhTBNYEL/I+Rn3fe9VfUHWAiW5QTT6CHGKdDcKpI63hFjrp2MoNmB18vRop/IQ/9
RihTuVaF25XOnbbW/K8L9yajZos0Mkrvz75nnmr5dG3uJljbPN0o3nzNAXqKa20c
q8ld2cGrCs4WjJtJfLmdtTSN1kbeY74pTseq+DlIixlaDOcec7phY/qDRXrjCvy1
K5Upi2fUhYScuGzmz3MEP+SmtOn+2juPO+hWIXd3iP9Vtin3VYw8pUWttQsqWYvh
XP2zfiUjGOMNs4kx1BMD
=rz9u
-----END PGP SIGNATURE-----