[131399] trunk/dports/devel/cctools
jeremyhu at macports.org
jeremyhu at macports.org
Sat Jan 10 21:34:59 PST 2015
Revision: 131399
https://trac.macports.org/changeset/131399
Author: jeremyhu at macports.org
Date: 2015-01-10 21:34:59 -0800 (Sat, 10 Jan 2015)
Log Message:
-----------
cctools: Drop dependency on ld64
Modified Paths:
--------------
trunk/dports/devel/cctools/Portfile
Added Paths:
-----------
trunk/dports/devel/cctools/files/cctools-806-prunetrie.patch
trunk/dports/devel/cctools/files/cctools-862-prunetrie.patch
Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- trunk/dports/devel/cctools/Portfile 2015-01-11 04:47:41 UTC (rev 131398)
+++ trunk/dports/devel/cctools/Portfile 2015-01-11 05:34:59 UTC (rev 131399)
@@ -5,6 +5,8 @@
name cctools
# OS X 10.10.0
version 862
+set ld64_version 236.3
+revision 1
categories devel
platforms darwin
maintainers jeremyhu openmaintainer
@@ -16,28 +18,39 @@
similar to binutils on other platforms.
homepage http://opensource.apple.com/source/${name}/
-master_sites http://opensource.apple.com/tarballs/${name}/
+master_sites http://opensource.apple.com/tarballs/${name} \
+ http://opensource.apple.com/tarballs/ld64
-checksums rmd160 21ca74a5f9d04c37c2310f107e21a0f3713360dd \
+distfiles ld64-${ld64_version}.tar.gz ${name}-${version}.tar.gz
+
+checksums ld64-236.3.tar.gz \
+ rmd160 6a3f44aa9ae57a60d2cff5b3d47be7972ad83029 \
+ sha256 8ef36729b643201081ab45ebd8586ede8f9968bc17614b679a940faa82875ca6 \
+ cctools-862.tar.gz \
+ rmd160 21ca74a5f9d04c37c2310f107e21a0f3713360dd \
sha256 1bf29f620b91c901ad3116b47738ab5076c1aed75d13869cd3bc7f067b4aaadb
-depends_build port:ld64
+depends_build port:libunwind-headers
-patchfiles cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch PR-12400897.patch
+patchfiles cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch PR-12400897.patch cctools-862-prunetrie.patch
variant universal {}
if {${os.arch} eq "powerpc" || ${os.major} < 9} {
# XCode 4.1
version 806
- revision 3
- distname cctools-${version}
- checksums rmd160 91c0a3f192f1eed60b64ef5a0a06918d0ce0b0c9 \
+ revision 4
+ distfiles ld64-${ld64_version}.tar.gz ${name}-${version}.tar.gz
+ checksums ld64-236.3.tar.gz \
+ rmd160 6a3f44aa9ae57a60d2cff5b3d47be7972ad83029 \
+ sha256 8ef36729b643201081ab45ebd8586ede8f9968bc17614b679a940faa82875ca6 \
+ cctools-806.tar.gz \
+ rmd160 91c0a3f192f1eed60b64ef5a0a06918d0ce0b0c9 \
sha256 6116c06920112c634f6df2fa8b2f171ee3b90ff2176137da5856336695a6a676
supported_archs ppc i386 x86_64
- patchfiles-delete cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch
- patchfiles-append cctools-806-lto.patch PR-9087924.patch PR-9830754.patch cctools-822-no-lto.patch PR-11136237.patch PR-12475288.patch
+ patchfiles-delete cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch cctools-862-prunetrie.patch
+ patchfiles-append cctools-806-lto.patch PR-9087924.patch PR-9830754.patch cctools-822-no-lto.patch PR-11136237.patch PR-12475288.patch cctools-806-prunetrie.patch
} else {
if {${os.major} < 11} {
patchfiles-append snowleopard-strnlen.patch
@@ -77,6 +90,11 @@
use_configure no
destroot.args DSTROOT=${destroot}${prefix} RC_ProjectSourceVersion=${version}
+post-extract {
+ file copy ${worksrcpath}/../ld64-${ld64_version}/src/other/PruneTrie.cpp ${worksrcpath}/misc
+ system "touch ${worksrcpath}/../ld64-${ld64_version}/src/abstraction/configure.h"
+}
+
post-patch {
# We don't want to build cctools ld. We want to use ld64
reinplace "/^SUBDIRS_32/s/ld//" ${worksrcpath}/Makefile
@@ -124,10 +142,11 @@
USE_DEPENDENCY_FILE=NO \
BUILD_DYLIBS=NO \
CC="${configure.cc} ${configure.cflags}" \
- CXX="${configure.cxx} ${configure.cxxflags}" \
+ CXX="${configure.cxx} ${configure.cxxflags} -I${worksrcpath}/../ld64-${ld64_version}/src/abstraction -I${prefix}/Developer/SDKs/Darwin${os.major}.sdk/usr/include" \
CXXLIB="${cxx_stdlibflags}" \
+ TRIE=-DTRIE_SUPPORT \
RC_ARCHS="[get_canonical_archs]" \
- SDK="-I${prefix}/include"
+ SDK="-I${prefix}/include -I${worksrcpath}/../ld64-${ld64_version}/src/other"
if {${llvm_version} != ""} {
build.args-append \
@@ -139,14 +158,6 @@
LTO= \
RC_CFLAGS="[get_canonical_archflags]"
}
-
- if {[file exists ${prefix}/lib/libprunetrie.a]} {
- build.args-append \
- TRIE=-DTRIE_SUPPORT
- } else {
- build.args-append \
- TRIE=
- }
}
pre-destroot {
@@ -155,10 +166,11 @@
USE_DEPENDENCY_FILE=NO \
BUILD_DYLIBS=NO \
CC="${configure.cc} ${configure.cflags}" \
- CXX="${configure.cxx} ${configure.cxxflags}" \
+ CXX="${configure.cxx} ${configure.cxxflags} -I${worksrcpath}/../ld64-${ld64_version}/src/abstraction -I${prefix}/Developer/SDKs/Darwin${os.major}.sdk/usr/include" \
CXXLIB="${cxx_stdlibflags}" \
+ TRIE=-DTRIE_SUPPORT \
RC_ARCHS="[get_canonical_archs]" \
- SDK="-I${prefix}/include"
+ SDK="-I${prefix}/include -I${worksrcpath}/../ld64-${ld64_version}/src/other"
if {${llvm_version} != ""} {
destroot.args-append \
@@ -170,14 +182,6 @@
LTO= \
RC_CFLAGS="[get_canonical_archflags]"
}
-
- if {[file exists ${prefix}/lib/libprunetrie.a]} {
- destroot.args-append \
- TRIE=-DTRIE_SUPPORT
- } else {
- destroot.args-append \
- TRIE=
- }
}
platform macosx {
Added: trunk/dports/devel/cctools/files/cctools-806-prunetrie.patch
===================================================================
--- trunk/dports/devel/cctools/files/cctools-806-prunetrie.patch (rev 0)
+++ trunk/dports/devel/cctools/files/cctools-806-prunetrie.patch 2015-01-11 05:34:59 UTC (rev 131399)
@@ -0,0 +1,32 @@
+--- misc/Makefile.orig 2015-01-10 20:43:30.000000000 -0800
++++ misc/Makefile 2015-01-10 20:51:27.000000000 -0800
+@@ -214,12 +214,16 @@ indr.NEW: indr.o vers.o
+ $(CC) $(RC_CFLAGS) $(SDK) -o $(SYMROOT)/indr.NEW \
+ $(OFILE_DIR)/indr.private.o
+
+-strip.NEW: strip.o vers.o
++strip.NEW: strip.o vers.o PruneTrie.o
+ $(CC) $(RC_CFLAGS) -nostdlib -r \
+ -o $(OBJROOT)/strip.private.o \
+ $(OFILE_DIR)/strip.o $(OFILE_DIR)/vers.o $(LIBSTUFF)
+ $(CXX) $(RC_CFLAGS) $(SDK) -o $(SYMROOT)/strip.NEW \
+- $(OFILE_DIR)/strip.private.o $(LIB_PRUNETRIE)
++ $(OFILE_DIR)/strip.private.o $(OFILE_DIR)/PruneTrie.o
++
++PruneTrie.o: PruneTrie.cpp
++ $(CXX) $(CXXFLAGS) $(RC_CFLAGS) $(SDK) $(CXXLIB) -c -o \
++ $(OBJROOT)/PruneTrie.o $(SRCROOT)/PruneTrie.cpp
+
+ nmedit.NEW: nmedit.o vers.o
+ $(CC) $(RC_CFLAGS) -nostdlib -r \
+--- misc/strip.c.orig 2015-01-10 21:25:17.000000000 -0800
++++ misc/strip.c 2015-01-10 21:25:40.000000000 -0800
+@@ -47,7 +47,7 @@
+ #include "stuff/unix_standard_mode.h"
+ #include "stuff/execute.h"
+ #ifdef TRIE_SUPPORT
+-#include <mach-o/prune_trie.h>
++#include "prune_trie.h"
+ #endif /* TRIE_SUPPORT */
+
+ /* These are set from the command line arguments */
Added: trunk/dports/devel/cctools/files/cctools-862-prunetrie.patch
===================================================================
--- trunk/dports/devel/cctools/files/cctools-862-prunetrie.patch (rev 0)
+++ trunk/dports/devel/cctools/files/cctools-862-prunetrie.patch 2015-01-11 05:34:59 UTC (rev 131399)
@@ -0,0 +1,34 @@
+--- misc/Makefile.orig 2015-01-10 20:43:30.000000000 -0800
++++ misc/Makefile 2015-01-10 20:51:27.000000000 -0800
+@@ -201,14 +201,18 @@ indr.NEW: indr.o
+ $(OFILE_DIR)/indr.private.o
+ $(DSYMUTIL) $(SYMROOT)/indr.NEW
+
+-strip.NEW: strip.o
++strip.NEW: strip.o PruneTrie.o
+ $(CC) $(RC_CFLAGS) -nostdlib -r \
+ -o $(OBJROOT)/strip.private.o \
+ $(OFILE_DIR)/strip.o $(LIBSTUFF)
+ $(CXX) $(RC_CFLAGS) $(SDK) -o $(SYMROOT)/strip.NEW \
+- $(OFILE_DIR)/strip.private.o $(LIB_PRUNETRIE) $(CXXLIB)
++ $(OFILE_DIR)/strip.private.o $(OFILE_DIR)/PruneTrie.o $(CXXLIB)
+ $(DSYMUTIL) $(SYMROOT)/strip.NEW
+
++PruneTrie.o: PruneTrie.cpp
++ $(CXX) $(CXXFLAGS) $(RC_CFLAGS) $(SDK) $(CXXLIB) -c -o \
++ $(OBJROOT)/PruneTrie.o $(SRCROOT)/PruneTrie.cpp
++
+ nmedit.NEW: nmedit.o
+ $(CC) $(RC_CFLAGS) -nostdlib -r \
+ -o $(OBJROOT)/nmedit.private.o \
+--- misc/strip.c.orig 2015-01-10 21:25:17.000000000 -0800
++++ misc/strip.c 2015-01-10 21:25:40.000000000 -0800
+@@ -47,7 +47,7 @@
+ #include "stuff/unix_standard_mode.h"
+ #include "stuff/execute.h"
+ #ifdef TRIE_SUPPORT
+-#include <mach-o/prune_trie.h>
++#include "prune_trie.h"
+ #endif /* TRIE_SUPPORT */
+
+ /* These are set from the command line arguments */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150110/45dfada1/attachment.html>
More information about the macports-changes
mailing list