open-src/xserver/Makefile.inc
author Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
Mon, 14 Mar 2011 15:37:30 -0700
changeset 1088 1c99106ccbe0
parent 1030 0738233d0472
child 1095 f3ae5df34b0b
permissions -rw-r--r--
6983602 Xorg 1.9 integration [PSARC/2011/008]
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
#
1088
1c99106ccbe0 6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1030
diff changeset
     3
# Copyright (c) 2007, 2011, 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
235
06772554f851 6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    41
# Xorg server source tarball to use sources from
1088
1c99106ccbe0 6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1030
diff changeset
    42
XORGSERVER_VERS=1.9.4
235
06772554f851 6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    43
1088
1c99106ccbe0 6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1030
diff changeset
    44
# 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
    45
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
    46
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
    47
SERVER_MODULES_DIR='$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir)'
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
    48
DRI_MODULES_DIR='$(X11_SERVERMODS_DIR)/dri$(SERVERMOD_subdir)'
235
06772554f851 6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    49
947
ef9da9d336f5 6950022 X man page cleanups
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    50
# Changes to apply to man pages
ef9da9d336f5 6950022 X man page cleanups
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    51
MODTYPE_SUNTOUCH_MAN_FLAGS= -p $(MODULE_PREFIX)/bin/
ef9da9d336f5 6950022 X man page cleanups
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    52
235
06772554f851 6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    53
# 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
    54
XSERVER_CONFIG_OPTS_COMMON = \
06772554f851 6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    55
	--bindir='$${exec_prefix}/bin/$(ARCHBINSUBDIR)' \
851
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
    56
	--docdir='$(X11_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
851
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
    74
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
    75
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
    76
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
    77
493
f43507b5737d 6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 371
diff changeset
    78
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
    79
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
    80
f43507b5737d 6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 371
diff changeset
    81
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
    82
	-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
    83
	-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
    84
	-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
    85
	-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
    86
	-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
    87
	$(DPMS_DEFINES) -DSUNSOFT -DTSOL \
f43507b5737d 6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 371
diff changeset
    88
	$(MODTYPE_CPPFLAGS_$(MODULE_COMPILER))
f43507b5737d 6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 371
diff changeset
    89
235
06772554f851 6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    90
# 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
    91
#  - 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
    92
#    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
    93
#  - 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
    94
MODTYPE_CONFIG_ENV = \
235
06772554f851 6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    95
	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
    96
	PATH=$(PATH):/usr/sbin
06772554f851 6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    97
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
    98
# 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
    99
# 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
   100
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
   101
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
   102
493
f43507b5737d 6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 371
diff changeset
   103
MODTYPE_CFLAGS=$(PROG_CFLAGS)
f43507b5737d 6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 371
diff changeset
   104
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
   105
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
   106
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
   107
XSERVER_LDFLAGS = \
493
f43507b5737d 6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 371
diff changeset
   108
	-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
371
d0a78a85764b 6677427 Mass minor update to X.Org upstream tarballs
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 235
diff changeset
   109
	-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
d0a78a85764b 6677427 Mass minor update to X.Org upstream tarballs
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 235
diff changeset
   110
	-L$(PROTODIR)$(X11_DIR)/lib$(ARCHLIBSUBDIR) \
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
   111
	-R$(X11_LIB_DIR)$(ARCHLIBSUBDIR)
235
06772554f851 6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   112
493
f43507b5737d 6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 371
diff changeset
   113
MODTYPE_BUILD_32_FLAGS=ARCHBINSUBDIR="$(SUBDIR32)"
235
06772554f851 6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   114
493
f43507b5737d 6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 371
diff changeset
   115
MODTYPE_BUILD_64_FLAGS_sparc=ARCHBINSUBDIR=""
f43507b5737d 6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 371
diff changeset
   116
MODTYPE_BUILD_64_FLAGS_i386=ARCHBINSUBDIR="$(SUBDIR64)"
f43507b5737d 6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 371
diff changeset
   117
MODTYPE_BUILD_64_FLAGS=$(MODTYPE_BUILD_64_FLAGS_$(MACH))
235
06772554f851 6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   118
06772554f851 6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   119
# 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
   120
