diff options
| author | Xin LI <delphij@FreeBSD.org> | 2015-05-12 05:42:13 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2015-05-12 05:42:13 +0000 |
| commit | 0a23444a57b962959c35d5f9035105f0dc4e1bcd (patch) | |
| tree | da659d68e464806e3cf4f9e24dff90ab07038ee3 /lib/liblzma | |
| parent | 1c27e6c39f40e8c314e4699549eebb97caef6819 (diff) | |
| download | src-test-0a23444a57b962959c35d5f9035105f0dc4e1bcd.tar.gz src-test-0a23444a57b962959c35d5f9035105f0dc4e1bcd.zip | |
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
Notes
Notes:
svn path=/head/; revision=282808
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 9c4b1d8abcc5f..39b929fd1f800 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 f49f29f24987c..c2976253b9798 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 44bc02c45b245..1d0f0bc7a6920 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 */ |