mirror of
https://github.com/mdbtools/mdbtools.git
synced 2026-03-10 00:20:54 +08:00
Replace map files by -export-symbols-regex use
We had to support -export-symbols-regex anways And map file did not really support versions but only list which symbol to export. So this is more simple.
This commit is contained in:
25
configure.ac
25
configure.ac
@@ -87,31 +87,6 @@ if test "x$enable_as_needed" != "xno"; then
|
|||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl check whether ld supports --version-script
|
|
||||||
AC_ARG_ENABLE([ld-version-script],
|
|
||||||
AS_HELP_STRING([--disable-ld-version-script],
|
|
||||||
[Disable linker version script for libraries (default is to use linker version script if the linker supports it)]),
|
|
||||||
[enable_version_script=$enableval],
|
|
||||||
[enable_version_script=auto])
|
|
||||||
|
|
||||||
if test "$enable_version_script" = auto
|
|
||||||
then
|
|
||||||
AC_MSG_CHECKING([whether $LD supports --version-scripts.])
|
|
||||||
SAVED_LDFLAGS="$LDFLAGS"
|
|
||||||
LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
|
|
||||||
cat > conftest.map <<EOF
|
|
||||||
VERS_1 {
|
|
||||||
global: *;
|
|
||||||
};
|
|
||||||
EOF
|
|
||||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
|
|
||||||
[enable_version_script=yes; AC_MSG_RESULT([yes])],
|
|
||||||
[enable_version_script=no; AC_MSG_RESULT([no])])
|
|
||||||
LDFLAGS="$SAVED_LDFLAGS"
|
|
||||||
fi
|
|
||||||
|
|
||||||
AM_CONDITIONAL(VERSION_SCRIPT, test x$enable_version_script = xyes)
|
|
||||||
|
|
||||||
dnl check for iODBC
|
dnl check for iODBC
|
||||||
|
|
||||||
AC_ARG_WITH(iodbc,
|
AC_ARG_WITH(iodbc,
|
||||||
|
|||||||
@@ -1,10 +1,5 @@
|
|||||||
lib_LTLIBRARIES = libmdb.la
|
lib_LTLIBRARIES = libmdb.la
|
||||||
libmdb_la_SOURCES= catalog.c mem.c file.c table.c data.c dump.c backend.c money.c sargs.c index.c like.c write.c stats.c map.c props.c worktable.c options.c iconv.c
|
libmdb_la_SOURCES= catalog.c mem.c file.c table.c data.c dump.c backend.c money.c sargs.c index.c like.c write.c stats.c map.c props.c worktable.c options.c iconv.c
|
||||||
libmdb_la_LDFLAGS = -version-info 2:1:0
|
libmdb_la_LDFLAGS = -version-info 2:1:0 -export-symbols-regex '^(mdb_|_mdb_put_int16$$|_mdb_put_int32$$)'
|
||||||
AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
|
AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
|
||||||
LIBS = $(GLIB_LIBS) @LIBS@
|
LIBS = $(GLIB_LIBS) @LIBS@
|
||||||
if VERSION_SCRIPT
|
|
||||||
libmdb_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libmdb.map
|
|
||||||
else
|
|
||||||
libmdb_la_LDFLAGS += -export-symbols-regex '^(mdb_|_mdb_put_int16$$|_mdb_put_int32$$)'
|
|
||||||
endif
|
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
{
|
|
||||||
global:
|
|
||||||
mdb_*;
|
|
||||||
_mdb_put_int16;
|
|
||||||
_mdb_put_int32;
|
|
||||||
|
|
||||||
local:
|
|
||||||
*;
|
|
||||||
};
|
|
||||||
@@ -4,11 +4,6 @@ lib_LTLIBRARIES = libmdbodbc.la
|
|||||||
AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(ODBC_CFLAGS)
|
AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(ODBC_CFLAGS)
|
||||||
libmdbodbc_la_SOURCES= odbc.c connectparams.c
|
libmdbodbc_la_SOURCES= odbc.c connectparams.c
|
||||||
libmdbodbc_la_LIBADD= ../libmdb/libmdb.la ../sql/libmdbsql.la
|
libmdbodbc_la_LIBADD= ../libmdb/libmdb.la ../sql/libmdbsql.la
|
||||||
libmdbodbc_la_LDFLAGS = -version-info 1:1:0
|
libmdbodbc_la_LDFLAGS = -version-info 1:1:0 -export-symbols-regex '^(SQL|ODBCINST)'
|
||||||
LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS)
|
LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS)
|
||||||
unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la
|
unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la
|
||||||
if VERSION_SCRIPT
|
|
||||||
libmdbodbc_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libmdbodbc.map
|
|
||||||
else
|
|
||||||
libmdbodbc_la_LDFLAGS += -export-symbols-regex '^(SQL|ODBCINST)'
|
|
||||||
endif
|
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
{
|
|
||||||
global:
|
|
||||||
SQL*;
|
|
||||||
ODBCINST*;
|
|
||||||
|
|
||||||
local:
|
|
||||||
*;
|
|
||||||
};
|
|
||||||
@@ -1,13 +1,8 @@
|
|||||||
lib_LTLIBRARIES = libmdbsql.la
|
lib_LTLIBRARIES = libmdbsql.la
|
||||||
libmdbsql_la_SOURCES= mdbsql.c parser.y lexer.l
|
libmdbsql_la_SOURCES= mdbsql.c parser.y lexer.l
|
||||||
libmdbsql_la_LDFLAGS = -version-info 2:0:0
|
libmdbsql_la_LDFLAGS = -version-info 2:0:0 -export-symbols-regex '^mdb_sql_'
|
||||||
CLEANFILES = parser.c parser.h lexer.c
|
CLEANFILES = parser.c parser.h lexer.c
|
||||||
AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
|
AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
|
||||||
LIBS = $(GLIB_LIBS)
|
LIBS = $(GLIB_LIBS)
|
||||||
libmdbsql_la_LIBADD = ../libmdb/libmdb.la
|
libmdbsql_la_LIBADD = ../libmdb/libmdb.la
|
||||||
YACC = @YACC@ -d
|
YACC = @YACC@ -d
|
||||||
if VERSION_SCRIPT
|
|
||||||
libmdbsql_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libmdbsql.map
|
|
||||||
else
|
|
||||||
libmdbsql_la_LDFLAGS += -export-symbols-regex '^mdb_sql_'
|
|
||||||
endif
|
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
{
|
|
||||||
global:
|
|
||||||
mdb_sql_*;
|
|
||||||
|
|
||||||
local:
|
|
||||||
*;
|
|
||||||
};
|
|
||||||
Reference in New Issue
Block a user