libproc-ng: fix ld version script file support

Notice that contents of file library.map file are almost certainly
wrong as it is making everything exported.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/proc/Makefile.am b/proc/Makefile.am
index 391ac2b035520ebed2319896c18a62ed7844a91a..392806fcc7e2424f9640d87c4cc2ded1dbe33f80 100644 (file)
--- a/proc/Makefile.am
+++ b/proc/Makefile.am
@@ -4,7 +4,12 @@ lib_LTLIBRARIES = libproc-ng.la
 
 libproc_ng_ladir = $(ladir)
 libproc_ng_la_LIBADD = $(LIB_KPARTS)
-libproc_ng_la_LDFLAGS = $(all_libraries) -release $(PACKAGE_VERSION) -no-undefined
+libproc_ng_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       $(all_libraries) \
+       -release $(PACKAGE_VERSION) \
+       -no-undefined \
+       -Wl,--version-script=$(top_srcdir)/proc/library.map
 
 libproc_ng_la_SOURCES = \
        alloc.c \

diff --git a/proc/library.map b/proc/library.map
index 199b9ac82f93010117e42560ad4d037a59f91ab6..f5b96c8321d33416938487b9da40ec3471334577 100644 (file)
--- a/proc/library.map
+++ b/proc/library.map
@@ -1,24 +1,76 @@
-# for --version-script
-# WTF is the syntax for this file?
-# Give me a BNF, man!
-_3_2_5 {
+LIBPROC_NG_3_3_0 {
 global:
-  __cyg_profile_func_enter; __cyg_profile_func_exit; main;
-
-  readproc; readtask; readproctab; readproctab2; look_up_our_self; escape_command;
-  escape_str; escape_strlist; escaped_copy; read_cmdline;
-  openproc; closeproc; freeproc; readeither; readproctab3;
-  tty_to_dev; dev_to_tty; open_psdb_message; open_psdb; lookup_wchan;
-  display_version; procps_version; linux_version_code;
-  Hertz; smp_num_cpus; have_privs; getbtime;
-  sprint_uptime; uptime; user_from_uid; print_uptime; loadavg;
-  pretty_print_signals; print_given_signals; unix_print_signals; signal_name_to_number; signal_number_to_name;
-  cpuinfo; meminfo; vminfo; getstat; getdiskstat; getpartitions_num; getslabinfo; get_pid_digits;
-  kb_active; kb_inactive; kb_main_buffers; kb_main_cached;
-  kb_main_free; kb_main_total; kb_main_used; kb_swap_free;
-  kb_swap_total; kb_swap_used; kb_main_shared;
-  kb_low_total; kb_low_free; kb_high_total; kb_high_free;
-  vm_pgpgin; vm_pgpgout; vm_pswpin; vm_pswpout;
-  free_slabinfo; put_slabinfo; get_slabinfo; get_proc_stats;
-local: *;
+       Hertz;
+       __cyg_profile_func_enter;
+       __cyg_profile_func_exit;
+       closeproc;
+       cpuinfo;
+       dev_to_tty;
+       display_version;
+       escape_command;
+       escape_str;
+       escape_strlist;
+       escaped_copy;
+       free_slabinfo;
+       freeproc;
+       get_pid_digits;
+       get_proc_stats;
+       get_slabinfo;
+       getbtime;
+       getdiskstat;
+       getpartitions_num;
+       getslabinfo;
+       getstat;
+       have_privs;
+       kb_active;
+       kb_high_free;
+       kb_high_total;
+       kb_inactive;
+       kb_low_free;
+       kb_low_total;
+       kb_main_buffers;
+       kb_main_cached;
+       kb_main_free;
+       kb_main_shared;
+       kb_main_total;
+       kb_main_used;
+       kb_swap_free;
+       kb_swap_total;
+       kb_swap_used;
+       linux_version_code;
+       loadavg;
+       look_up_our_self;
+       lookup_wchan;
+       main;
+       meminfo;
+       open_psdb;
+       open_psdb_message;
+       openproc;
+       pretty_print_signals;
+       print_given_signals;
+       print_uptime;
+       procps_version;
+       put_slabinfo;
+       read_cmdline;
+       readeither;
+       readproc;
+       readproctab2;
+       readproctab3;
+       readproctab;
+       readtask;
+       signal_name_to_number;
+       signal_number_to_name;
+       smp_num_cpus;
+       sprint_uptime;
+       tty_to_dev;
+       unix_print_signals;
+       uptime;
+       user_from_uid;
+       vm_pgpgin;
+       vm_pgpgout;
+       vm_pswpin;
+       vm_pswpout;
+       vminfo;
+local:
+       *;
 };