clang-3.7 @3.7-r245076_0 fails applying leopard-no-asan.patch on 10.6.8

[udbraumann]

While upgrading from clang 3.7-r241984_0 to 3.7-r245076_0 I got some trouble during the patching phase:

...
:info:patch --->  Applying leopard-no-asan.patch
:debug:patch Environment:
CC_PRINT_OPTIONS='YES'
CC_PRINT_OPTIONS_FILE='/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_lang_llvm-3.7/clang-3.7/work/.CC_PRINT_OPTIONS'
CPATH='/opt/local/include'
LIBRARY_PATH='/opt/local/lib'
MACOSX_DEPLOYMENT_TARGET='10.6'
:debug:patch Assembled command: 'cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_lang_llvm-3.7/clang-3.7/work/release_37" && /usr/bin/patch -p1'
:debug:patch Executing command line:  cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_lang_llvm-3.7/clang-3.7/work/release_37" && /usr/bin/patch -p1 < '/opt/local/var/macports/sources/rsync.macports.org/release/ports/lang/llvm-3.7/files/leopard-no-asan.patch'
:info:patch patching file projects/compiler-rt/make/platform/clang_darwin.mk
:info:patch Hunk #1 FAILED at 119.
:info:patch 1 out of 1 hunk FAILED -- saving rejects to file projects/compiler-rt/make/platform/clang_darwin.mk.rej
:info:patch patching file tools/clang/runtime/compiler-rt/Makefile
:info:patch Command failed:  cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_lang_llvm-3.7/clang-3.7/work/release_37" && /usr/bin/patch -p1 < '/opt/local/var/macports/sources/rsync.macports.org/release/ports/lang/llvm-3.7/files/leopard-no-asan.patch'
:info:patch Exit code: 1
:error:patch org.macports.patch for port clang-3.7 returned: command execution failed
...

I attach both main.log and clang_darwin.mk.rej

[jeremyhu (Jeremy Huddleston Sequoia)]

Ah, yeah. Likely the x86_64h patch collided with it. sigh. I probably won't have time to look at this until next week, so if you can provide the updated patch, I'd appreciate it.

[fracai]

Cc Me!

[ryandesign (Ryan Carsten Schmidt)]

Did r140253 fix this?

[udbraumann]

Yes, great, patching works now, subsequent configuring and building work as well, thanks!