#  - 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
   121
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
   122
	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
   123
957
c2f4cfc53173 6955153 RPATH and RUNPATH violations in xorg package
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 952
diff changeset
   124
MODTYPE_ADD_CONFIGURE_TARGETS = fix-moduledirs
c2f4cfc53173 6955153 RPATH and RUNPATH violations in xorg package
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 952
diff changeset
   125
493
f43507b5737d 6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 371
diff changeset
   126
### Include common rulesets
967
efbd0ee6805d 6963229 build race conditions and other makefile issues
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 965
diff changeset
   127
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
   128
1030
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   129
# Fix paths in proto area to match paths in packages / installed systems
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   130
install_fix_paths: install_fix_paths_$(MACH)_$(BUILD_TYPE)
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   131
install_fix_paths_$(MACH)_: $(BUILD_TYPES:%=install_fix_paths_$(MACH)_%)
963
7a4fced80e83 6962316 X proto area should more closely match packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 957
diff changeset
   132
1030
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   133
# When both 32-bit & 64-bit are built, only one copy of the programs in
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   134
# NOT_LINKED_TO_ISAEXEC are needed, so move the 32-bit copy to /usr/bin
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   135
# instead of linking to isaexec, and delete the 64-bit copy.
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   136
UTILS_IN_BIN = $(NOT_LINKED_TO_ISAEXEC:%=$(PROTODIR)$(MODULE_PREFIX)/bin/%)
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   137
UTILS_IN_ARCHBIN = \
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   138
 $(NOT_LINKED_TO_ISAEXEC:%=$(PROTODIR)$(MODULE_PREFIX)/bin/$(ARCHBINSUBDIR)/%)
963
7a4fced80e83 6962316 X proto area should more closely match packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 957
diff changeset
   139
1030
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   140
install_fix_paths_use_utilities: $(INSTALL_FIX_PATHS_DEPS)
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   141
	rm -f $(UTILS_IN_BIN)
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   142
	mv -f $(UTILS_IN_ARCHBIN) $(PROTODIR)$(MODULE_PREFIX)/bin
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
   143
1030
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   144
install_fix_paths_remove_utilities: $(INSTALL_FIX_PATHS_DEPS)
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   145
	rm -f $(UTILS_IN_ARCHBIN)
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
   146
1030
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   147
install_fix_paths_i386_32: install_fix_paths_use_utilities
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   148
install_fix_paths_i386_64: install_fix_paths_remove_utilities
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   149
install_fix_paths_sparc_64: # not needed
963
7a4fced80e83 6962316 X proto area should more closely match packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 957
diff changeset
   150
1030
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   151
# When both 32-bit & 64-bit are built, we install both versions of the 
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   152
# programs in LINKED_TO_ISAEXEC, and use isaexec to pick 32-bit or 64-bit
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   153
# binaries to execute.
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   154
ISAEXEC_LINKS = $(LINKED_TO_ISAEXEC:%=$(PROTODIR)$(MODULE_PREFIX)/bin/%)
963
7a4fced80e83 6962316 X proto area should more closely match packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 957
diff changeset
   155
1030
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   156
$(PROTODIR)/usr/lib/isaexec:
963
7a4fced80e83 6962316 X proto area should more closely match packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 957
diff changeset
   157
	@rm -f $@
1030
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   158
	cp -pf /usr/lib/isaexec $@
963
7a4fced80e83 6962316 X proto area should more closely match packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 957
diff changeset
   159
1030
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   160
$(ISAEXEC_LINKS): $(PROTODIR)/usr/lib/isaexec
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   161
	@rm -f $@
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   162
	ln $(PROTODIR)/usr/lib/isaexec $@
963
7a4fced80e83 6962316 X proto area should more closely match packages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 957
diff changeset
   163
1030
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   164
install_fix_isaexec: $(ISAEXEC_LINKS)
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   165
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   166
install_fix_paths_i386_32: install_fix_isaexec
0738233d0472 6996111 validate_pkg failures introduced by VNC & DMX putbacks in snv_152
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1026
diff changeset
   167
# Not needed in 64-bit builds on sparc or x86