diff options
| author | delphij <delphij@FreeBSD.org> | 2015-05-12 05:42:13 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2015-05-12 05:42:13 +0000 |
| commit | efbed6b3363f1c6079bb5f43186e16b9cb631bec (patch) | |
| tree | da659d68e464806e3cf4f9e24dff90ab07038ee3 /lib/liblzma | |
| parent | b1e416de1486f860f6e82e76d2759a2c2d2c55c9 (diff) | |
| download | FreeBSD-src-efbed6b3363f1c6079bb5f43186e16b9cb631bec.zip FreeBSD-src-efbed6b3363f1c6079bb5f43186e16b9cb631bec.tar.gz | |
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
Diffstat (limited to 'lib/liblzma')
| -rw-r--r-- | lib/liblzma/Makefile | 5 | ||||
| -rw-r--r-- | lib/liblzma/Symbol.map | 3 | ||||
| -rw-r--r-- | lib/liblzma/config.h | 9 |
3 files changed, 12 insertions, 5 deletions
diff --git a/lib/liblzma/Makefile b/lib/liblzma/Makefile index 9c4b1d8..39b929f 100644 --- a/lib/liblzma/Makefile +++ b/lib/liblzma/Makefile @@ -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 VERSION_DEF= ${.CURDIR}/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map diff --git a/lib/liblzma/Symbol.map b/lib/liblzma/Symbol.map index f49f29f..c297625 100644 --- a/lib/liblzma/Symbol.map +++ b/lib/liblzma/Symbol.map @@ -180,6 +180,9 @@ XZprivate_1.0 { lzma_raw_coder_memusage; lzma_raw_decoder_init; lzma_raw_encoder_init; + lzma_sha256_finish; + lzma_sha256_init; + lzma_sha256_update; lzma_simple_arm_decoder_init; lzma_simple_arm_encoder_init; lzma_simple_armthumb_decoder_init; diff --git a/lib/liblzma/config.h b/lib/liblzma/config.h index 44bc02c..1d0f0bc 100644 --- a/lib/liblzma/config.h +++ b/lib/liblzma/config.h @@ -203,13 +203,16 @@ /* #undef HAVE_SHA256INIT */ /* Define to 1 if the system has the type `SHA256_CTX'. */ -#define HAVE_SHA256_CTX 1 +/* FreeBSD - disabled libmd SHA256 for now */ +/* #undef HAVE_SHA256_CTX */ /* Define to 1 if you have the <sha256.h> header file. */ -#define HAVE_SHA256_H 1 +/* FreeBSD - disabled libmd SHA256 for now */ +/* #undef HAVE_SHA256_H */ /* Define to 1 if you have the `SHA256_Init' function. */ -#define HAVE_SHA256_INIT 1 +/* FreeBSD - disabled libmd SHA256 for now */ +/* #undef HAVE_SHA256_INIT */ /* Define to 1 if the system has the type `SHA2_CTX'. */ /* #undef HAVE_SHA2_CTX */ |
