[86654] trunk/dports/devel/ld64
mfeiri at macports.org
mfeiri at macports.org
Mon Oct 31 00:53:13 PDT 2011
Revision: 86654
http://trac.macports.org/changeset/86654
Author: mfeiri at macports.org
Date: 2011-10-31 00:53:12 -0700 (Mon, 31 Oct 2011)
Log Message:
-----------
ld64: update to 127.2, use libunwind-headers, add livecheck, properly support darwin 11
Modified Paths:
--------------
trunk/dports/devel/ld64/Portfile
Removed Paths:
-------------
trunk/dports/devel/ld64/files/patch-MATH-ld.cpp.diff
trunk/dports/devel/ld64/files/patch-lldb_private-libunwind.diff
Modified: trunk/dports/devel/ld64/Portfile
===================================================================
--- trunk/dports/devel/ld64/Portfile 2011-10-31 07:33:50 UTC (rev 86653)
+++ trunk/dports/devel/ld64/Portfile 2011-10-31 07:53:12 UTC (rev 86654)
@@ -6,11 +6,11 @@
minimum_xcodeversions {10 3.2.3}
name ld64
-version 123.2
+version 127.2
categories devel
maintainers mfeiri
-homepage http://opensource.apple.com/source/ld64/
-master_sites http://opensource.apple.com/tarballs/ld64/
+homepage http://opensource.apple.com/source/${name}/
+master_sites http://opensource.apple.com/tarballs/${name}/
license APSL-2.0
depends_build port:llvm
universal_variant no
@@ -64,39 +64,34 @@
platform darwin 10 {
- svn.revision 110625
- svn.url http://llvm.org/svn/llvm-project/lldb/trunk/source/Plugins/Process/Utility/libunwind
- master_sites-append http://opensource.apple.com/source/dyld/dyld-132.13/include/mach-o/dyld_priv.h?txt&dummy=:dyld \
- http://opensource.apple.com/source/cctools/cctools-782/include/mach-o/arm/reloc.h?txt&dummy=:cctools
+ master_sites-append http://opensource.apple.com/source/dyld/dyld-195.5/include/mach-o/dyld_priv.h?txt&dummy=:dyld \
+ http://opensource.apple.com/source/cctools/cctools-806/include/mach-o/arm/reloc.h?txt&dummy=:cctools
distfiles-append dyld_priv.h:dyld reloc.h:cctools
extract.only ${distname}${extract.suffix}
checksums ${distname}${extract.suffix} \
- md5 0c5831bede86df596a233955831f0863 \
- sha1 dc5876b35fe9b76518b58472562ccbec45f6f1c0 \
- rmd160 551dcd0db5d403eb88033b53345be21c71445a6b \
+ md5 fceb0f082ad30c5b03ff357f97a93f53 \
+ sha1 df51258a75e4c5f0df185b99f74f7232d310f45e \
+ rmd160 8ee709341549a1944732daef6ebab7ef1acfcc6e \
dyld_priv.h \
- md5 b956b96e6a566691109692e11b59f67f \
- sha1 eb5daccff286a1154f29d0b3485218b198920f25 \
- rmd160 278d8f891b5171adbbb3c4975c44f5887bd43375 \
+ md5 b956b96e6a566691109692e11b59f67f \
+ sha1 eb5daccff286a1154f29d0b3485218b198920f25 \
+ rmd160 278d8f891b5171adbbb3c4975c44f5887bd43375 \
reloc.h \
- md5 6ce50950669d083aab458f196ec3a2fc \
- sha1 87f0265f0f6abefd1e2cf12fe29242fb219fd71f \
- rmd160 b9c6c4fcf7731a508b82dd09af81fa8b26caf3ef
+ md5 6ce50950669d083aab458f196ec3a2fc \
+ sha1 87f0265f0f6abefd1e2cf12fe29242fb219fd71f \
+ rmd160 b9c6c4fcf7731a508b82dd09af81fa8b26caf3ef
- patch.dir ${workpath}
- patchfiles patch-lldb_private-libunwind.diff
- xcode.target all
+ depends_build port:libunwind-headers
+ xcode.target all ObjectDump machocheck
xcode.configuration Release
xcode.destroot.path ${prefix}/bin
- xcode.build.settings HEADER_SEARCH_PATHS=${workpath}/libunwind/include
- xcode.destroot.settings HEADER_SEARCH_PATHS=${workpath}/libunwind/include
post-extract {
- system "cd ${workpath} && ${svn.cmd} ${svn.pre_args} ${svn.method} ${svn.url}@${svn.revision}"
- file mkdir ${workpath}/libunwind/include/mach-o/arm
- file rename ${workpath}/libunwind/src ${workpath}/libunwind/include/libunwind
- copy ${distpath}/dyld_priv.h ${workpath}/libunwind/include/mach-o/
- copy ${distpath}/reloc.h ${workpath}/libunwind/include/mach-o/arm/
+ file mkdir ${worksrcpath}/build/${xcode.configuration}/include/mach-o/arm
+ file copy ${worksrcpath}/src/ld/parsers ${worksrcpath}/build/${xcode.configuration}/include/
+ file copy ${distpath}/dyld_priv.h ${worksrcpath}/build/${xcode.configuration}/include/mach-o/
+ file copy ${distpath}/reloc.h ${worksrcpath}/build/${xcode.configuration}/include/mach-o/arm/
+
reinplace {s|/Developer/usr/lib|$(DEVELOPER_DIR)/usr/lib|g} \
${worksrcpath}/ld64.xcodeproj/project.pbxproj
reinplace "s|/usr/share/man/man1|${prefix}/share/man/man1|g" \
@@ -107,9 +102,6 @@
${worksrcpath}/ld64.xcodeproj/project.pbxproj
reinplace "s|\$(RC_ProjectSourceVersion)|${version}|g" \
${worksrcpath}/ld64.xcodeproj/project.pbxproj
- foreach f [glob ${workpath}/libunwind/include/libunwind/*.h*] {
- reinplace "s|lldb_private|libunwind|g" $f
- }
}
pre-build {
@@ -127,15 +119,73 @@
}
-if {${os.major} > 10} {
+platform darwin 11 {
+
+ master_sites-append http://opensource.apple.com/source/dyld/dyld-195.5/include/mach-o/dyld_priv.h?txt&dummy=:dyld \
+ http://opensource.apple.com/source/cctools/cctools-806/include/mach-o/arm/reloc.h?txt&dummy=:cctools
+ distfiles-append dyld_priv.h:dyld reloc.h:cctools
+ extract.only ${distname}${extract.suffix}
+ checksums ${distname}${extract.suffix} \
+ md5 fceb0f082ad30c5b03ff357f97a93f53 \
+ sha1 df51258a75e4c5f0df185b99f74f7232d310f45e \
+ rmd160 8ee709341549a1944732daef6ebab7ef1acfcc6e \
+ dyld_priv.h \
+ md5 b956b96e6a566691109692e11b59f67f \
+ sha1 eb5daccff286a1154f29d0b3485218b198920f25 \
+ rmd160 278d8f891b5171adbbb3c4975c44f5887bd43375 \
+ reloc.h \
+ md5 6ce50950669d083aab458f196ec3a2fc \
+ sha1 87f0265f0f6abefd1e2cf12fe29242fb219fd71f \
+ rmd160 b9c6c4fcf7731a508b82dd09af81fa8b26caf3ef
+
+ depends_build port:libunwind-headers
+ xcode.target all ObjectDump machocheck
+ xcode.configuration Release
+ xcode.destroot.path ${prefix}/bin
+
+ post-extract {
+ file mkdir ${worksrcpath}/build/${xcode.configuration}/include/mach-o/arm
+ file copy ${worksrcpath}/src/ld/parsers ${worksrcpath}/build/${xcode.configuration}/include/
+ file copy ${distpath}/dyld_priv.h ${worksrcpath}/build/${xcode.configuration}/include/mach-o/
+ file copy ${distpath}/reloc.h ${worksrcpath}/build/${xcode.configuration}/include/mach-o/arm/
+
+ reinplace {s|/Developer/usr/lib|$(DEVELOPER_DIR)/usr/lib|g} \
+ ${worksrcpath}/ld64.xcodeproj/project.pbxproj
+ reinplace "s|/usr/share/man/man1|${prefix}/share/man/man1|g" \
+ ${worksrcpath}/ld64.xcodeproj/project.pbxproj
+ reinplace "s|usr/share/man/man1|${prefix}/share/man/man1|g" \
+ ${worksrcpath}/ld64.xcodeproj/project.pbxproj
+ reinplace "s|/usr/local|${prefix}|g" \
+ ${worksrcpath}/ld64.xcodeproj/project.pbxproj
+ reinplace "s|\$(RC_ProjectSourceVersion)|${version}|g" \
+ ${worksrcpath}/ld64.xcodeproj/project.pbxproj
+ }
+
+ pre-build {
+ build.env OTHER_CFLAGS='[exec ${prefix}/bin/llvm-config --cflags]'
+ destroot.env OTHER_CFLAGS='[exec ${prefix}/bin/llvm-config --cflags]'
+ }
+ pre-destroot {
+ build.env OTHER_CFLAGS='[exec ${prefix}/bin/llvm-config --cflags]'
+ destroot.env OTHER_CFLAGS='[exec ${prefix}/bin/llvm-config --cflags]'
+ }
+
+ post-destroot {
+ file rename ${destroot}${prefix}/bin/libprunetrie.a ${destroot}${prefix}/lib/libprunetrie.a
+ }
+}
+
+
+if {${os.major} > 11} {
distfiles
build { }
destroot {
- file copy /usr/bin/ld ${destroot}${prefix}/bin
- file copy /usr/bin/rebase ${destroot}${prefix}/bin
- file copy /usr/share/man/man1/ld.1 ${destroot}${prefix}/share/man/man1
- file copy /usr/share/man/man1/rebase.1 ${destroot}${prefix}/share/man/man1
+ file link -symbolic "${destroot}${prefix}/bin/ld" "/usr/bin/ld"
+ file link -symbolic "${destroot}${prefix}/bin/rebase" "/usr/bin/rebase"
+ file link -symbolic "${destroot}${prefix}/share/man/man1/ld.1" "/usr/share/man/man1/ld.1"
+ file link -symbolic "${destroot}${prefix}/share/man/man1/rebase.1" "/usr/share/man/man1/rebase.1"
}
}
-livecheck.type none
+livecheck.type regex
+livecheck.regex "${name}-(\[\\d.\]+)"
Deleted: trunk/dports/devel/ld64/files/patch-MATH-ld.cpp.diff
===================================================================
--- trunk/dports/devel/ld64/files/patch-MATH-ld.cpp.diff 2011-10-31 07:33:50 UTC (rev 86653)
+++ trunk/dports/devel/ld64/files/patch-MATH-ld.cpp.diff 2011-10-31 07:53:12 UTC (rev 86654)
@@ -1,13 +0,0 @@
---- src/ld/ld.cpp 2010-01-26 20:07:02.000000000 +0100
-+++ src/ld/ld.cpp 2010-10-12 22:56:13.000000000 +0200
-@@ -21,10 +21,6 @@
- * @APPLE_LICENSE_HEADER_END@
- */
-
--// start temp HACK for cross builds
--extern "C" double log2 ( double );
--#define __MATH__
--// end temp HACK for cross builds
-
-
- #include <stdlib.h>
Deleted: trunk/dports/devel/ld64/files/patch-lldb_private-libunwind.diff
===================================================================
--- trunk/dports/devel/ld64/files/patch-lldb_private-libunwind.diff 2011-10-31 07:33:50 UTC (rev 86653)
+++ trunk/dports/devel/ld64/files/patch-lldb_private-libunwind.diff 2011-10-31 07:53:12 UTC (rev 86654)
@@ -1,55 +0,0 @@
---- libunwind/include/libunwind.h 2010-07-09 22:39:50.000000000 +0200
-+++ libunwind/include/libunwind.h 2010-08-20 22:29:08.000000000 +0200
-@@ -25,7 +25,6 @@
- #include <mach/mach_types.h>
- #include <Availability.h>
-
--namespace lldb_private {
-
- #pragma mark Error codes
-
-@@ -502,7 +501,6 @@
- };
-
-
--} // namespace lldb_private
-
-
- #endif
---- libunwind/include/mach-o/compact_unwind_encoding.h 2010-06-08 18:52:24.000000000 +0200
-+++ libunwind/include/mach-o/compact_unwind_encoding.h 2010-08-20 22:15:04.000000000 +0200
-@@ -14,7 +14,6 @@
-
- #include <stdint.h>
-
--namespace lldb_private {
-
- //
- // Each final linked mach-o image has an optional __TEXT, __unwind_info section.
-@@ -206,7 +205,6 @@
- UNWIND_X86_REG_EBP = 6,
- };
-
--}; // namespace lldb_private
-
- #endif
-
---- libunwind/include/libunwind/dwarf2.h 2011-04-01 23:33:31.000000000 +0200
-+++ libunwind/include/libunwind/dwarf2.h 2011-04-01 23:35:40.000000000 +0200
-@@ -17,7 +17,6 @@
- #ifndef __DWARF2__
- #define __DWARF2__
-
--namespace libunwind {
-
- // dwarf unwind instructions
- enum {
-@@ -236,7 +235,6 @@
- };
-
-
--}; // namespace libunwind
-
-
- #endif
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111031/0b274084/attachment.html>
More information about the macports-changes
mailing list