aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2010-05-14 20:40:37 +0000
committerXin LI <delphij@FreeBSD.org>2010-05-14 20:40:37 +0000
commit881bfb7497c5f8f756a853f50088893904e502e0 (patch)
tree47d8d0e72ce9eca8c018c13816529f46560edc9f
parentd6d81b7386537a6117c5bb01c6ba04d34d738d51 (diff)
downloadsrc-881bfb7497c5f8f756a853f50088893904e502e0.tar.gz
src-881bfb7497c5f8f756a853f50088893904e502e0.zip
- Add versioned symbols to liblzma
- Use default SHLIB_MAJOR. Approved by: mm X-MFC with: lzma library MFC
Notes
Notes: svn path=/head/; revision=208099
-rw-r--r--ObsoleteFiles.inc5
-rw-r--r--lib/liblzma/Makefile8
-rw-r--r--lib/liblzma/Symbol.map189
-rw-r--r--lib/liblzma/Versions.def9
4 files changed, 209 insertions, 2 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index fd0cbf7545d8..0144ea52ed74 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -14,6 +14,11 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20100514: library version bump for versioned symbols for liblzma
+OLD_LIBS+=usr/lib/liblzma.so.0
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/liblzma.so.0
+.endif
# 20100511: move GCC-specific headers to /usr/include/gcc
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
OLD_FILES+=usr/include/emmintrin.h
diff --git a/lib/liblzma/Makefile b/lib/liblzma/Makefile
index b68244f1d209..f84ac9376a30 100644
--- a/lib/liblzma/Makefile
+++ b/lib/liblzma/Makefile
@@ -1,7 +1,6 @@
# $FreeBSD$
-LIB= lzma
-SHLIB_MAJOR= 0
+LIB= lzma
LZMADIR= ${.CURDIR}/../../contrib/xz/src/liblzma
.PATH: ${LZMADIR}/../common
@@ -122,6 +121,7 @@ SRCS+= simple_coder.c \
WARNS?= 3
CFLAGS+= -DHAVE_CONFIG_H \
+ -DTUKLIB_SYMBOL_PREFIX=lzma_ \
-I${.CURDIR} \
-I${LZMADIR}/api \
-I${LZMADIR}/common \
@@ -134,4 +134,8 @@ CFLAGS+= -DHAVE_CONFIG_H \
-I${LZMADIR}/simple \
-I${LZMADIR}/../common
+VERSION_DEF= ${.CURDIR}/Versions.def
+SYMBOL_MAPS= ${.CURDIR}/Symbol.map
+CFLAGS+= -DSYMBOL_VERSIONING
+
.include <bsd.lib.mk>
diff --git a/lib/liblzma/Symbol.map b/lib/liblzma/Symbol.map
new file mode 100644
index 000000000000..efefffdf2f49
--- /dev/null
+++ b/lib/liblzma/Symbol.map
@@ -0,0 +1,189 @@
+/*
+ * $FreeBSD$
+ */
+
+XZ_5.0 {
+ lzma_alone_decoder;
+ lzma_alone_encoder;
+ lzma_auto_decoder;
+ lzma_block_buffer_bound;
+ lzma_block_buffer_decode;
+ lzma_block_buffer_encode;
+ lzma_block_compressed_size;
+ lzma_block_decoder;
+ lzma_block_encoder;
+ lzma_block_header_decode;
+ lzma_block_header_encode;
+ lzma_block_header_size;
+ lzma_block_total_size;
+ lzma_block_unpadded_size;
+ lzma_check_is_supported;
+ lzma_check_size;
+ lzma_code;
+ lzma_crc32;
+ lzma_crc64;
+ lzma_easy_buffer_encode;
+ lzma_easy_decoder_memusage;
+ lzma_easy_encoder;
+ lzma_easy_encoder_memusage;
+ lzma_end;
+ lzma_filter_decoder_is_supported;
+ lzma_filter_encoder_is_supported;
+ lzma_filter_flags_decode;
+ lzma_filter_flags_encode;
+ lzma_filter_flags_size;
+ lzma_filters_copy;
+ lzma_filters_update;
+ lzma_get_check;
+ lzma_index_append;
+ lzma_index_block_count;
+ lzma_index_buffer_decode;
+ lzma_index_buffer_encode;
+ lzma_index_cat;
+ lzma_index_checks;
+ lzma_index_decoder;
+ lzma_index_dup;
+ lzma_index_encoder;
+ lzma_index_end;
+ lzma_index_file_size;
+ lzma_index_hash_append;
+ lzma_index_hash_decode;
+ lzma_index_hash_end;
+ lzma_index_hash_init;
+ lzma_index_hash_size;
+ lzma_index_init;
+ lzma_index_iter_init;
+ lzma_index_iter_locate;
+ lzma_index_iter_next;
+ lzma_index_iter_rewind;
+ lzma_index_memusage;
+ lzma_index_memused;
+ lzma_index_size;
+ lzma_index_stream_count;
+ lzma_index_stream_flags;
+ lzma_index_stream_padding;
+ lzma_index_stream_size;
+ lzma_index_total_size;
+ lzma_index_uncompressed_size;
+ lzma_lzma_preset;
+ lzma_memlimit_get;
+ lzma_memlimit_set;
+ lzma_memusage;
+ lzma_mf_is_supported;
+ lzma_mode_is_supported;
+ lzma_physmem;
+ lzma_properties_decode;
+ lzma_properties_encode;
+ lzma_properties_size;
+ lzma_raw_buffer_decode;
+ lzma_raw_buffer_encode;
+ lzma_raw_decoder;
+ lzma_raw_decoder_memusage;
+ lzma_raw_encoder;
+ lzma_raw_encoder_memusage;
+ lzma_stream_buffer_bound;
+ lzma_stream_buffer_decode;
+ lzma_stream_buffer_encode;
+ lzma_stream_decoder;
+ lzma_stream_encoder;
+ lzma_stream_flags_compare;
+ lzma_stream_footer_decode;
+ lzma_stream_footer_encode;
+ lzma_stream_header_decode;
+ lzma_stream_header_encode;
+ lzma_version_number;
+ lzma_version_string;
+ lzma_vli_decode;
+ lzma_vli_encode;
+ lzma_vli_size;
+};
+
+XZprivate_1.0 {
+ lzma_alloc;
+ lzma_alone_decoder_init;
+ lzma_block_decoder_init;
+ lzma_block_encoder_init;
+ lzma_bufcpy;
+ lzma_check_finish;
+ lzma_check_init;
+ lzma_check_update;
+ lzma_chunk_size;
+ lzma_delta_coder_init;
+ lzma_delta_coder_memusage;
+ lzma_delta_decoder_init;
+ lzma_delta_encoder_init;
+ lzma_delta_props_decode;
+ lzma_delta_props_encode;
+ lzma_easy_preset;
+ lzma_free;
+ lzma_index_encoder_init;
+ lzma_index_padding_size;
+ lzma_index_prealloc;
+ lzma_lz_decoder_init;
+ lzma_lz_decoder_memusage;
+ lzma_lz_decoder_uncompressed;
+ lzma_lz_encoder_init;
+ lzma_lz_encoder_memusage;
+ lzma_lzma2_decoder_init;
+ lzma_lzma2_decoder_memusage;
+ lzma_lzma2_encoder_init;
+ lzma_lzma2_encoder_memusage;
+ lzma_lzma2_props_decode;
+ lzma_lzma2_props_encode;
+ lzma_lzma_decoder_create;
+ lzma_lzma_decoder_init;
+ lzma_lzma_decoder_memusage;
+ lzma_lzma_decoder_memusage_nocheck;
+ lzma_lzma_encode;
+ lzma_lzma_encoder_create;
+ lzma_lzma_encoder_init;
+ lzma_lzma_encoder_memusage;
+ lzma_lzma_encoder_reset;
+ lzma_lzma_lclppb_decode;
+ lzma_lzma_lclppb_encode;
+ lzma_lzma_optimum_fast;
+ lzma_lzma_optimum_normal;
+ lzma_lzma_props_decode;
+ lzma_lzma_props_encode;
+ lzma_mf_bt2_find;
+ lzma_mf_bt2_skip;
+ lzma_mf_bt3_find;
+ lzma_mf_bt3_skip;
+ lzma_mf_bt4_find;
+ lzma_mf_bt4_skip;
+ lzma_mf_find;
+ lzma_mf_hc3_find;
+ lzma_mf_hc3_skip;
+ lzma_mf_hc4_find;
+ lzma_mf_hc4_skip;
+ lzma_next_end;
+ lzma_next_filter_init;
+ lzma_next_filter_update;
+ lzma_raw_coder_init;
+ 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;
+ lzma_simple_armthumb_encoder_init;
+ lzma_simple_coder_init;
+ lzma_simple_ia64_decoder_init;
+ lzma_simple_ia64_encoder_init;
+ lzma_simple_powerpc_decoder_init;
+ lzma_simple_powerpc_encoder_init;
+ lzma_simple_props_decode;
+ lzma_simple_props_encode;
+ lzma_simple_props_size;
+ lzma_simple_sparc_decoder_init;
+ lzma_simple_sparc_encoder_init;
+ lzma_simple_x86_decoder_init;
+ lzma_simple_x86_encoder_init;
+ lzma_stream_decoder_init;
+ lzma_stream_encoder_init;
+ lzma_strm_init;
+ lzma_tuklib_physmem;
+};
diff --git a/lib/liblzma/Versions.def b/lib/liblzma/Versions.def
new file mode 100644
index 000000000000..1f656704e4fb
--- /dev/null
+++ b/lib/liblzma/Versions.def
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+XZ_5.0 {
+};
+
+
+XZprivate_1.0 {
+} XZ_5.0;
+