Attachment #214505 for bug #200142




.PATH: ${LZMADIR}/check
SRCS+=	check.c \
	crc32_table.c \
	crc64_table.c
	sha256.c
.if defined(MACHINE_ARCH) && ${MACHINE_ARCH} == "i386"
SRCS+=	crc32_x86.S \
	crc64_x86.S

		-I${LZMADIR}/simple \
		-I${LZMADIR:H}/common

LIBADD+=	md pthread

VERSION_DEF=	${.CURDIR}/Versions.def
SYMBOL_MAPS=	${.CURDIR}/Symbol.map


liblzma.pc: liblzma.pc.in
	sed -e 's,@prefix@,/usr,g ; \
		s,@exec_prefix@,/usr,g ; \
		s,@libdir@,/usr/lib,g ; \
		s,@includedir@,/usr/include,g ; \
		s,@LIBS@,-pthread -lmd,g ; \
		s,@PACKAGE_URL@,https://tukaani.org/xz/,g ; \
		s,@PACKAGE_VERSION@,${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH},g ; \
		s,@PTHREAD_CFLAGS@,,g ; \
		s,@PTHREAD_LIBS@,,g' ${.ALLSRC} > ${.TARGET}

Lines 180-188 Link Here

(-)lib/liblzma/Symbol.map (-3 lines)
180	lzma_raw_coder_memusage;	180	lzma_raw_coder_memusage;
181	lzma_raw_decoder_init;	181	lzma_raw_decoder_init;
182	lzma_raw_encoder_init;	182	lzma_raw_encoder_init;
183	lzma_sha256_finish;
184	lzma_sha256_init;
185	lzma_sha256_update;
186	lzma_simple_arm_decoder_init;	183	lzma_simple_arm_decoder_init;
187	lzma_simple_arm_encoder_init;	184	lzma_simple_arm_encoder_init;
188	lzma_simple_armthumb_decoder_init;	185	lzma_simple_armthumb_decoder_init;




/* #undef HAVE_SHA256INIT */

/* Define to 1 if the system has the type `SHA256_CTX'. */
#define HAVE_SHA256_CTX 1
/* #undef HAVE_SHA256_CTX */

/* Define to 1 if you have the <sha256.h> header file. */
#define HAVE_SHA256_H 1
/* #undef HAVE_SHA256_H */

/* Define to 1 if you have the `SHA256_Init' function. */
#define HAVE_SHA256_INIT 1
/* #undef HAVE_SHA256_INIT */

/* Define to 1 if the system has the type `SHA2_CTX'. */
/* #undef HAVE_SHA2_CTX */

Lines 350-356 Link Here

(-)share/mk/src.libnames.mk (-1 / +1 lines)
350	_DP_kafs5= asn1 krb5 roken	350	_DP_kafs5= asn1 krb5 roken
351	_DP_krb5+= asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc	351	_DP_krb5+= asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc
352	_DP_gssapi_krb5+= gssapi krb5 crypto roken asn1 com_err	352	_DP_gssapi_krb5+= gssapi krb5 crypto roken asn1 com_err
353	_DP_lzma= pthread	353	_DP_lzma= md pthread
354	_DP_ucl= m	354	_DP_ucl= m
355	_DP_vmmapi= util	355	_DP_vmmapi= util
356	_DP_opencsd= cxxrt	356	_DP_opencsd= cxxrt

Return to bug 200142

Lines 211-226 Link Here

(-)lib/liblzma/config.h (-6 / +3 lines)
211	/* #undef HAVE_SHA256INIT */	211	/* #undef HAVE_SHA256INIT */
212		212
213	/* Define to 1 if the system has the type `SHA256_CTX'. */	213	/* Define to 1 if the system has the type `SHA256_CTX'. */
214	/* FreeBSD - disabled libmd SHA256 for now */	214	#define HAVE_SHA256_CTX 1
215	/* #undef HAVE_SHA256_CTX */
216		215
217	/* Define to 1 if you have the <sha256.h> header file. */	216	/* Define to 1 if you have the <sha256.h> header file. */
218	/* FreeBSD - disabled libmd SHA256 for now */	217	#define HAVE_SHA256_H 1
219	/* #undef HAVE_SHA256_H */
220		218
221	/* Define to 1 if you have the `SHA256_Init' function. */	219	/* Define to 1 if you have the `SHA256_Init' function. */
222	/* FreeBSD - disabled libmd SHA256 for now */	220	#define HAVE_SHA256_INIT 1
223	/* #undef HAVE_SHA256_INIT */
224		221
225	/* Define to 1 if the system has the type `SHA2_CTX'. */	222	/* Define to 1 if the system has the type `SHA2_CTX'. */
226	/* #undef HAVE_SHA2_CTX */	223	/* #undef HAVE_SHA2_CTX */

Lines 78-85 Link Here

(-)lib/liblzma/Makefile (-5 / +5 lines)
78	.PATH: ${LZMADIR}/check	78	.PATH: ${LZMADIR}/check
79	SRCS+= check.c \	79	SRCS+= check.c \
80	crc32_table.c \	80	crc32_table.c \
81	crc64_table.c \	81	crc64_table.c
82	sha256.c
83	.if defined(MACHINE_ARCH) && ${MACHINE_ARCH} == "i386"	82	.if defined(MACHINE_ARCH) && ${MACHINE_ARCH} == "i386"
84	SRCS+= crc32_x86.S \	83	SRCS+= crc32_x86.S \
85	crc64_x86.S	84	crc64_x86.S
Lines 147-153 Link Here
147	-I${LZMADIR}/simple \	146	-I${LZMADIR}/simple \
148	-I${LZMADIR:H}/common	147	-I${LZMADIR:H}/common
149		148
150	LIBADD+= pthread	149	LIBADD+= md pthread
151		150
152	VERSION_DEF= ${.CURDIR}/Versions.def	151	VERSION_DEF= ${.CURDIR}/Versions.def
153	SYMBOL_MAPS= ${.CURDIR}/Symbol.map	152	SYMBOL_MAPS= ${.CURDIR}/Symbol.map
Lines 160-169 Link Here
160		159
161	liblzma.pc: liblzma.pc.in	160	liblzma.pc: liblzma.pc.in
162	sed -e 's,@prefix@,/usr,g ; \	161	sed -e 's,@prefix@,/usr,g ; \
163	s,@exec_prefix@,/usr,g ; \	162	s,@exec_prefix@,/usr,g ; \
164	s,@libdir@,/usr/lib,g ; \	163	s,@libdir@,/usr/lib,g ; \
165	s,@includedir@,/usr/include,g ; \	164	s,@includedir@,/usr/include,g ; \
166	s,@PACKAGE_URL@,http://tukaani.org/xz/,g ; \	165	s,@LIBS@,-pthread -lmd,g ; \
		166	s,@PACKAGE_URL@,https://tukaani.org/xz/,g ; \
167	s,@PACKAGE_VERSION@,${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH},g ; \	167	s,@PACKAGE_VERSION@,${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH},g ; \
168	s,@PTHREAD_CFLAGS@,,g ; \	168	s,@PTHREAD_CFLAGS@,,g ; \
169	s,@PTHREAD_LIBS@,,g' ${.ALLSRC} > ${.TARGET}	169	s,@PTHREAD_LIBS@,,g' ${.ALLSRC} > ${.TARGET}