[91498] trunk/dports/devel/cctools
jeremyhu at macports.org
jeremyhu at macports.org
Tue Apr 3 11:13:02 PDT 2012
Revision: 91498
https://trac.macports.org/changeset/91498
Author: jeremyhu at macports.org
Date: 2012-04-03 11:13:02 -0700 (Tue, 03 Apr 2012)
Log Message:
-----------
cctools: Build fix for Leopard and remove unused patches
Modified Paths:
--------------
trunk/dports/devel/cctools/Portfile
Added Paths:
-----------
trunk/dports/devel/cctools/files/PR-11136237-698.1.patch
Removed Paths:
-------------
trunk/dports/devel/cctools/files/patch-ld_ld.c.diff
trunk/dports/devel/cctools/files/patch-libmacho_Makefile.diff
trunk/dports/devel/cctools/files/patch-misc_Makefile.diff
Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- trunk/dports/devel/cctools/Portfile 2012-04-03 18:02:30 UTC (rev 91497)
+++ trunk/dports/devel/cctools/Portfile 2012-04-03 18:13:02 UTC (rev 91498)
@@ -39,6 +39,7 @@
post-patch {
# We don't want to build cctools ld. We want to use ld64
reinplace "/^SUBDIRS_32/s/ld//" ${worksrcpath}/Makefile
+ reinplace "/^COMMON_SUBDIRS/s/ ld / /" ${worksrcpath}/Makefile
# Use our chosen version of llvm-mc
reinplace "s:\"llvm-mc\":\"llvm-mc-mp-${llvm_version}\":" ${worksrcpath}/as/driver.c
@@ -48,6 +49,10 @@
reinplace "s:/usr:${prefix}:g" ${file}
reinplace "s:${prefix}/efi:${prefix}:g" ${file}
reinplace "s:${prefix}/man:${prefix}/share/man:g" ${file}
+
+ if {${os.major} < 10} {
+ reinplace "s:${prefix}/bin/mig:/usr/bin/mig:g" ${file}
+ }
}
}
@@ -85,14 +90,16 @@
destroot.args-append RC_OS="macos"
if {${os.major} < 10} {
- # This doesn't build for me on Leopard. We should bump to at least version 795
- # which was included in XCode 3.2.6 and supports Tiger and Leopard targets.
+ # We should bump to at-least version 795, which was included in
+ # XCode 3.2.6 and supports Tiger and Leopard targets.
version 698.1
revision 1
distname cctools-${version}
checksums rmd160 898c7b46869d4989c115420912fdd8d96ae923d3 \
sha256 383f1c0c78a2b3efdfdf7ce01adb7e2f8ee9985164dba6ab1c0fae800a211cec
- patchfiles patch-misc_libtool.c.diff patch-ld_ld.c.diff
+ patchfiles patch-misc_libtool.c.diff PR-11136237-698.1.patch
+
+ supported_archs i386 ppc
} elseif {${os.major} == 10} {
version 809
revision 1
@@ -100,15 +107,6 @@
checksums rmd160 f433124035ac0ef403bdc6edec087bdedd0b4375 \
sha256 03ba62749b843b131c7304a044a98c6ffacd65b1399b921d69add0375f79d8ad
}
-
- # This will be required if building newer cctools on older OS versions
- #if {${os.major} < 10} {
- # build.args-append \
- # OLD_LIBKLD=YES
- #
- # destroot.args-append \
- # OLD_LIBKLD=YES
- #}
}
destroot.target install_tools
@@ -118,6 +116,10 @@
file delete -force ${destroot}${prefix}/OpenSourceVersions
file delete -force ${destroot}${prefix}/RelNotes
+ if {${os.major} < 10} {
+ file delete -force ${destroot}/Developer
+ }
+
# Provided by port:cctools-headers
file delete -force ${destroot}${prefix}/include
}
Added: trunk/dports/devel/cctools/files/PR-11136237-698.1.patch
===================================================================
--- trunk/dports/devel/cctools/files/PR-11136237-698.1.patch (rev 0)
+++ trunk/dports/devel/cctools/files/PR-11136237-698.1.patch 2012-04-03 18:13:02 UTC (rev 91498)
@@ -0,0 +1,36 @@
+diff -Naurp as/as.h as/as.h
+--- as/as.h 2007-06-05 18:00:45.000000000 -0700
++++ as/as.h 2012-04-03 10:27:49.000000000 -0700
+@@ -155,7 +155,7 @@ extern cpu_subtype_t archflag_cpusubtype
+ extern char *specific_archflag;
+
+ /* TRUE if the .subsections_via_symbols directive was seen */
+-int subsections_via_symbols;
++extern int subsections_via_symbols;
+
+ /* -I path options for .includes */
+ struct directory_stack {
+diff -Naurp otool/print_objc2_32bit.c otool/print_objc2_32bit.c
+--- otool/print_objc2_32bit.c 2008-03-31 17:16:58.000000000 -0700
++++ otool/print_objc2_32bit.c 2012-04-03 10:27:55.000000000 -0700
+@@ -229,7 +229,7 @@ struct category_t {
+ uint32_t protocols; /* struct protocol_list_t * (32-bit pointer) */
+ uint32_t instanceProperties; /* struct objc_property_list *
+ (32-bit pointer) */
+-} category_t;
++};
+
+ static
+ void
+diff -Naurp otool/print_objc2_64bit.c otool/print_objc2_64bit.c
+--- otool/print_objc2_64bit.c 2008-03-31 17:17:01.000000000 -0700
++++ otool/print_objc2_64bit.c 2012-04-03 10:27:55.000000000 -0700
+@@ -232,7 +232,7 @@ struct category_t {
+ uint64_t protocols; /* struct protocol_list_t * (64-bit pointer) */
+ uint64_t instanceProperties; /* struct objc_property_list *
+ (64-bit pointer) */
+-} category_t;
++};
+
+ static
+ void
Deleted: trunk/dports/devel/cctools/files/patch-ld_ld.c.diff
===================================================================
--- trunk/dports/devel/cctools/files/patch-ld_ld.c.diff 2012-04-03 18:02:30 UTC (rev 91497)
+++ trunk/dports/devel/cctools/files/patch-ld_ld.c.diff 2012-04-03 18:13:02 UTC (rev 91498)
@@ -1,9 +0,0 @@
---- ld/ld.c 2012-02-16 16:03:02.000000000 +0100
-+++ ld/ld.c 2012-02-16 16:03:27.000000000 +0100
-@@ -59,6 +58,0 @@
--#include <mach/mach_init.h>
--#if defined(__OPENSTEP__) || defined(__GONZO_BUNSEN_BEAKER__)
--#include <servers/netname.h>
--#else
--#include <servers/bootstrap.h>
--#endif
Deleted: trunk/dports/devel/cctools/files/patch-libmacho_Makefile.diff
===================================================================
--- trunk/dports/devel/cctools/files/patch-libmacho_Makefile.diff 2012-04-03 18:02:30 UTC (rev 91497)
+++ trunk/dports/devel/cctools/files/patch-libmacho_Makefile.diff 2012-04-03 18:13:02 UTC (rev 91498)
@@ -1,11 +0,0 @@
---- libmacho/Makefile 2010-03-30 00:57:21.000000000 +0200
-+++ libmacho/Makefile 2012-02-12 17:19:52.000000000 +0100
-@@ -371,7 +371,7 @@
- install -c -m 555 dtmp_obj/libmacho.dylib \
- $(DSTROOT)$(DYLIBDIR)/libmacho.dylib; \
- strip -S $(DSTROOT)$(DYLIBDIR)/libmacho.dylib; \
-- install -c -m 555 dtmp_obj/libmacho_profile.dylib \
-+ install -c -m 555 ptmp_obj/libmacho_profile.dylib \
- $(DSTROOT)$(DYLIBDIR)/libmacho_profile.dylib; \
- strip -S $(DSTROOT)$(DYLIBDIR)/libmacho_profile.dylib; \
- install -c -m 555 dtmp_obj/libmacho_debug.dylib \
Deleted: trunk/dports/devel/cctools/files/patch-misc_Makefile.diff
===================================================================
--- trunk/dports/devel/cctools/files/patch-misc_Makefile.diff 2012-04-03 18:02:30 UTC (rev 91497)
+++ trunk/dports/devel/cctools/files/patch-misc_Makefile.diff 2012-04-03 18:13:02 UTC (rev 91498)
@@ -1,11 +0,0 @@
---- misc/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ misc/Makefile 2012-02-12 16:40:46.000000000 +0100
-@@ -28,7 +28,7 @@
- ifeq "" "$(TRIE)"
- LIB_PRUNETRIE =
- else
-- LIB_PRUNETRIE = /usr/local/lib/libprunetrie.a
-+ LIB_PRUNETRIE = ${LIBRARY_PATH}/libprunetrie.a
- endif
-
- ifneq "" "$(wildcard /bin/mkdirs)"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120403/5a14edfc/attachment.html>
More information about the macports-changes
mailing list