Pullup ticket #4041 - requested by tron multimedia/libvpx: MacOS fix Revisions pulled up: - multimedia/libvpx/distinfo 1.16 - multimedia/libvpx/patches/patch-build_make_gen_asm_deps.sh 1.1 ------------------------------------------------------------------- Module Name: pkgsrc Committed By: tron Date: Thu Jan 24 10:22:08 UTC 2013 Modified Files: pkgsrc/multimedia/libvpx: distinfo Added Files: pkgsrc/multimedia/libvpx/patches: patch-build_make_gen_asm_deps.sh Log Message: Add patch taken from "homebrew" project to fix the build with new version of Xcode under Mac OS X. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 pkgsrc/multimedia/libvpx/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/multimedia/libvpx/patches/patch-build_make_gen_asm_deps.shdiff -r1.15 -r1.15.2.1 pkgsrc/multimedia/libvpx/distinfo
(spz)
@@ -1,11 +1,12 @@ | @@ -1,11 +1,12 @@ | |||
1 | $NetBSD: distinfo,v 1.15 2012/12/23 10:33:33 ryoon Exp $ | 1 | $NetBSD: distinfo,v 1.15.2.1 2013/01/27 13:23:06 spz Exp $ | |
2 | 2 | |||
3 | SHA1 (libvpx-v1.1.0.tar.bz2) = 356af5f770c50cd021c60863203d8f30164f6021 | 3 | SHA1 (libvpx-v1.1.0.tar.bz2) = 356af5f770c50cd021c60863203d8f30164f6021 | |
4 | RMD160 (libvpx-v1.1.0.tar.bz2) = 6f462c1421a51af77d3401ea4c1eaf0dbeaf4791 | 4 | RMD160 (libvpx-v1.1.0.tar.bz2) = 6f462c1421a51af77d3401ea4c1eaf0dbeaf4791 | |
5 | Size (libvpx-v1.1.0.tar.bz2) = 1653485 bytes | 5 | Size (libvpx-v1.1.0.tar.bz2) = 1653485 bytes | |
6 | SHA1 (patch-aa) = 088d405d598800d4587eb20647347db1490a29f2 | 6 | SHA1 (patch-aa) = 088d405d598800d4587eb20647347db1490a29f2 | |
7 | SHA1 (patch-ab) = 468131a66c39d9b42080e62f6afa7cfd3657609b | 7 | SHA1 (patch-ab) = 468131a66c39d9b42080e62f6afa7cfd3657609b | |
8 | SHA1 (patch-ac) = e177ad5416b50b75fe026377d8033032e0ca63c3 | 8 | SHA1 (patch-ac) = e177ad5416b50b75fe026377d8033032e0ca63c3 | |
9 | SHA1 (patch-ad) = b8f64861bd03599bcc1db52ea970d8eb20331a33 | 9 | SHA1 (patch-ad) = b8f64861bd03599bcc1db52ea970d8eb20331a33 | |
10 | SHA1 (patch-af) = 01ad55ae9a30c079267b7a7af6b644d56a3e57e3 | 10 | SHA1 (patch-af) = 01ad55ae9a30c079267b7a7af6b644d56a3e57e3 | |
11 | SHA1 (patch-build_make_gen_asm_deps.sh) = 907d0a95ae4c5a8804354a85820eadf0858b62b7 | |||
11 | SHA1 (patch-configure) = 72587d9f326040dd50b55e8ea086a05713533cbe | 12 | SHA1 (patch-configure) = 72587d9f326040dd50b55e8ea086a05713533cbe |
$NetBSD: patch-build_make_gen_asm_deps.sh,v 1.1.2.2 2013/01/27 13:23:06 spz Exp $
Fix build problems under Mac OS X with Xcode 4.4 and newer. Patch
taken from here:
https://github.com/mxcl/homebrew/issues/12567#issuecomment-6434000
--- build/make/gen_asm_deps.sh.old 2012-05-09 00:14:00.000000000 +0100
+++ build/make/gen_asm_deps.sh 2013-01-24 10:02:54.000000000 +0000
@@ -42,7 +42,7 @@
[ -n "$srcfile" ] || show_help
sfx=${sfx:-asm}
-includes=$(LC_ALL=C egrep -i "include +\"?+[a-z0-9_/]+\.${sfx}" $srcfile |
+includes=$(LC_ALL=C egrep -i "include +\"[a-z0-9_/]+\.${sfx}" $srcfile |
perl -p -e "s;.*?([a-z0-9_/]+.${sfx}).*;\1;")
#" restore editor state
for inc in ${includes}; do