open-src/lib/libFS/solaris-abi.patch
author Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
Mon, 30 Sep 2013 13:26:39 -0700
changeset 1370 7a7a374453e5
parent 1276 52f85727ce94
child 1422 e9cadc0026d8
permissions -rw-r--r--
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition] 15804808 SUNBT7185228 xfs service will go to maintenance status after running fsinfo 15802823 SUNBT7182943 Update xinit man page to not reference /usr/ucb/rsh 15702480 SUNBT7027122 imake should use /usr/lib/cpp instead of /usr/ccs/lib/cpp 14963848 SUNBT4146469 imake config file uses incorrect "install" program on SunOS 5

# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice (including the next
# paragraph) shall be included in all copies or substantial portions of the
# Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.

Change .so version to match existing Solaris libraries, since there's
no incompatible change since libFS.so.5, and use our versioning mapfile
instead of just using the regex to control the exported symbols.

diff --git a/src/Makefile.am b/src/Makefile.am
index 56fd0db..ccc2a83 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,7 +40,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include/X11/fonts
 
 libFS_la_LIBADD = $(FS_LIBS)
 
-libFS_la_LDFLAGS = -export-symbols-regex '^FS.*' -version-number 6:0:0 -no-undefined
+libFS_la_LDFLAGS = -M $(top_srcdir)/../../mapfile-vers -version-number 5 -no-undefined
 
 libFSincludedir = $(includedir)/X11/fonts
 libFSinclude_HEADERS = \