Skip to content

Commit aa6ab03

Browse files
committed
Merge branch 'bs/solaris-10-and-11'
Add settings for Solaris 10 & 11. * bs/solaris-10-and-11: config.mak.uname: update settings for Solaris 10 and 11
2 parents 19612d0 + 47e7dee commit aa6ab03

File tree

1 file changed

+25
-3
lines changed

1 file changed

+25
-3
lines changed

config.mak.uname

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,6 @@ ifeq ($(uname_S),SunOS)
190190
SHELL_PATH = /bin/bash
191191
SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin
192192
HAVE_ALLOCA_H = YesPlease
193-
NO_STRCASESTR = YesPlease
194-
NO_MEMMEM = YesPlease
195-
NO_MKDTEMP = YesPlease
196193
NO_REGEX = YesPlease
197194
NO_MSGFMT_EXTENDED_OPTIONS = YesPlease
198195
HAVE_DEV_TTY = YesPlease
@@ -202,7 +199,10 @@ ifeq ($(uname_S),SunOS)
202199
NO_IPV6 = YesPlease
203200
NO_SOCKADDR_STORAGE = YesPlease
204201
NO_UNSETENV = YesPlease
202+
NO_MKDTEMP = YesPlease
203+
NO_MEMMEM = YesPlease
205204
NO_SETENV = YesPlease
205+
NO_STRCASESTR = YesPlease
206206
NO_STRLCPY = YesPlease
207207
NO_STRTOUMAX = YesPlease
208208
GIT_TEST_CMP = cmp
@@ -212,23 +212,45 @@ ifeq ($(uname_S),SunOS)
212212
NO_IPV6 = YesPlease
213213
NO_SOCKADDR_STORAGE = YesPlease
214214
NO_UNSETENV = YesPlease
215+
NO_MKDTEMP = YesPlease
216+
NO_MEMMEM = YesPlease
215217
NO_SETENV = YesPlease
218+
NO_STRCASESTR = YesPlease
216219
NO_STRLCPY = YesPlease
217220
NO_STRTOUMAX = YesPlease
218221
GIT_TEST_CMP = cmp
219222
endif
220223
ifeq ($(uname_R),5.8)
221224
NO_UNSETENV = YesPlease
225+
NO_MKDTEMP = YesPlease
226+
NO_MEMMEM = YesPlease
222227
NO_SETENV = YesPlease
228+
NO_STRCASESTR = YesPlease
223229
NO_STRTOUMAX = YesPlease
224230
GIT_TEST_CMP = cmp
225231
endif
226232
ifeq ($(uname_R),5.9)
227233
NO_UNSETENV = YesPlease
234+
NO_MKDTEMP = YesPlease
235+
NO_MEMMEM = YesPlease
228236
NO_SETENV = YesPlease
237+
NO_STRCASESTR = YesPlease
229238
NO_STRTOUMAX = YesPlease
230239
GIT_TEST_CMP = cmp
231240
endif
241+
ifeq ($(uname_R),5.10)
242+
NO_UNSETENV = YesPlease
243+
NO_MKDTEMP = YesPlease
244+
NO_MEMMEM = YesPlease
245+
NO_SETENV = YesPlease
246+
NO_STRCASESTR = YesPlease
247+
GIT_TEST_CMP = cmp
248+
endif
249+
ifeq ($(uname_R),5.11)
250+
NO_UNSETENV = YesPlease
251+
NO_SETENV = YesPlease
252+
GIT_TEST_CMP = cmp
253+
endif
232254
INSTALL = /usr/ucb/install
233255
TAR = gtar
234256
BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__

0 commit comments

Comments
 (0)