mesa: build fails on 10.6 applying static-strndup.patch

[dbevans (David B. Evans)]

Application of static-strndup.patch fails as follows

--->  Applying static-strndup.patch
DEBUG: Environment: 
CC_PRINT_OPTIONS='YES'
CC_PRINT_OPTIONS_FILE='/opt/local/var/macports/build/_opt_mports_dports_x11_mesa/mesa/work/.CC_PRINT_OPTIONS'
CPATH='/opt/local/include'
LIBRARY_PATH='/opt/local/lib'
MACOSX_DEPLOYMENT_TARGET='10.6'
DEBUG: Assembled command: 'cd "/opt/local/var/macports/build/_opt_mports_dports_x11_mesa/mesa/work/mesa-11.2.1" && /usr/bin/patch -p1'
DEBUG: Executing command line:  cd "/opt/local/var/macports/build/_opt_mports_dports_x11_mesa/mesa/work/mesa-11.2.1" && /usr/bin/patch -p1 < '/opt/mports/dports/x11/mesa/files/static-strndup.patch'
patching file src/mesa/drivers/dri/common/xmlconfig.c
Hunk #1 succeeded at 111 (offset 6 lines).
can't find file to patch at input line 30
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- a/src/glsl/linker.cpp	2015-12-27 23:31:13.000000000 -0800
|+++ b/src/glsl/linker.cpp	2015-12-27 23:34:01.000000000 -0800
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
1 out of 1 hunk ignored
patching file src/util/ralloc.c
Hunk #1 succeeded at 354 with fuzz 2 (offset 1 line).
Command failed:  cd "/opt/local/var/macports/build/_opt_mports_dports_x11_mesa/mesa/work/mesa-11.2.1" && /usr/bin/patch -p1 < '/opt/mports/dports/x11/mesa/files/static-strndup.patch'

[dbevans (David B. Evans)]

After update in r148437 mesa now fails with undefined strndup error in src/compiler/glsl/linker.cpp

libtool: compile:  /opt/local/bin/clang++-mp-3.4 -DPACKAGE_NAME=\"Mesa\" -DPACKAGE_TARNAME=\"mesa\" -DPACKAGE_VERSION=\"11.2.1\" "-DPACKAGE_STRING=\"Mesa 11.2.1\"" "-DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\"" -DPACKAGE_URL=\"\" -DPACKAGE=\"mesa\" -DVERSION=\"11.2.1\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DYYTEXT_POINTER=1 -DHAVE___BUILTIN_BSWAP32=1 -DHAVE___BUILTIN_BSWAP64=1 -DHAVE___BUILTIN_CLZ=1 -DHAVE___BUILTIN_CLZLL=1 -DHAVE___BUILTIN_CTZ=1 -DHAVE___BUILTIN_EXPECT=1 -DHAVE___BUILTIN_FFS=1 -DHAVE___BUILTIN_FFSLL=1 -DHAVE___BUILTIN_POPCOUNT=1 -DHAVE___BUILTIN_POPCOUNTLL=1 -DHAVE___BUILTIN_UNREACHABLE=1 -DHAVE_FUNC_ATTRIBUTE_CONST=1 -DHAVE_FUNC_ATTRIBUTE_FORMAT=1 -DHAVE_FUNC_ATTRIBUTE_MALLOC=1 -DHAVE_FUNC_ATTRIBUTE_PACKED=1 -DHAVE_FUNC_ATTRIBUTE_PURE=1 -DHAVE_FUNC_ATTRIBUTE_UNUSED=1 -DHAVE_FUNC_ATTRIBUTE_WARN_UNUSED_RESULT=1 -DHAVE_DLADDR=1 -DHAVE_PTHREAD_PRIO_INHERIT=1 -DHAVE_PTHREAD=1 -DHAVE_SHA1_IN_COMMONCRYPTO=1 -I. -I../../include -I../../src -I../../src/mapi -I../../src/mesa/ -I../../src/compiler/glsl -I../../src/compiler/glsl -I../../src/compiler/glsl/glcpp -I../../src/gallium/include -I../../src/gallium/auxiliary -I../../src/gtest/include -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DUSE_SSE41 -DNDEBUG -DHAVE_XLOCALE_H -DHAVE_SYS_SYSCTL_H -DHAVE_STRTOF -DHAVE_DLOPEN -DHAVE_POSIX_MEMALIGN -DHAVE_SHA1 -DGLX_USE_APPLEGL -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DGLX_ALIAS_UNSUPPORTED -DBUILDING_MESA -DMESA_EGL_NO_X11_HEADERS -fvisibility=hidden -Werror=pointer-arith -Werror=vla -pipe -Os -arch x86_64 -stdlib=libstdc++ -Wall -fno-strict-aliasing -fno-builtin-memcmp -Qunused-arguments -MT glsl/link_interface_blocks.lo -MD -MP -MF glsl/.deps/link_interface_blocks.Tpo -c glsl/link_interface_blocks.cpp  -fno-common -DPIC -o glsl/.libs/link_interface_blocks.o
glsl/linker.cpp:3577:11: error: use of undeclared identifier 'strndup'
   return strndup(name, name_size);
          ^
glsl/linker.cpp:3588:11: error: use of undeclared identifier 'strndup'
   return strndup(first_dot+1, strlen(first_dot) - 1);
          ^
2 errors generated.
make[3]: *** [glsl/linker.lo] Error 1

src/glsl/linker.cpp was moved to src/compiler/glsl/linker.cpp. static-strndup.patch needs further updating.

[dbevans (David B. Evans)]

Build log showing build failure on 10.6 after update of static-strndup.patch

[jeremyhu (Jeremy Huddleston Sequoia)]

Feel free to make the change yourself. My SL VM is a bit dated and is taking a while to update dependencies.

[dbevans (David B. Evans)]

Fix committed in r148447. Builds successfully on SL buildbot.