author | X gate hg captive account <xhg@xserver.us.oracle.com> |
Wed, 13 May 2015 11:14:20 -0700 | |
changeset 1465 | b21ed16ca07c |
parent 1447 | b26f1451b601 |
permissions | -rw-r--r-- |
1088
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1030
diff
changeset
|
1 |
# -*- Makefile -*- rules common to all xserver build trees |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
2 |
# |
1339
4f152696e5f2
16167547 Update copyright & license display & metadata in X packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1296
diff
changeset
|
3 |
# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
4 |
# |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
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:
916
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:
916
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:
916
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:
916
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:
916
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:
916
diff
changeset
|
11 |
# |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
916
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:
916
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:
916
diff
changeset
|
14 |
# Software. |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
916
diff
changeset
|
15 |
# |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
916
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:
916
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:
916
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:
916
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:
916
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:
916
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:
916
diff
changeset
|
22 |
# DEALINGS IN THE SOFTWARE. |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
23 |
# |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
24 |
# |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
25 |
|
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
26 |
PWD:sh=pwd |
967
efbd0ee6805d
6963229 build race conditions and other makefile issues
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
965
diff
changeset
|
27 |
TOP=$(PWD)/../../.. |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
28 |
|
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
371
diff
changeset
|
29 |
MODTYPE=xserver |
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
371
diff
changeset
|
30 |
|
970
272328fe1b4a
6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
967
diff
changeset
|
31 |
# Defaults for pkg names in this area |
272328fe1b4a
6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
967
diff
changeset
|
32 |
MODTYPE_PKGHIER=x11/server |
272328fe1b4a
6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
967
diff
changeset
|
33 |
MODTYPE_PKGHIER_SET=yes |
272328fe1b4a
6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
967
diff
changeset
|
34 |
MODULE_PKGTAIL_DEFAULT = $(MODULE_PKGTAIL_SET:yes=$(POUND_SIGN)) |
272328fe1b4a
6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
967
diff
changeset
|
35 |
$(MODULE_PKGTAIL_DEFAULT) MODULE_PKGTAIL:sh=basename $(pwd) |
272328fe1b4a
6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
967
diff
changeset
|
36 |
MODULE_PKGTAIL_SET = yes |
272328fe1b4a
6941932 X should be able to build IPS packages natively
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
967
diff
changeset
|
37 |
|
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
371
diff
changeset
|
38 |
### Include common definitions |
967
efbd0ee6805d
6963229 build race conditions and other makefile issues
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
965
diff
changeset
|
39 |
include $(TOP)/open-src/common/Makefile.init |
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
371
diff
changeset
|
40 |
|
1339
4f152696e5f2
16167547 Update copyright & license display & metadata in X packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1296
diff
changeset
|
41 |
# Dates to show in Oracle copyright notice in pkg license file |
4f152696e5f2
16167547 Update copyright & license display & metadata in X packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1296
diff
changeset
|
42 |
# Earliest & latest of the copyrights in the Oracle files in this pkg |
4f152696e5f2
16167547 Update copyright & license display & metadata in X packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1296
diff
changeset
|
43 |
ORACLE_COPYRIGHT_YEARS = 1993, 2012 |
4f152696e5f2
16167547 Update copyright & license display & metadata in X packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1296
diff
changeset
|
44 |
|
1088
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1030
diff
changeset
|
45 |
# Patches shared between Xorg & Xvnc builds |
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1030
diff
changeset
|
46 |
XORG_SOURCE_PATCHES:sh=sed '/^\#/ d' ../xorg/patch-list |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
47 |
|
1097
243d7ed7a10c
6991718 Removal of 32-bit X servers [PSARC/2010/382]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1095
diff
changeset
|
48 |
SERVER_MODULES_DIR='$(X11_SERVERMODS_DIR)' |
1262
b26dab1722a7
7155021 should deliver 32-bit versions of dri drivers
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
1201
diff
changeset
|
49 |
DRI_MODULES_DIR='$(X11_SERVERMODS_DIR)/dri$(ARCHLIBSUBDIR)' |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
50 |
|
947
ef9da9d336f5
6950022 X man page cleanups
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
51 |
# Changes to apply to man pages |
1124
7bc7e624f965
7042476 Xorg 1.10 & associated module updates [PSARC/2011/214]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1097
diff
changeset
|
52 |
MODTYPE_SUNTOUCH_MAN_FLAGS = -p $(MODULE_PREFIX)/bin/ |
947
ef9da9d336f5
6950022 X man page cleanups
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
53 |
|
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
54 |
# Command line options to GNU autoconf configure script for xorg-server |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
55 |
XSERVER_CONFIG_OPTS_COMMON = \ |
1201
d6ebb7728565
6489124 docs needed for Xserver dtrace provider
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
56 |
--docdir='$(MODULE_DOC_DIR)' \ |
750
fe2b017fc5d3
6859883 Introduce XDM-AUTHORIZATION-1 support in libXdmcp
Stefan Teleman <Stefan.Teleman@Sun.COM>
parents:
742
diff
changeset
|
57 |
--enable-xdm-auth-1 --enable-xdmcp --enable-xcsecurity \ |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
58 |
--enable-shared --disable-static \ |
851
d428083dbbdd
6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
837
diff
changeset
|
59 |
--enable-glx --enable-dri2 \ |
705
24ca414edbff
6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
644
diff
changeset
|
60 |
--disable-xsdl --disable-xwin --disable-xnest \ |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
61 |
--disable-install-setuid \ |
1003
a4d17d6bc179
6980773 X gate needs branding options
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
970
diff
changeset
|
62 |
--with-vendor-name='$(VENDOR_NAME)' \ |
a4d17d6bc179
6980773 X gate needs branding options
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
970
diff
changeset
|
63 |
--with-vendor-web='$(VENDOR_SUPPORT_URL)' \ |
851
d428083dbbdd
6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
837
diff
changeset
|
64 |
--with-builderstring='Solaris ABI: $(BUILD_TYPE)-bit' \ |
742
a11b961df2a2
6858165 Upgrade Xorg to 1.6.2
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
65 |
--with-os-name="`uname -srm`" \ |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
66 |
--with-log-dir=/var/log --with-xkb-output=/var/run/xkb \ |
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
371
diff
changeset
|
67 |
--with-module-dir=$(SERVER_MODULES_DIR) \ |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
68 |
--with-dri-driver-path=$(DRI_MODULES_DIR) \ |
963
7a4fced80e83
6962316 X proto area should more closely match packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
957
diff
changeset
|
69 |
--with-default-font-path='catalogue:$(X11_FONT_CATALOGUE)' \ |
851
d428083dbbdd
6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
837
diff
changeset
|
70 |
--with-xkb-bin-directory='$${exec_prefix}/bin' \ |
606
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
562
diff
changeset
|
71 |
--with-default-xkb-model=pc105 \ |
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
562
diff
changeset
|
72 |
$(ADDITIONAL_CONFIG_OPTS) |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
73 |
|
1296
9f021f447b92
7172112 X builds need to add a layer of parfait on top
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1262
diff
changeset
|
74 |
# Xorg's unit tests don't build correctly with parfait yet |
9f021f447b92
7172112 X builds need to add a layer of parfait on top
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1262
diff
changeset
|
75 |
$(WITH_PARFAIT) XSERVER_CONFIG_OPTS_COMMON += --disable-unit-tests |
9f021f447b92
7172112 X builds need to add a layer of parfait on top
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1262
diff
changeset
|
76 |
|
851
d428083dbbdd
6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
837
diff
changeset
|
77 |
XSERVER_CONFIG_OPTS_sparc=$(XSERVER_CONFIG_OPTS_COMMON) |
d428083dbbdd
6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
837
diff
changeset
|
78 |
XSERVER_CONFIG_OPTS_i386=$(XSERVER_CONFIG_OPTS_COMMON) |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
79 |
XSERVER_CONFIG_OPTS=$(XSERVER_CONFIG_OPTS_$(MACH)) |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
80 |
|
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
371
diff
changeset
|
81 |
MODTYPE_CPPFLAGS_suncc= # No extra flags needed |
705
24ca414edbff
6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
644
diff
changeset
|
82 |
MODTYPE_CPPFLAGS_gcc= # No extra flags needed |
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
371
diff
changeset
|
83 |
|
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
371
diff
changeset
|
84 |
MODTYPE_CPPFLAGS= \ |
606
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
562
diff
changeset
|
85 |
-I$(PROTODIR)/usr/include \ |
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
562
diff
changeset
|
86 |
-I$(PROTODIR)/usr/include/pixman-1 \ |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
87 |
-I$(PROTODIR)$(X11_INCLUDES_DIR) \ |
606
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
562
diff
changeset
|
88 |
-I$(PROTODIR)$(X11_INCLUDES_DIR)/drm \ |
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
562
diff
changeset
|
89 |
-I$(PROTODIR)$(X11_INCLUDES_DIR)/X11/dri \ |
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
371
diff
changeset
|
90 |
$(DPMS_DEFINES) -DSUNSOFT -DTSOL \ |
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
371
diff
changeset
|
91 |
$(MODTYPE_CPPFLAGS_$(MODULE_COMPILER)) |
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
371
diff
changeset
|
92 |
|
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
93 |
# Environment variable options to GNU autoconf configure script |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
94 |
# - XSERVERCFLAGS_CFLAGS - force CFLAGS to avoid -I /usr/X11/include breaking |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
95 |
# use of headers from proto area |
705
24ca414edbff
6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
644
diff
changeset
|
96 |
# - PATH - include /usr/sbin for dtrace command (needed for building probes) |
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
371
diff
changeset
|
97 |
MODTYPE_CONFIG_ENV = \ |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
98 |
XSERVERCFLAGS_CFLAGS="-DHAS_FCHOWN -DHAS_STICKY_DIR_BIT -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DXTHREADS -DXUSE_MTSAFE_API" \ |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
99 |
PATH=$(PATH):/usr/sbin |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
100 |
|
606
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
562
diff
changeset
|
101 |
# 64-bit X servers on SPARC crash on startup when built with Sun Studio |
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
562
diff
changeset
|
102 |
# with -g unless -xmemalign=8i is also used (Sun bug #6545113) |
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
562
diff
changeset
|
103 |
MODTYPE_DEBUG_FLAGS_sparc_suncc = -xmemalign=8i |
851
d428083dbbdd
6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
837
diff
changeset
|
104 |
MODTYPE_DEBUG_FLAGS=$(MODTYPE_DEBUG_FLAGS_$(MACH)_$(MODULE_COMPILER)) |
606
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
562
diff
changeset
|
105 |
|
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
371
diff
changeset
|
106 |
MODTYPE_CFLAGS=$(PROG_CFLAGS) |
1095
f3ae5df34b0b
7030089 X fd_sets use too many fd's in 64-bit mode
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1088
diff
changeset
|
107 |
MODTYPE_CPPFLAGS += $(PROG_CPPFLAGS) |
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
371
diff
changeset
|
108 |
MODTYPE_CXXFLAGS=$(PROG_CXXFLAGS) |
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
|
109 |
MODTYPE_LDFLAGS=$(PROG_LDFLAGS) |
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
|
110 |
|
1447
b26f1451b601
17915870 clean up check_rtime & ld guidance warnings in X gate
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1339
diff
changeset
|
111 |
# configure scripts add libraries like -lm to the global $(LIBS) when only |
b26f1451b601
17915870 clean up check_rtime & ld guidance warnings in X gate
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1339
diff
changeset
|
112 |
# some objects need them, so discard them in the rest, but only when building |
b26f1451b601
17915870 clean up check_rtime & ld guidance warnings in X gate
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1339
diff
changeset
|
113 |
# programs or .so's, not the Dtrace magic relocatable objects. |
b26f1451b601
17915870 clean up check_rtime & ld guidance warnings in X gate
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1339
diff
changeset
|
114 |
MODTYPE_LD_EXEC_OPTIONS = $(ZDISCARD_UNUSED_DEP) $(ZDISCARD_UNUSED_FIL) |
b26f1451b601
17915870 clean up check_rtime & ld guidance warnings in X gate
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1339
diff
changeset
|
115 |
MODTYPE_LD_SHARED_OPTIONS = $(ZDISCARD_UNUSED_DEP) $(ZDISCARD_UNUSED_FIL) |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
116 |
|
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
117 |
# Environment variable options to use when building |
705
24ca414edbff
6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
644
diff
changeset
|
118 |
# - PATH - include /usr/sbin for dtrace command (needed for building probes) |
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
371
diff
changeset
|
119 |
MODTYPE_BUILD_ENV= PATH=$(PATH):/usr/sbin \ |
851
d428083dbbdd
6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
837
diff
changeset
|
120 |
LD_LIBRARY_PATH=$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR):$(PROTODIR)$(X11_DIR)/lib$(ARCHLIBSUBDIR) |
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
371
diff
changeset
|
121 |
|
1190
faa50483142d
7072864 X needs to implement the 'unlock' facet feature
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1179
diff
changeset
|
122 |
# Mark packages as only compatible with the current server minor release series, |
faa50483142d
7072864 X needs to implement the 'unlock' facet feature
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1179
diff
changeset
|
123 |
# since Xorg tends to break ABI's in each minor release train (1.8, 1.9, etc.) |
faa50483142d
7072864 X needs to implement the 'unlock' facet feature
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1179
diff
changeset
|
124 |
MODTYPE_ATTRDATA_COMMANDS = @$(START_CMD_ECHO) ; \ |
faa50483142d
7072864 X needs to implement the 'unlock' facet feature
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1179
diff
changeset
|
125 |
print "depend fmri=pkg:/x11/server/xserver-common@$(MIN_XSERVER_VERS) type=require" >> $@ ; \ |
faa50483142d
7072864 X needs to implement the 'unlock' facet feature
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1179
diff
changeset
|
126 |
print "depend fmri=pkg:/x11/server/xorg@$(NEXT_XSERVER_VERS) type=exclude" >> $@ |
faa50483142d
7072864 X needs to implement the 'unlock' facet feature
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1179
diff
changeset
|
127 |
|
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
371
diff
changeset
|
128 |
### Include common rulesets |
967
efbd0ee6805d
6963229 build race conditions and other makefile issues
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
965
diff
changeset
|
129 |
include $(TOP)/open-src/common/Makefile.inc |
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
371
diff
changeset
|
130 |
|
1030
0738233d0472
6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1026
diff
changeset
|
131 |
# Fix paths in proto area to match paths in packages / installed systems |
1097
243d7ed7a10c
6991718 Removal of 32-bit X servers [PSARC/2010/382]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1095
diff
changeset
|
132 |
install_fix_paths: install_fix_paths_$(MACH) |
243d7ed7a10c
6991718 Removal of 32-bit X servers [PSARC/2010/382]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1095
diff
changeset
|
133 |
install_fix_paths_sparc: # not needed |
243d7ed7a10c
6991718 Removal of 32-bit X servers [PSARC/2010/382]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1095
diff
changeset
|
134 |
install_fix_paths_i386: install_fix_paths_amd64_links |
963
7a4fced80e83
6962316 X proto area should more closely match packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
957
diff
changeset
|
135 |
|
1097
243d7ed7a10c
6991718 Removal of 32-bit X servers [PSARC/2010/382]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1095
diff
changeset
|
136 |
# We used to deliver both 32-bit & 64-bit binaries on x86 and use isaexec to |
243d7ed7a10c
6991718 Removal of 32-bit X servers [PSARC/2010/382]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1095
diff
changeset
|
137 |
# choose between them. Now we just deliver 64-bit and make symlinks from |
243d7ed7a10c
6991718 Removal of 32-bit X servers [PSARC/2010/382]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1095
diff
changeset
|
138 |
# the amd64 paths to the default paths for compatibility |
916
a2113251a45c
6928167 Integrate X server mdb module into xorg-server build & packages (fix SPARC build)
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
913
diff
changeset
|
139 |
|
1097
243d7ed7a10c
6991718 Removal of 32-bit X servers [PSARC/2010/382]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1095
diff
changeset
|
140 |
ISAEXEC_DIR = $(PROTODIR)$(MODULE_PREFIX)/bin/$(SUBDIR64) |
243d7ed7a10c
6991718 Removal of 32-bit X servers [PSARC/2010/382]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1095
diff
changeset
|
141 |
ISAEXEC_LINKS = $(LINKED_TO_ISAEXEC:%=$(ISAEXEC_DIR)/%) |
243d7ed7a10c
6991718 Removal of 32-bit X servers [PSARC/2010/382]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1095
diff
changeset
|
142 |
|
243d7ed7a10c
6991718 Removal of 32-bit X servers [PSARC/2010/382]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1095
diff
changeset
|
143 |
install_fix_paths_amd64_links: $(ISAEXEC_LINKS) |
963
7a4fced80e83
6962316 X proto area should more closely match packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
957
diff
changeset
|
144 |
|
1097
243d7ed7a10c
6991718 Removal of 32-bit X servers [PSARC/2010/382]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1095
diff
changeset
|
145 |
$(ISAEXEC_DIR): |
243d7ed7a10c
6991718 Removal of 32-bit X servers [PSARC/2010/382]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1095
diff
changeset
|
146 |
mkdir -p $@ |
963
7a4fced80e83
6962316 X proto area should more closely match packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
957
diff
changeset
|
147 |
|
1097
243d7ed7a10c
6991718 Removal of 32-bit X servers [PSARC/2010/382]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1095
diff
changeset
|
148 |
$(ISAEXEC_LINKS): $(ISAEXEC_DIR) |
963
7a4fced80e83
6962316 X proto area should more closely match packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
957
diff
changeset
|
149 |
@rm -f $@ |
1097
243d7ed7a10c
6991718 Removal of 32-bit X servers [PSARC/2010/382]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1095
diff
changeset
|
150 |
ln -s ../$(@F) $@ |