open-src/lib/libX11/Makefile
author Niveditha Rau <Niveditha.Rau@Oracle.COM>
Fri, 17 May 2013 12:39:19 -0700
changeset 1379 a78b871e6ea3
parent 1377 74e8a5844513
child 1408 17c15e2662ba
permissions -rw-r--r--
16794101 Xorg server start failure using gdm 16815647 X consolidation should build with Studio 12.3 per P-team CBE guidelines
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
341
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     1
###############################################################################
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     2
#
1356
73c3eb360de2 16167547 Update copyright & license display & metadata in X packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1301
diff changeset
     3
# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
341
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     4
#
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     5
# 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: 911
diff changeset
     6
# 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: 911
diff changeset
     7
# 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: 911
diff changeset
     8
# 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: 911
diff changeset
     9
# 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: 911
diff changeset
    10
# 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: 911
diff changeset
    11
#
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 911
diff changeset
    12
# 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: 911
diff changeset
    13
# 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: 911
diff changeset
    14
# Software.
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 911
diff changeset
    15
#
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 911
diff changeset
    16
# 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: 911
diff changeset
    17
# 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: 911
diff changeset
    18
# 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: 911
diff changeset
    19
# 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: 911
diff changeset
    20
# 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: 911
diff changeset
    21
# 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: 911
diff changeset
    22
# DEALINGS IN THE SOFTWARE.
341
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    23
#
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    24
#
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    25
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    26
# Package name used in tarballs
493
f43507b5737d 6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 468
diff changeset
    27
MODULE_NAME=libX11
341
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    28
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    29
# Version number (used in path names)
1301
371a43cad701 7174952 Update X.Org modules to X11R7.7 final release
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1265
diff changeset
    30
MODULE_VERSION = 1.5.0
341
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    31
911
a3e7e197651c 6929667 Automate downloading and verification of tarballs used to build X gate
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 910
diff changeset
    32
# Checksums for upstream tarball
1301
371a43cad701 7174952 Update X.Org modules to X11R7.7 final release
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1265
diff changeset
    33
TARBALL_MD5   = 78b4b3bab4acbdf0abcfca30a8c70cc6
371a43cad701 7174952 Update X.Org modules to X11R7.7 final release
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1265
diff changeset
    34
TARBALL_SHA1  = 8177535c9c59d8c3ab98d55ce53520b5737ccd1a
371a43cad701 7174952 Update X.Org modules to X11R7.7 final release
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1265
diff changeset
    35
TARBALL_SHA256= c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86
911
a3e7e197651c 6929667 Automate downloading and verification of tarballs used to build X gate
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 910
diff changeset
    36
341
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    37
# Patches to apply to source after unpacking, in order
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    38
SOURCE_PATCHES = \
1265
0b5cc5c013e4 7083537 Xorg 1.12 & associated module updates
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents: 1233
diff changeset
    39
	1234757.patch,-p1 \
341
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    40
	4010755.patch \
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    41
	4614834.patch \
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    42
	5039226.patch \
1179
4ad971e180c3 7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1146
diff changeset
    43
	solaris-abi.patch,-p1 \
1233
1134c9fd2fe6 7125797 Fix crufty code complaints uncovered by xorg-macros new tougher defaults
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1196
diff changeset
    44
	solaris-kbd.patch,-p1 \
1265
0b5cc5c013e4 7083537 Xorg 1.12 & associated module updates
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents: 1233
diff changeset
    45
	SolarisIA.patch,-p1 \
0b5cc5c013e4 7083537 Xorg 1.12 & associated module updates
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents: 1233
diff changeset
    46
	6714036.patch,-p1 \
1179
4ad971e180c3 7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1146
diff changeset
    47
	6789219.patch,-p1 \
688
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    48
	im-suneu-greek.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    49
	im-ximcp.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    50
	lc-jisx0212.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    51
	lc-jisx0208.patch \
1179
4ad971e180c3 7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1146
diff changeset
    52
	lc-ksc5601.1992-3.patch,-p1 \
4ad971e180c3 7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1146
diff changeset
    53
	lc-gb18030.patch,-p1 \
