From adc9f78cfcfbeedeb8577da2fa2834daeb99c0b1 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 20 Nov 2014 14:01:03 +0100 Subject: build-sys: cleanup library symbol files Signed-off-by: Karel Zak --- libuuid/src/Makemodule.am | 6 +++--- libuuid/src/libuuid.sym | 48 +++++++++++++++++++++++++++++++++++++++++++++++ libuuid/src/uuid.sym | 46 --------------------------------------------- 3 files changed, 51 insertions(+), 49 deletions(-) create mode 100644 libuuid/src/libuuid.sym delete mode 100644 libuuid/src/uuid.sym (limited to 'libuuid') diff --git a/libuuid/src/Makemodule.am b/libuuid/src/Makemodule.am index a5fd561cf..061aff21d 100644 --- a/libuuid/src/Makemodule.am +++ b/libuuid/src/Makemodule.am @@ -27,7 +27,7 @@ libuuid_la_SOURCES = \ $(uuidinc_HEADERS) \ lib/randutils.c -libuuid_la_DEPENDENCIES = libuuid/src/uuid.sym +libuuid_la_DEPENDENCIES = libuuid/src/libuuid.sym libuuid_la_LIBADD = $(SOCKET_LIBS) libuuid_la_CFLAGS = \ @@ -37,10 +37,10 @@ libuuid_la_CFLAGS = \ libuuid_la_LDFLAGS = \ $(SOLIB_LDFLAGS) \ - -Wl,--version-script=$(top_srcdir)/libuuid/src/uuid.sym \ + -Wl,--version-script=$(top_srcdir)/libuuid/src/libuuid.sym \ -version-info $(LIBUUID_VERSION_INFO) -EXTRA_DIST += libuuid/src/uuid.sym +EXTRA_DIST += libuuid/src/libuuid.sym # move lib from $(usrlib_execdir) to $(libdir) if needed install-exec-hook-libuuid: diff --git a/libuuid/src/libuuid.sym b/libuuid/src/libuuid.sym new file mode 100644 index 000000000..28a207684 --- /dev/null +++ b/libuuid/src/libuuid.sym @@ -0,0 +1,48 @@ +/* + * The symbol versioning ensures that a new application requiring symbol 'foo' + * can't run with old libbrary.so not providing 'foo' - the global SONAME + * version info can't enforce this since we never change the SONAME. + * + * The original libuuid from e2fsprogs (<=1.41.5) does not to use + * symbol versioning -- all the original symbols are in UUID_1.0 now. + * + * Copyright (C) 2011-2014 Karel Zak + */ +UUID_1.0 { +global: + uuid_clear; + uuid_compare; + uuid_copy; + uuid_generate; + uuid_generate_random; + uuid_generate_time; + uuid_is_null; + uuid_parse; + uuid_unparse; + uuid_unparse_lower; + uuid_unparse_upper; + uuid_time; + uuid_type; + uuid_variant; +}; + +/* + * version(s) since util-linux 2.20 + */ +UUID_2.20 { +global: + uuid_generate_time_safe; +} UUID_1.0; + + +/* + * __uuid_* this is not part of the official API, this is + * uuidd (uuid daemon) specific stuff. Hell. + */ +UUIDD_PRIVATE { +global: + __uuid_generate_time; + __uuid_generate_random; +local: + *; +}; diff --git a/libuuid/src/uuid.sym b/libuuid/src/uuid.sym deleted file mode 100644 index 2cad51bc6..000000000 --- a/libuuid/src/uuid.sym +++ /dev/null @@ -1,46 +0,0 @@ -/* - * The symbol versioning ensures that a new application requiring symbol foo() - * can't run with old libuuid.so not providing foo() - the global SONAME - * version info can't enforce this since we never change the SONAME. - * - * The original libuuid from e2fsprogs (<=1.41.5) does not to use - * symbol versioning -- all the original symbols are in UUID_1.0 now. - */ -UUID_1.0 { -global: - uuid_clear; - uuid_compare; - uuid_copy; - uuid_generate; - uuid_generate_random; - uuid_generate_time; - uuid_is_null; - uuid_parse; - uuid_unparse; - uuid_unparse_lower; - uuid_unparse_upper; - uuid_time; - uuid_type; - uuid_variant; -}; - -/* - * version(s) since util-linux 2.20 - */ -UUID_2.20 { -global: - uuid_generate_time_safe; -} UUID_1.0; - - -/* - * __uuid_* this is not part of the official API, this is - * uuidd (uuid daemon) specific stuff. Hell. - */ -UUIDD_PRIVATE { -global: - __uuid_generate_time; - __uuid_generate_random; -local: - *; -}; -- cgit v1.2.3-55-g7522