open-src/lib/libFS/solaris-abi.patch
author X gate hg captive account <xhg@xserver.us.oracle.com>
Wed, 19 Aug 2015 13:48:41 -0700
changeset 1484 bc8922b8e1d2
parent 1422 e9cadc0026d8
permissions -rw-r--r--
Added tag s11u3_30 for changeset 221e9d9cc9cb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1422
e9cadc0026d8 19461700 Split source & build subdirectories in X builds
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1370
diff changeset
     1
# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
425
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     2
#
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     3
# Permission is hereby granted, free of charge, to any person obtaining a
919
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 425
diff changeset
     4
# copy of this software and associated documentation files (the "Software"),
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 425
diff changeset
     5
# to deal in the Software without restriction, including without limitation
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 425
diff changeset
     6
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 425
diff changeset
     7
# and/or sell copies of the Software, and to permit persons to whom the
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 425
diff changeset
     8
# Software is furnished to do so, subject to the following conditions:
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 425
diff changeset
     9
#
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 425
diff changeset
    10
# The above copyright notice and this permission notice (including the next
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 425
diff changeset
    11
# paragraph) shall be included in all copies or substantial portions of the
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 425
diff changeset
    12
# Software.
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 425
diff changeset
    13
#
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 425
diff changeset
    14
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 425
diff changeset
    15
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 425
diff changeset
    16
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 425
diff changeset
    17
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 425
diff changeset
    18
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 425
diff changeset
    19
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 425
diff changeset
    20
# DEALINGS IN THE SOFTWARE.
1276
52f85727ce94 7161868 Update X.Org modules to X11R7.7 RC1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    21
425
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    22
Change .so version to match existing Solaris libraries, since there's
1370
7a7a374453e5 17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1276
diff changeset
    23
no incompatible change since libFS.so.5, and use our versioning mapfile
7a7a374453e5 17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1276
diff changeset
    24
instead of just using the regex to control the exported symbols.
425
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    25
1276
52f85727ce94 7161868 Update X.Org modules to X11R7.7 RC1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    26
diff --git a/src/Makefile.am b/src/Makefile.am
1370
7a7a374453e5 17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1276
diff changeset
    27
index 56fd0db..ccc2a83 100644
1276
52f85727ce94 7161868 Update X.Org modules to X11R7.7 RC1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    28
--- a/src/Makefile.am
52f85727ce94 7161868 Update X.Org modules to X11R7.7 RC1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    29
+++ b/src/Makefile.am
1370
7a7a374453e5 17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1276
diff changeset
    30
@@ -40,7 +40,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include/X11/fonts
425
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    31
 
1370
7a7a374453e5 17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1276
diff changeset
    32
 libFS_la_LIBADD = $(FS_LIBS)
425
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    33
 
1276
52f85727ce94 7161868 Update X.Org modules to X11R7.7 RC1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    34
-libFS_la_LDFLAGS = -export-symbols-regex '^FS.*' -version-number 6:0:0 -no-undefined
1422
e9cadc0026d8 19461700 Split source & build subdirectories in X builds
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1370
diff changeset
    35
+libFS_la_LDFLAGS = -M $(top_srcdir)/../mapfile-vers -version-number 5 -no-undefined
425
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    36
 
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    37
 libFSincludedir = $(includedir)/X11/fonts
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    38
 libFSinclude_HEADERS = \