Mercurial > hg > truffle
comparison make/solaris/makefiles/saproc.make @ 3354:357d1f583599
7043298: 4/4 fix for 7028172 causes "Label too long: ..." error message
Summary: Use '-e' version of sed expressions. Clarify and fix comments
Reviewed-by: never, acorn
author | dcubed |
---|---|
date | Wed, 11 May 2011 08:59:46 -0700 |
parents | 405c634f4aaa |
children | 4aa5974a06dd |
comparison
equal
deleted
inserted
replaced
3331:ededdaaf8ca5 | 3354:357d1f583599 |
---|---|
55 else | 55 else |
56 SA_LFLAGS += -mt -xnolib -norunpath | 56 SA_LFLAGS += -mt -xnolib -norunpath |
57 endif | 57 endif |
58 | 58 |
59 # The libproc Pstack_iter() interface changed in Nevada-B159. | 59 # The libproc Pstack_iter() interface changed in Nevada-B159. |
60 # This logic needs to match | 60 # Use 'uname -r -v' to determine the Solaris version as per |
61 # Solaris Nevada team request. This logic needs to match: | |
61 # agent/src/os/solaris/proc/saproc.cpp: set_has_newer_Pstack_iter(): | 62 # agent/src/os/solaris/proc/saproc.cpp: set_has_newer_Pstack_iter(): |
62 # - skip SunOS 4 or older | 63 # - skip SunOS 4 or older |
63 # - skip Solaris 10 or older | 64 # - skip Solaris 10 or older |
64 # - skip two digit Nevada builds | 65 # - skip two digit internal Nevada builds |
65 # - skip three digit Nevada builds thru 149 | 66 # - skip three digit internal Nevada builds thru 149 |
66 # - skip Nevada builds 150-158 | 67 # - skip internal Nevada builds 150-158 |
68 # - if not skipped, print define for Nevada-B159 or later | |
67 SOLARIS_11_B159_OR_LATER := \ | 69 SOLARIS_11_B159_OR_LATER := \ |
68 $(shell uname -r -v \ | 70 $(shell uname -r -v \ |
69 | sed -n ' \ | 71 | sed -n \ |
70 /^[0-3]\. /b \ | 72 -e '/^[0-4]\. /b' \ |
71 /^5\.[0-9] /b \ | 73 -e '/^5\.[0-9] /b' \ |
72 /^5\.10 /b \ | 74 -e '/^5\.10 /b' \ |
73 / snv_[0-9][0-9]$/b \ | 75 -e '/ snv_[0-9][0-9]$/b' \ |
74 / snv_[01][0-4][0-9]$/b \ | 76 -e '/ snv_[01][0-4][0-9]$/b' \ |
75 / snv_15[0-8]$/b \ | 77 -e '/ snv_15[0-8]$/b' \ |
76 s/.*/-DSOLARIS_11_B159_OR_LATER/p \ | 78 -e 's/.*/-DSOLARIS_11_B159_OR_LATER/' \ |
77 ') | 79 -e 'p' \ |
80 ) | |
78 | 81 |
79 # Uncomment the following to simulate building on Nevada-B159 or later | 82 # Uncomment the following to simulate building on Nevada-B159 or later |
80 # when actually building on Nevada-B158 or earlier: | 83 # when actually building on Nevada-B158 or earlier: |
81 #SOLARIS_11_B159_OR_LATER=-DSOLARIS_11_B159_OR_LATER | 84 #SOLARIS_11_B159_OR_LATER=-DSOLARIS_11_B159_OR_LATER |
82 | 85 |