4ad971e180c3 7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1146
diff changeset
    54
	om-generic.patch,-p1 \
688
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    55
	compose.dir.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    56
	compose-iso8859-1.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    57
	compose-iso8859-2.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    58
	compose-iso8859-5.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    59
	compose-iso8859-6.patch \
1265
0b5cc5c013e4 7083537 Xorg 1.12 & associated module updates
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents: 1233
diff changeset
    60
	compose-iso8859-7.patch,-p1 \
688
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    61
	compose-iso8859-8.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    62
	compose-iso8859-9.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    63
	compose-iso8859-13.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    64
	compose-iso8859-15.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    65
	compose-el_GR.UTF-8.patch \
1265
0b5cc5c013e4 7083537 Xorg 1.12 & associated module updates
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents: 1233
diff changeset
    66
	compose-en_US.UTF-8.patch,-p1 \
688
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    67
	compose-ja_JP.UTF-8.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    68
	compose-ko_KR.UTF-8.patch \
1265
0b5cc5c013e4 7083537 Xorg 1.12 & associated module updates
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents: 1233
diff changeset
    69
	compose-pt_BR.UTF-8.patch,-p1 \
688
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    70
	compose-th_TH.UTF-8.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    71
	compose-zh_CN.UTF-8.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    72
	compose-zh_HK.UTF-8.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    73
	compose-zh_TW.UTF-8.patch \
1265
0b5cc5c013e4 7083537 Xorg 1.12 & associated module updates
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents: 1233
diff changeset
    74
	locale.aliases.patch,-p1 \
996
3f017a99488d 6941479 Some new locale entries are missing in locale.dir and compose.dir
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 970
diff changeset
    75
	locale.dir.patch \
1179
4ad971e180c3 7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1146
diff changeset
    76
	locale.paths.patch,-p1 \
688
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    77
	locale-C.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    78
	locale-iso8859-1.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    79
	locale-iso8859-6.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    80
	locale-iso8859-8.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    81
	locale-en_US.UTF-8.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    82
	locale-ja.SJIS.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    83
	locale-ja.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    84
	locale-ja_JP.UTF-8.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    85
	locale-ko.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    86
	locale-ko_KR.UTF-8.patch \
1146
0a324d2613b3 7008033 dead keys do not work in portuguese brazillian keyboard layout
ja208388
parents: 1115
diff changeset
    87
	locale-pt_BR.UTF-8.patch \
688
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    88
	locale-th_TH.UTF-8.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    89
	locale-zh_CN.UTF-8.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    90
	locale-zh_CN.gb18030.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    91
	locale-zh_HK.UTF-8.patch \
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 683
diff changeset
    92
	locale-zh_TW.UTF-8.patch \
816
1642b919ed24 6890536 [virtual keyboards] input does not work for java and xterm in Russian locale
Xue Wei <Wei.Xue@Sun.COM>
parents: 812
diff changeset
    93
	locale-zh_TW.patch \
1379
a78b871e6ea3 16794101 Xorg server start failure using gdm
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents: 1377
diff changeset
    94
	locale-ru-RU.UTF-8.patch \
a78b871e6ea3 16794101 Xorg server start failure using gdm
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents: 1377
diff changeset
    95
	16815647.patch
341
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    96
1377
74e8a5844513 16673783 problem in X11/LIBRARIES
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1356
diff changeset
    97
# Patches from May 2013 security alert - will be integrated into libX11 1.6
74e8a5844513 16673783 problem in X11/LIBRARIES
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1356
diff changeset
    98
SOURCE_PATCHES += upstream-cleanup.patch,-p1
74e8a5844513 16673783 problem in X11/LIBRARIES
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1356
diff changeset
    99
SOURCE_PATCHES += XEatDataWords.patch,-p1
74e8a5844513 16673783 problem in X11/LIBRARIES
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1356
diff changeset
   100
SOURCE_PATCHES += CVE-2013-1981.patch,-p1
74e8a5844513 16673783 problem in X11/LIBRARIES
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1356
diff changeset
   101
