ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use a proper version script for libturbojpeg

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@442 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2011-02-25 00:23:44 +00:00
parent 0ad78a688c
commit 9fa95594c2
4 changed files with 26 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.am
View File

@@ -50,14 +50,9 @@ endif
libturbojpeg_la_SOURCES += $(TJMAPFILE) libturbojpeg_la_SOURCES += $(TJMAPFILE)
if ANON_VERSION_SCRIPT
libturbojpeg_la_LDFLAGS += $(ANON_VERSION_SCRIPT_FLAG)$(srcdir)/$(TJMAPFILE)
endif
if VERSION_SCRIPT if VERSION_SCRIPT
libturbojpeg_la_LDFLAGS += $(VERSION_SCRIPT_FLAG)$(srcdir)/$(TJMAPFILE)
libjpeg_la_LDFLAGS += $(VERSION_SCRIPT_FLAG)libjpeg.map libjpeg_la_LDFLAGS += $(VERSION_SCRIPT_FLAG)libjpeg.map
endif endif

25
configure.ac
View File

@@ -168,36 +168,13 @@ if test "x$VERSION_SCRIPT_FLAG" = "x"; then
VERSION_SCRIPT=no VERSION_SCRIPT=no
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi fi
ANON_VERSION_SCRIPT=yes
AC_MSG_CHECKING([whether the linker supports anonymous version scripts])
LDFLAGS="$SAVED_LDFLAGS -Wl,--version-script,conftest.map"
cat > conftest.map <<EOF
{
global: main;
local: *;
};
EOF
AC_LINK_IFELSE(AC_LANG_PROGRAM([], []),
[ANON_VERSION_SCRIPT_FLAG=-Wl,--version-script,; AC_MSG_RESULT([yes (GNU style)])], [])
if test "x$ANON_VERSION_SCRIPT_FLAG" = "x"; then
LDFLAGS="$SAVED_LDFLAGS -Wl,-M,conftest.map"
AC_LINK_IFELSE(AC_LANG_PROGRAM([], []),
[ANON_VERSION_SCRIPT_FLAG=-Wl,-M,; AC_MSG_RESULT([yes (Sun style)])], [])
fi
if test "x$ANON_VERSION_SCRIPT_FLAG" = "x"; then
ANON_VERSION_SCRIPT=no
AC_MSG_RESULT(no)
fi
LDFLAGS="$SAVED_LDFLAGS" LDFLAGS="$SAVED_LDFLAGS"
AC_MSG_CHECKING([whether to use version script when building libjpeg]) AC_MSG_CHECKING([whether to use version script when building libjpeg-turbo])
AC_MSG_RESULT($VERSION_SCRIPT) AC_MSG_RESULT($VERSION_SCRIPT)
AM_CONDITIONAL(VERSION_SCRIPT, test "x$VERSION_SCRIPT" = "xyes") AM_CONDITIONAL(VERSION_SCRIPT, test "x$VERSION_SCRIPT" = "xyes")
AM_CONDITIONAL(ANON_VERSION_SCRIPT, test "x$ANON_VERSION_SCRIPT" = "xyes")
AC_SUBST(VERSION_SCRIPT_FLAG) AC_SUBST(VERSION_SCRIPT_FLAG)
AC_SUBST(ANON_VERSION_SCRIPT_FLAG)
AC_MSG_CHECKING([whether to include arithmetic encoding support]) AC_MSG_CHECKING([whether to include arithmetic encoding support])
AC_ARG_WITH([arith-enc], AC_ARG_WITH([arith-enc],

10
turbojpeg-mapfile
View File

@@ -1,12 +1,11 @@
TURBOJPEG_1.0
{ {
global: global:
tjInitCompress; tjInitCompress;
tjCompress; tjCompress;
TJBUFSIZE; TJBUFSIZE;
TJBUFSIZEYUV;
tjInitDecompress; tjInitDecompress;
tjDecompressHeader; tjDecompressHeader;
tjDecompressHeader2;
tjScaledSize; tjScaledSize;
tjDecompress; tjDecompress;
tjDestroy; tjDestroy;
@@ -14,3 +13,10 @@
local: local:
*; *;
}; };
TURBOJPEG_1.1
{
global:
TJBUFSIZEYUV;
tjDecompressHeader2;
} TURBOJPEG_1.0;

21
turbojpeg-mapfile.jni
View File

@@ -1,16 +1,29 @@
TURBOJPEG_1.0
{ {
global: global:
tjInitCompress; tjInitCompress;
tjCompress; tjCompress;
TJBUFSIZE; TJBUFSIZE;
TJBUFSIZEYUV;
tjInitDecompress; tjInitDecompress;
tjDecompressHeader; tjDecompressHeader;
tjDecompressHeader2;
tjScaledSize; tjScaledSize;
tjDecompress; tjDecompress;
tjDestroy; tjDestroy;
tjGetErrorStr; tjGetErrorStr;
local:
*;
};
TURBOJPEG_1.1
{
global:
TJBUFSIZEYUV;
tjDecompressHeader2;
} TURBOJPEG_1.0;
TURBOJPEG_1.2
{
global:
Java_org_libjpegturbo_turbojpeg_TJ_bufSize; Java_org_libjpegturbo_turbojpeg_TJ_bufSize;
Java_org_libjpegturbo_turbojpeg_TJ_bufSizeYUV; Java_org_libjpegturbo_turbojpeg_TJ_bufSizeYUV;
Java_org_libjpegturbo_turbojpeg_TJCompressor_init; Java_org_libjpegturbo_turbojpeg_TJCompressor_init;
@@ -24,6 +37,4 @@
Java_org_libjpegturbo_turbojpeg_TJDecompressor_destroy; Java_org_libjpegturbo_turbojpeg_TJDecompressor_destroy;
Java_org_libjpegturbo_turbojpeg_TJDecompressor_getScaledHeight; Java_org_libjpegturbo_turbojpeg_TJDecompressor_getScaledHeight;
Java_org_libjpegturbo_turbojpeg_TJDecompressor_getScaledWidth; Java_org_libjpegturbo_turbojpeg_TJDecompressor_getScaledWidth;
local: } TURBOJPEG_1.1;
*;
};