Date: Tue, 12 May 2015 10:05:37 +0200 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Xin LI <delphij@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r282808 - head/lib/liblzma Message-ID: <20150512080537.GB46991@ivaldir.etoilebsd.net> In-Reply-To: <201505120542.t4C5gDFX038841@svn.freebsd.org> References: <201505120542.t4C5gDFX038841@svn.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Tue, May 12, 2015 at 05:42:13AM +0000, Xin LI wrote: > Author: delphij > Date: Tue May 12 05:42:13 2015 > New Revision: 282808 > URL: https://svnweb.freebsd.org/changeset/base/282808 > > Log: > Revert r282775 for now. The added dependency would cause problems for > e.g. ports-mgmt/pkg and we would like to do an exp-build. > > Requested by: bdrewery > > Modified: > head/lib/liblzma/Makefile > head/lib/liblzma/Symbol.map > head/lib/liblzma/config.h > > Modified: head/lib/liblzma/Makefile > ============================================================================== > --- head/lib/liblzma/Makefile Tue May 12 03:49:18 2015 (r282807) > +++ head/lib/liblzma/Makefile Tue May 12 05:42:13 2015 (r282808) > @@ -77,7 +77,8 @@ SRCS+= common.c \ > .PATH: ${LZMADIR}/check > SRCS+= check.c \ > crc32_table.c \ > - crc64_table.c > + crc64_table.c \ > + sha256.c > .if defined(MACHINE_ARCH) && ${MACHINE_ARCH} == "i386" > SRCS+= crc32_x86.S \ > crc64_x86.S > @@ -145,7 +146,7 @@ CFLAGS+= -DHAVE_CONFIG_H \ > -I${LZMADIR}/simple \ > -I${LZMADIR}/../common > > -LIBADD+= md pthread > +LIBADD+= pthread If you are on doing that you should at least modify as well the lzma .pc file to that anything asking for pkg-config --libs will provide -lmd, should be the Libs.private field Also note that this will not solve the pkg case :) Best regards, Bapt [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlVRtFEACgkQ8kTtMUmk6ExEEwCfedNJCCWhciar0QrT0uXRQmip v9QAoItF3x1H6w+YfBl1PL+5qZVgz5jA =ROjj -----END PGP SIGNATURE-----help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150512080537.GB46991>