Opened 6 years ago

Closed 6 years ago

#48602 closed defect (fixed)

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

Reported by: udbraumann Owned by: macports-tickets@…
Priority: Normal Milestone:
Component: ports Version: 2.3.3
Keywords: Cc: jeremyhu (Jeremy Huddleston Sequoia), larryv (Lawrence Velázquez), fracai
Port: clang-3.7

Description

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

Attachments (2)

main.log.gz (271.4 KB) - added by udbraumann 6 years ago.
clang_darwin.mk.rej (1.6 KB) - added by udbraumann 6 years ago.

Download all attachments as: .zip

Change History (7)

Changed 6 years ago by udbraumann

Attachment: main.log.gz added

Changed 6 years ago by udbraumann

Attachment: clang_darwin.mk.rej added

comment:1 Changed 6 years ago by 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.

comment:2 Changed 6 years ago by fracai

Cc: arno@… added

Cc Me!

comment:3 Changed 6 years ago by ryandesign (Ryan Schmidt)

Did r140253 fix this?

comment:4 in reply to:  3 Changed 6 years ago by udbraumann

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

comment:5 Changed 6 years ago by jeremyhu (Jeremy Huddleston Sequoia)

Resolution: fixed
Status: newclosed
Note: See TracTickets for help on using tickets.