SOURCE_PATCHES += CVE-2013-1997.patch,-p1
74e8a5844513 16673783 problem in X11/LIBRARIES
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1356
diff changeset
   102
SOURCE_PATCHES += CVE-2013-2004.patch,-p1
74e8a5844513 16673783 problem in X11/LIBRARIES
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1356
diff changeset
   103
SOURCE_PATCHES += alloc-cleanup.patch,-p1
74e8a5844513 16673783 problem in X11/LIBRARIES
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1356
diff changeset
   104
341
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   105
# Library name (used for specfiles/mapfiles)
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   106
LIBNAME=X11
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   107
1356
73c3eb360de2 16167547 Update copyright & license display & metadata in X packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1301
diff changeset
   108
# Dates to show in Oracle copyright notice in pkg license file
73c3eb360de2 16167547 Update copyright & license display & metadata in X packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1301
diff changeset
   109
# Earliest & latest of the copyrights in the Oracle files in this pkg
1377
74e8a5844513 16673783 problem in X11/LIBRARIES
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1356
diff changeset
   110
ORACLE_COPYRIGHT_YEARS = 1986, 2013
1356
73c3eb360de2 16167547 Update copyright & license display & metadata in X packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1301
diff changeset
   111
970
272328fe1b4a 6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 969
diff changeset
   112
# ARC cases that covered this module
272328fe1b4a 6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 969
diff changeset
   113
# PSARC/1992/077 X11/R5 Xlib API
272328fe1b4a 6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 969
diff changeset
   114
MODULE_ARC_CASES = PSARC/1992/077
272328fe1b4a 6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 969
diff changeset
   115
# PSARC/1992/082 Dynamic Locale Access For X11/R5 Xlib
272328fe1b4a 6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 969
diff changeset
   116
MODULE_ARC_CASES += PSARC/1992/082
272328fe1b4a 6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 969
diff changeset
   117
# PSARC/1997/141 Sym links needed in /usr/lib for SPARC ABI compliance
272328fe1b4a 6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 969
diff changeset
   118
MODULE_ARC_CASES += PSARC/1997/141
272328fe1b4a 6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 969
diff changeset
   119
# PSARC/2006/448 UTF8_STRING support in Solaris libX11 and XLC modules
272328fe1b4a 6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 969
diff changeset
   120
MODULE_ARC_CASES += PSARC/2006/448
272328fe1b4a 6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 969
diff changeset
   121
# PSARC/2008/062  Porting of Xorg XI18N
272328fe1b4a 6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 969
diff changeset
   122
MODULE_ARC_CASES += PSARC/2008/062
272328fe1b4a 6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 969
diff changeset
   123
# PSARC/2009/666 libX11 1.3 
272328fe1b4a 6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 969
diff changeset
   124
MODULE_ARC_CASES += PSARC/2009/666
1029
2433d5075f1f 6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents: 999
diff changeset
   125
# PSARC/2010/109 Introduce libXcb in Solaris
2433d5075f1f 6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents: 999
diff changeset
   126
MODULE_ARC_CASES += PSARC/2010/109
970
272328fe1b4a 6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 969
diff changeset
   127
