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
1=== modified file 'configure.ac'
2--- configure.ac 2011-03-15 19:15:23 +0000
3+++ configure.ac 2011-06-13 20:46:47 +0000
4@@ -9,7 +9,8 @@
5 AC_CONFIG_AUX_DIR([config-aux])
6
7 # Initialize Automake
8-AM_INIT_AUTOMAKE([foreign dist-bzip2])
9+AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2])
10+AM_SILENT_RULES([yes])
11 AM_MAINTAINER_MODE
12
13 LIB_VERSION=2:0:1
14
15=== modified file 'src/Makefile.am'
16--- src/Makefile.am 2011-02-15 14:01:51 +0000
17+++ src/Makefile.am 2011-06-13 20:46:47 +0000
18@@ -1,7 +1,12 @@
19+
20+version_script = $(srcdir)/libutouch-frame.ver
21+
22 lib_LTLIBRARIES = libutouch-frame.la
23
24 libutouch_frame_la_LDFLAGS = \
25 -version-info @LIB_VERSION@ \
26+ -Wl,-z,defs -Wl,--as-needed \
27+ -Wl,--version-script=$(version_script) \
28 -lm \
29 $(EVEMU_LIBS) \
30 $(MTDEV_LIBS)
31@@ -27,3 +32,6 @@
32 libutouch_frameinclude_HEADERS += $(top_srcdir)/include/utouch/frame-xi2.h
33
34 endif
35+
36+EXTRA_DIST = $(version_script)
37+
38
39=== added file 'src/libutouch-frame.ver'
40--- src/libutouch-frame.ver 1970-01-01 00:00:00 +0000
41+++ src/libutouch-frame.ver 2011-06-13 20:46:47 +0000
42@@ -0,0 +1,19 @@
43+UTOUCH_FRAME_1.1 {
44+ global:
45+ utouch_frame_configure_xi2;
46+ utouch_frame_delete_engine;
47+ utouch_frame_get_current_slot;
48+ utouch_frame_get_num_frames;
49+ utouch_frame_get_num_slots;
50+ utouch_frame_get_surface;
51+ utouch_frame_get_version;
52+ utouch_frame_init_mtdev;
53+ utouch_frame_init_xi2;
54+ utouch_frame_is_supported_mtdev;
55+ utouch_frame_new_engine_raw;
56+ utouch_frame_pump_mtdev;
57+
58+ local:
59+ *;
60+};
61+

Subscribers

People subscribed via source and target branches