equal
deleted
inserted
replaced
35 $(MODULE_PKGTAIL_DEFAULT) MODULE_PKGTAIL:sh=basename $(pwd) |
35 $(MODULE_PKGTAIL_DEFAULT) MODULE_PKGTAIL:sh=basename $(pwd) |
36 MODULE_PKGTAIL_SET = yes |
36 MODULE_PKGTAIL_SET = yes |
37 |
37 |
38 ### Include common definitions |
38 ### Include common definitions |
39 include $(TOP)/open-src/common/Makefile.init |
39 include $(TOP)/open-src/common/Makefile.init |
40 |
|
41 # Xorg server source tarball to use sources from |
|
42 XORGSERVER_VERS=1.10.3 |
|
43 |
40 |
44 # Patches shared between Xorg & Xvnc builds |
41 # Patches shared between Xorg & Xvnc builds |
45 XORG_SOURCE_PATCHES:sh=sed '/^\#/ d' ../xorg/patch-list |
42 XORG_SOURCE_PATCHES:sh=sed '/^\#/ d' ../xorg/patch-list |
46 |
43 |
47 SERVER_MODULES_DIR='$(X11_SERVERMODS_DIR)' |
44 SERVER_MODULES_DIR='$(X11_SERVERMODS_DIR)' |
113 # Environment variable options to use when building |
110 # Environment variable options to use when building |
114 # - PATH - include /usr/sbin for dtrace command (needed for building probes) |
111 # - PATH - include /usr/sbin for dtrace command (needed for building probes) |
115 MODTYPE_BUILD_ENV= PATH=$(PATH):/usr/sbin \ |
112 MODTYPE_BUILD_ENV= PATH=$(PATH):/usr/sbin \ |
116 LD_LIBRARY_PATH=$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR):$(PROTODIR)$(X11_DIR)/lib$(ARCHLIBSUBDIR) |
113 LD_LIBRARY_PATH=$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR):$(PROTODIR)$(X11_DIR)/lib$(ARCHLIBSUBDIR) |
117 |
114 |
|
115 # Mark packages as only compatible with the current server minor release series, |
|
116 # since Xorg tends to break ABI's in each minor release train (1.8, 1.9, etc.) |
|
117 MODTYPE_ATTRDATA_COMMANDS = @$(START_CMD_ECHO) ; \ |
|
118 print "depend fmri=pkg:/x11/server/xserver-common@$(MIN_XSERVER_VERS) type=require" >> $@ ; \ |
|
119 print "depend fmri=pkg:/x11/server/xorg@$(NEXT_XSERVER_VERS) type=exclude" >> $@ |
|
120 |
118 ### Include common rulesets |
121 ### Include common rulesets |
119 include $(TOP)/open-src/common/Makefile.inc |
122 include $(TOP)/open-src/common/Makefile.inc |
120 |
123 |
121 # Fix paths in proto area to match paths in packages / installed systems |
124 # Fix paths in proto area to match paths in packages / installed systems |
122 install_fix_paths: install_fix_paths_$(MACH) |
125 install_fix_paths: install_fix_paths_$(MACH) |