341
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   128
# Man pages to apply Sun footer to & attributes to list
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   129
SUNTOUCHED_MANPAGES=man/*.man man/xkb/*.man
493
f43507b5737d 6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 468
diff changeset
   130
MODULE_STABILITY=Committed
969
f3e9f1ddd6a8 6965575 Section 3X* man pages can't be found since move to /usr/share/man
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 965
diff changeset
   131
LIB_MAN_SUFFIX=3x11
341
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   132
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   133
# Command line options to GNU autoconf configure script
493
f43507b5737d 6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 468
diff changeset
   134
MODULE_CONFIG_OPTS = --enable-xthreads --enable-loadable-i18n \
1064
3395ca7a91bf 7012962 Update libX11 to 1.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1029
diff changeset
   135
	--disable-xf86bigfont \
1029
2433d5075f1f 6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents: 999
diff changeset
   136
	--with-xcb=yes --enable-loadable-xcursor --enable-xcms \
341
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   137
	--enable-xlocaledir --enable-xkb --enable-man-pages=$(LIB_MAN_SUFFIX) \
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   138
	--with-locale-lib-dir='$${exec_prefix}/lib/X11/locale$(LIBSUBDIR)'
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   139
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   140
# -xF is needed for mapfile reordering to work
493
f43507b5737d 6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 468
diff changeset
   141
MODULE_CFLAGS = -xF
341
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   142
1064
3395ca7a91bf 7012962 Update libX11 to 1.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1029
diff changeset
   143
# -DSUNSOFT enables Solaris extensions
341
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   144
# -DMOTIFBC enables compatibility with bugs in Motif & other apps
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   145
# -DSUNSOFT_KBD enables Solaris traditional keyboard handling
1029
2433d5075f1f 6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents: 999
diff changeset
   146
MODULE_CPPFLAGS = -DSUNSOFT -DMOTIFBC -DSUNSOFT_KBD \
2433d5075f1f 6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents: 999
diff changeset
   147
		  -I$(PROTODIR)/usr/include/X11 \
2433d5075f1f 6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents: 999
diff changeset
   148
		  -I$(PROTODIR)/usr/include/xcb
341
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   149
965
c096efd79ce7 6962789 Fix a number of library runpath and unneededed linking issues in X gate
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 963
diff changeset
   150
MODULE_LDFLAGS = -R$(X11_LIB_DIR)$(ARCHLIBSUBDIR)
c096efd79ce7 6962789 Fix a number of library runpath and unneededed linking issues in X gate
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 963
diff changeset
   151
1196
1ce455dae979 7081325 X builds should run check_rtime to ensure binaries are linked well
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1179
diff changeset
   152
# Need to ignore extra libraries like -lsocket & -lnsl in i18n modules
1ce455dae979 7081325 X builds should run check_rtime to ensure binaries are linked well
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1179
diff changeset
   153
MODULE_LD_OPTIONS = -z ignore
1ce455dae979 7081325 X builds should run check_rtime to ensure binaries are linked well
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1179
diff changeset
   154
851
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 816
diff changeset
   155
# Backwards compatibility for old paths until g11n moves all input methods
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 816
diff changeset
   156
MODULE_CONFIG_ENV = \
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 816
diff changeset
   157
 XLOCALEDIR="/usr/share/X11/locale:/usr/X11/share/X11/locale" \
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 816
diff changeset
   158
 XLOCALELIBDIR="/usr/lib/X11/locale$(LIBSUBDIR):/usr/X11/lib/X11/locale$(LIBSUBDIR)"
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 816
diff changeset
   159
341
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   160
# Work around libtool's interference
493
f43507b5737d 6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 468
diff changeset
   161
DELIBTOOLIZE=yes
341
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   162
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   163
# Use -KPIC instead of -Kpic because we have too many symbols on SPARC
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   164
DELIBTOOLIZE_FLAGS_sparc = -P
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   165
DELIBTOOLIZE_FLAGS_i386 = 
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   166
DELIBTOOLIZE_FLAGS = $(DELIBTOOLIZE_FLAGS_$(MACH))
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   167
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   168
# Need additional mapfile for additional symbols in 64-bit versions
493
f43507b5737d 6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 468
diff changeset
   169
MODULE_BUILD_64_FLAGS = ADD_libX11_LDFLAGS="-M $(PWD)/mapfile-vers-64"
341
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   170
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   171
# pkg-config files that need to have -R added
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   172
FIX_PC_FILES=x11.pc.in
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   173
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   174
# Regenerate Makefile.in's from Makefile.am's after patching them
493
f43507b5737d 6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 468
diff changeset
   175
AUTORECONF=yes
f43507b5737d 6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 468
diff changeset
   176
f43507b5737d 6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 468
diff changeset
   177
# Merge in additional sources from sun-src directory
f43507b5737d 6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 468
diff changeset
   178
ADDITIONAL_SOURCE_DIR=sun-src
341
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   179
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   180
# Install additional headers we need in other parts of the build or ship in
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   181
# packages, but which X.Org doesn't
922
db66e53f0c94 6933880 Simplify building the same X workspace on sparc & x86
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 919
diff changeset
   182
MODULE_ADD_INSTALL_TARGETS_32 = install_extra_headers
db66e53f0c94 6933880 Simplify building the same X workspace on sparc & x86
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 919
diff changeset
   183
MODULE_ADD_INSTALL_TARGETS = $(MODULE_ADD_INSTALL_TARGETS_$(BUILD_TYPE))
910
0a08683bf637 6928500 Race conditions in parallel make break X nightly builds
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 907
diff changeset
   184
970
272328fe1b4a 6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 969
diff changeset
   185
# Extra links to libX11 for compatibility with SVID / SPARC ABI / etc.
272328fe1b4a 6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 969
diff changeset
   186
EXTRA_LINKS = libX.so libX.so.4 libX11.so.5
963
7a4fced80e83 6962316 X proto area should more closely match packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 962
diff changeset
   187
MODULE_ADD_INSTALL_TARGETS += install_extra_links
7a4fced80e83 6962316 X proto area should more closely match packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 962
diff changeset
   188
970
272328fe1b4a 6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 969
diff changeset
   189
# Compatibility links from /usr/X11/lib to /usr/lib
272328fe1b4a 6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 969
diff changeset
   190
MODULE_X11_LIBCOMPAT_LINKS = libX11.so libX11.so.4 $(EXTRA_LINKS)
272328fe1b4a 6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 969
diff changeset
   191
922
db66e53f0c94 6933880 Simplify building the same X workspace on sparc & x86
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 919
diff changeset
   192
include ../Makefile.inc
db66e53f0c94 6933880 Simplify building the same X workspace on sparc & x86
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 919
diff changeset
   193
db66e53f0c94 6933880 Simplify building the same X workspace on sparc & x86
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 919
diff changeset
   194
install_extra_headers: $(INSTALL_DEPS)
851
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 816
diff changeset
   195
	mkdir -p $(PROTODIR)$(X11_INCLUDES_DIR)/X11/extensions
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 816
diff changeset
   196
	cp -pf sun-src/include/X11/Xvarargs.h \
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 816
diff changeset
   197
		$(PROTODIR)$(X11_INCLUDES_DIR)/X11/
341
0a1eb61fd56e 6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   198
	cp -pf sun-src/include/X11/extensions/XInteractive.h \
851
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 816
diff changeset
   199
		$(PROTODIR)$(X11_INCLUDES_DIR)/X11/extensions/
922
db66e53f0c94 6933880 Simplify building the same X workspace on sparc & x86
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 919
diff changeset
   200
	cp -pf $(SOURCE_DIR)/src/xlibi18n/Xlc*.h \
851
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 816
diff changeset
   201
		$(PROTODIR)$(X11_INCLUDES_DIR)/X11/
963
7a4fced80e83 6962316 X proto area should more closely match packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 962
diff changeset
   202
970
272328fe1b4a 6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 969
diff changeset
   203
# Install additional links to libX11 that we include in our packages
963
7a4fced80e83 6962316 X proto area should more closely match packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 962
diff changeset
   204
EXTRA_PROTO_LINKS = $(EXTRA_LINKS:%=$(PROTODIR)$(MODULE_PREFIX)/lib$(ARCHLIBSUBDIR)/%)
7a4fced80e83 6962316 X proto area should more closely match packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 962
diff changeset
   205
7a4fced80e83 6962316 X proto area should more closely match packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 962
diff changeset
   206
$(EXTRA_PROTO_LINKS): $(INSTALL_DEPS)
7a4fced80e83 6962316 X proto area should more closely match packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 962
diff changeset
   207
	@rm -f $@
7a4fced80e83 6962316 X proto area should more closely match packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 962
diff changeset
   208
	ln -s libX11.so.4 $@
7a4fced80e83 6962316 X proto area should more closely match packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 962
diff changeset
   209
7a4fced80e83 6962316 X proto area should more closely match packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 962
diff changeset
   210
install_extra_links: $(EXTRA_PROTO_LINKS)