Merge lp:~bregma/frame/add-elf-symbol-versioning into lp:frame

Proposed by Stephen M. Webb
Status: Merged
Merged at revision: 37
Proposed branch: lp:~bregma/frame/add-elf-symbol-versioning
Merge into: lp:frame
Diff against target: 61 lines (+29/-1)
3 files modified
configure.ac (+2/-1)
src/Makefile.am (+8/-0)
src/libutouch-frame.ver (+19/-0)
To merge this branch: bzr merge lp:~bregma/frame/add-elf-symbol-versioning
Reviewer Review Type Date Requested Status
Chase Douglas (community) Approve
Review via email: mp+64458@code.launchpad.net

Description of the change

Adds ELF symbol verisoning.

To post a comment you must log in.
Revision history for this message
Chase Douglas (chasedouglas) wrote :

Looks good to me!

review: Approve
Revision history for this message
Jussi Pakkanen (jpakkane) wrote :

Looks ok. Is there an actual need for this or is this added just for completeness?

Revision history for this message
Chase Douglas (chasedouglas) wrote :

Mostly for completeness, but it's best to add it before you need it :).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'configure.ac'
--- configure.ac 2011-03-15 19:15:23 +0000
+++ configure.ac 2011-06-13 20:46:47 +0000
@@ -9,7 +9,8 @@
9AC_CONFIG_AUX_DIR([config-aux])9AC_CONFIG_AUX_DIR([config-aux])
1010
11# Initialize Automake11# Initialize Automake
12AM_INIT_AUTOMAKE([foreign dist-bzip2])12AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2])
13AM_SILENT_RULES([yes])
13AM_MAINTAINER_MODE14AM_MAINTAINER_MODE
1415
15LIB_VERSION=2:0:116LIB_VERSION=2:0:1
1617
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2011-02-15 14:01:51 +0000
+++ src/Makefile.am 2011-06-13 20:46:47 +0000
@@ -1,7 +1,12 @@
1
2version_script = $(srcdir)/libutouch-frame.ver
3
1lib_LTLIBRARIES = libutouch-frame.la4lib_LTLIBRARIES = libutouch-frame.la
25
3libutouch_frame_la_LDFLAGS = \6libutouch_frame_la_LDFLAGS = \
4 -version-info @LIB_VERSION@ \7 -version-info @LIB_VERSION@ \
8 -Wl,-z,defs -Wl,--as-needed \
9 -Wl,--version-script=$(version_script) \
5 -lm \10 -lm \
6 $(EVEMU_LIBS) \11 $(EVEMU_LIBS) \
7 $(MTDEV_LIBS)12 $(MTDEV_LIBS)
@@ -27,3 +32,6 @@
27libutouch_frameinclude_HEADERS += $(top_srcdir)/include/utouch/frame-xi2.h32libutouch_frameinclude_HEADERS += $(top_srcdir)/include/utouch/frame-xi2.h
2833
29endif34endif
35
36EXTRA_DIST = $(version_script)
37
3038
=== added file 'src/libutouch-frame.ver'
--- src/libutouch-frame.ver 1970-01-01 00:00:00 +0000
+++ src/libutouch-frame.ver 2011-06-13 20:46:47 +0000
@@ -0,0 +1,19 @@
1UTOUCH_FRAME_1.1 {
2 global:
3 utouch_frame_configure_xi2;
4 utouch_frame_delete_engine;
5 utouch_frame_get_current_slot;
6 utouch_frame_get_num_frames;
7 utouch_frame_get_num_slots;
8 utouch_frame_get_surface;
9 utouch_frame_get_version;
10 utouch_frame_init_mtdev;
11 utouch_frame_init_xi2;
12 utouch_frame_is_supported_mtdev;
13 utouch_frame_new_engine_raw;
14 utouch_frame_pump_mtdev;
15
16 local:
17 *;
18};
19

Subscribers

People subscribed via source and target branches