[27636] trunk/dports/cross

source_changes at macosforge.org source_changes at macosforge.org
Fri Aug 10 20:03:34 PDT 2007 

Revision: 27636
          http://trac.macosforge.org/projects/macports/changeset/27636
Author:   landonf at macports.org
Date:     2007-08-10 20:03:34 -0700 (Fri, 10 Aug 2007)

Log Message:
-----------
Update the iphone toolchain to r118, and rename the ports to their preferred name in the process

Modified Paths:
--------------
    trunk/dports/cross/arm-apple-darwin-binutils/Portfile
    trunk/dports/cross/arm-apple-darwin-binutils/files/patch-Makefile.in
    trunk/dports/cross/arm-apple-darwin-cc/Portfile
    trunk/dports/cross/arm-apple-darwin-cc/files/patch-Makefile.in
    trunk/dports/cross/arm-apple-darwin-cc/files/patch-driver_Makefile.in
    trunk/dports/cross/arm-apple-darwin-cc/files/patch-driver_arm-cc-specs.in
    trunk/dports/cross/arm-apple-darwin-runtime/Portfile
    trunk/dports/cross/arm-apple-darwin-runtime/files/patch-Makefile.in

Added Paths:
-----------
    trunk/dports/cross/arm-apple-darwin-binutils/
    trunk/dports/cross/arm-apple-darwin-cc/
    trunk/dports/cross/arm-apple-darwin-runtime/
    trunk/dports/cross/arm-apple-darwin-runtime/files/patch-libarmfp_Makefile.in

Removed Paths:
-------------
    trunk/dports/cross/arm-apple-darwin-runtime/files/UITextTraitsClientProtocol.h
    trunk/dports/cross/arm-apple-darwin-runtime/files/patch-Csu-71_Makefile.in
    trunk/dports/cross/arm-apple-darwin-runtime/files/patch-libarmpf_Makefile.in
    trunk/dports/cross/arm-iphone-binutils/
    trunk/dports/cross/arm-iphone-cc/
    trunk/dports/cross/arm-iphone-runtime/

Copied: trunk/dports/cross/arm-apple-darwin-binutils (from rev 27615, trunk/dports/cross/arm-iphone-binutils)

Modified: trunk/dports/cross/arm-apple-darwin-binutils/Portfile
===================================================================
--- trunk/dports/cross/arm-iphone-binutils/Portfile	2007-08-10 20:30:15 UTC (rev 27615)
+++ trunk/dports/cross/arm-apple-darwin-binutils/Portfile	2007-08-11 03:03:34 UTC (rev 27636)
@@ -1,11 +1,11 @@
 # $Id$
 
 PortSystem 1.0
-name			arm-iphone-binutils
-version			r93
-categories		iphone
+name			arm-apple-darwin-binutils
+version			r118
+categories		cross iphone
 maintainers		landonf at macports.org openmaintainer at macports.org
-description		iPhone Binutils for arm-iphone cross development
+description		Binutils for arm-apple-darwin (iPhone) cross development
 long_description	${description}
 
 homepage		http://developer.berlios.de/projects/iphone-binutils/
@@ -13,13 +13,13 @@
 
 master_sites		http://landonf.bikemonkey.org/static/iphone/
 distname		iphone-binutils-${version}
-checksums		md5 e7c782c48307e96a347787cf1d13d0b4
+checksums		md5 111b11f80fe535b3beb3d40633962f3b
 
 depends_build		port:Libstreams
 
 patchfiles		patch-Makefile.in
 
-set iphone_prefix	${prefix}/arm-iphone
+set iphone_prefix	${prefix}/arm-apple-darwin
 
 configure.args		--prefix=${iphone_prefix} --with-heavenly=${iphone_prefix}/heavenly
 
@@ -36,4 +36,12 @@
 	file copy ${prefix}/include/streams ${worksrcpath}/cctools/include/streams
 }
 
-destroot {}
+destroot {
+	# Make the binaries externally visible.
+	system "cd ${destroot}/${prefix}/bin && ln -s ${iphone_prefix}/bin/arm-apple-darwin-ld ./"
+	system "cd ${destroot}/${prefix}/bin && ln -s ${iphone_prefix}/bin/arm-apple-darwin-as ./"
+
+	# Set up non-prefixed binaries in the iphone bin directory
+	system "cd ${destroot}/${iphone_prefix}/bin && ln -s arm-apple-darwin-ld ld"
+	system "cd ${destroot}/${iphone_prefix}/bin && ln -s arm-apple-darwin-as as"
+}

Modified: trunk/dports/cross/arm-apple-darwin-binutils/files/patch-Makefile.in
===================================================================
--- trunk/dports/cross/arm-iphone-binutils/files/patch-Makefile.in	2007-08-10 20:30:15 UTC (rev 27615)
+++ trunk/dports/cross/arm-apple-darwin-binutils/files/patch-Makefile.in	2007-08-11 03:03:34 UTC (rev 27636)
@@ -1,20 +1,20 @@
---- Makefile.in.orig	2007-08-03 02:00:02.000000000 -0700
-+++ Makefile.in	2007-08-03 02:00:39.000000000 -0700
+--- Makefile.in.orig	2007-08-08 14:54:14.000000000 -0700
++++ Makefile.in	2007-08-10 18:29:09.000000000 -0700
 @@ -15,7 +15,7 @@
  PREFIX = @prefix@
  HEAVENLY = @heavenly@
  
--all: heavenly includes llvmgcc llvm cctools driver csu libarmfp
+-all: heavenly includes cctools driver csu libarmfp
 +all: cctools
  	
  heavenly:
  	install -d $(PREFIX)/heavenly && cp -Rn $(HEAVENLY)/* $(PREFIX)/heavenly
-@@ -36,8 +36,8 @@
+@@ -27,8 +27,8 @@
  cctools:
  	install /usr/include/ar.h cctools/include
  	cd cctools && $(MAKE)
--	install cctools/as/aarm_dir/as $(PREFIX)/bin/arm-apple-darwin-as
--	install cctools/ld/ld_dir/ld.NEW $(PREFIX)/bin/arm-apple-darwin-ld
+-	install -d cctools/as/aarm_dir/as $(PREFIX)/bin/arm-apple-darwin-as
+-	install -d cctools/ld/ld_dir/ld.NEW $(PREFIX)/bin/arm-apple-darwin-ld
 +	install cctools/as/aarm_dir/as $(DESTDIR)/$(PREFIX)/bin/arm-apple-darwin-as
 +	install cctools/ld/ld_dir/ld.NEW $(DESTDIR)/$(PREFIX)/bin/arm-apple-darwin-ld
  

Copied: trunk/dports/cross/arm-apple-darwin-cc (from rev 27615, trunk/dports/cross/arm-iphone-cc)

Modified: trunk/dports/cross/arm-apple-darwin-cc/Portfile
===================================================================
--- trunk/dports/cross/arm-iphone-cc/Portfile	2007-08-10 20:30:15 UTC (rev 27615)
+++ trunk/dports/cross/arm-apple-darwin-cc/Portfile	2007-08-11 03:03:34 UTC (rev 27636)
@@ -1,12 +1,11 @@
 # $Id$
 
 PortSystem 1.0
-name			arm-iphone-cc
-version			r93
-revision		4
+name			arm-apple-darwin-cc
+version			r118
 categories		iphone
 maintainers		landonf at macports.org openmaintainer at macports.org
-description		iPhone cross-compiler (driver) for arm-iphone
+description		Cross-compiler (driver) for arm-apple-darwin (iPhone)
 long_description	${description}
 
 homepage		http://developer.berlios.de/projects/iphone-binutils/
@@ -14,8 +13,8 @@
 
 master_sites		http://landonf.bikemonkey.org/static/iphone/
 distname		iphone-binutils-$version
-checksums		md5 e7c782c48307e96a347787cf1d13d0b4
-depends_run		port:arm-iphone-binutils \
+checksums		md5 111b11f80fe535b3beb3d40633962f3b
+depends_run		port:arm-apple-darwin-binutils \
 			port:llvm-gcc4 \
 			port:llvm
 
@@ -23,10 +22,11 @@
 			patch-driver_Makefile.in \
 			patch-driver_arm-cc-specs.in
 
-set iphone_prefix	${prefix}/arm-iphone
+set iphone_prefix       ${prefix}/arm-apple-darwin
 
 configure.args		--prefix=${iphone_prefix} --with-heavenly=${iphone_prefix}/heavenly
 
+build.target		driver
 build.args		DESTDIR=${destroot}
 
 post-patch {
@@ -39,17 +39,8 @@
 
 post-destroot {
 	# Make the binaries externally visible.
-	system "cd ${destroot}/${prefix}/bin && ln -s ../arm-iphone/bin/arm-apple-darwin-cc ./arm-apple-darwin-cc"
-	system "cd ${destroot}/${prefix}/bin && ln -s ../arm-iphone/bin/arm-apple-darwin-cc ./arm-iphone-cc"
+	system "cd ${destroot}/${prefix}/bin && ln -s ${iphone_prefix}/bin/arm-apple-darwin-cc ./"
 
-	system "cd ${destroot}/${prefix}/bin && ln -s ../arm-iphone/bin/arm-apple-darwin-ld ./arm-apple-darwin-ld"
-	system "cd ${destroot}/${prefix}/bin && ln -s ../arm-iphone/bin/arm-apple-darwin-ld ./arm-iphone-ld"
-
-	system "cd ${destroot}/${prefix}/bin && ln -s ../arm-iphone/bin/arm-apple-darwin-as ./arm-apple-darwin-as"
-	system "cd ${destroot}/${prefix}/bin && ln -s ../arm-iphone/bin/arm-apple-darwin-as ./arm-iphone-as"
-
 	# Set up non-prefixed binaries in the iphone bin directory
 	system "cd ${destroot}/${iphone_prefix}/bin && ln -s arm-apple-darwin-cc cc"
-	system "cd ${destroot}/${iphone_prefix}/bin && ln -s arm-apple-darwin-ld ld"
-	system "cd ${destroot}/${iphone_prefix}/bin && ln -s arm-apple-darwin-as as"
 }

Modified: trunk/dports/cross/arm-apple-darwin-cc/files/patch-Makefile.in
===================================================================
--- trunk/dports/cross/arm-iphone-cc/files/patch-Makefile.in	2007-08-10 20:30:15 UTC (rev 27615)
+++ trunk/dports/cross/arm-apple-darwin-cc/files/patch-Makefile.in	2007-08-11 03:03:34 UTC (rev 27636)
@@ -1,16 +1,7 @@
---- Makefile.in.orig	2007-08-03 02:14:37.000000000 -0700
-+++ Makefile.in	2007-08-03 02:15:40.000000000 -0700
-@@ -15,7 +15,7 @@
- PREFIX = @prefix@
- HEAVENLY = @heavenly@
+--- Makefile.in.orig	2007-08-10 19:24:17.000000000 -0700
++++ Makefile.in	2007-08-10 19:24:10.000000000 -0700
+@@ -32,7 +32,7 @@
  
--all: heavenly includes llvmgcc llvm cctools driver csu libarmfp
-+all: driver
- 	
- heavenly:
- 	install -d $(PREFIX)/heavenly && cp -Rn $(HEAVENLY)/* $(PREFIX)/heavenly
-@@ -41,7 +41,7 @@
- 
  driver:
  	cd driver && $(MAKE)
 -	cd driver && $(MAKE) install

Modified: trunk/dports/cross/arm-apple-darwin-cc/files/patch-driver_Makefile.in
===================================================================
--- trunk/dports/cross/arm-iphone-cc/files/patch-driver_Makefile.in	2007-08-10 20:30:15 UTC (rev 27615)
+++ trunk/dports/cross/arm-apple-darwin-cc/files/patch-driver_Makefile.in	2007-08-11 03:03:34 UTC (rev 27636)
@@ -1,5 +1,5 @@
---- driver/Makefile.in.orig	2007-08-03 01:37:47.000000000 -0700
-+++ driver/Makefile.in	2007-08-03 01:38:54.000000000 -0700
+--- driver/Makefile.in.orig	2007-08-10 19:25:04.000000000 -0700
++++ driver/Makefile.in	2007-08-10 19:25:35.000000000 -0700
 @@ -33,9 +33,9 @@
  	rm -f $(RESULT)
  

Modified: trunk/dports/cross/arm-apple-darwin-cc/files/patch-driver_arm-cc-specs.in
===================================================================
--- trunk/dports/cross/arm-iphone-cc/files/patch-driver_arm-cc-specs.in	2007-08-10 20:30:15 UTC (rev 27615)
+++ trunk/dports/cross/arm-apple-darwin-cc/files/patch-driver_arm-cc-specs.in	2007-08-11 03:03:34 UTC (rev 27636)
@@ -1,22 +1,24 @@
---- driver/arm-cc-specs.in.orig	2007-08-03 23:05:06.000000000 -0700
-+++ driver/arm-cc-specs.in	2007-08-03 23:05:48.000000000 -0700
-@@ -1,21 +1,22 @@
+--- driver/arm-cc-specs.in.orig	2007-08-10 19:58:51.000000000 -0700
++++ driver/arm-cc-specs.in	2007-08-10 19:59:04.000000000 -0700
+@@ -1,23 +1,23 @@
  # Customize to match your system. Then, place this file in ~/.arm-cc-specs
  # (where ~ represents your home dir).
 -PREPROCESS=@prefix@/bin/llvm-gcc
-+CFLAGS_COMPILEROPT=-O0
 +PREPROCESS=@MACPORTS_PREFIX@/bin/llvm-gcc
  CPPFLAGS=-E -U__i386__ -U__ppc__ -D__arm__ -isystem @prefix@/include
 -LLVM_GCC=@prefix@/bin/llvm-gcc
 +LLVM_GCC=@MACPORTS_PREFIX@/bin/llvm-gcc
  CFLAGS=-emit-llvm
  CFLAGS_OBJC=-emit-llvm -ObjC
+-CCFLAGS_COMPILEROPT=-O7
++CFLAGS_COMPILEROPT=-O7
  LLVM_GCCC=llvm-g++
  CCFLAGS=-emit-llvm
 -LLC=@prefix@/bin/llc
 +LLC=@MACPORTS_PREFIX@/bin/llc
- LLCFLAGS=-mtriple=arm-apple-darwin -relocation-model=dynamic-no-pic -mcpu=generic -f
- LLCFLAGS_DYLIB=-mtriple=arm-apple-darwin -f -mcpu=generic -relocation-model=pic
+ LLCFLAGS=-mtriple=arm-apple-darwin -relocation-model=dynamic-no-pic -mcpu=arm1176jzf-s -f
+ LLCFLAGS_DYLIB=-mtriple=arm-apple-darwin -f -mcpu=arm1176jzf-s -relocation-model=pic
+ LLCFLAGS_BUNDLE=-mtriple=arm-apple-darwin -f -mcpu=arm1176jzf-s -relocation-model=pic
 -OPT=@prefix@/bin/opt
 +OPT=@MACPORTS_PREFIX@/bin/opt
  OPTFLAGS=-std-compile-opts
@@ -26,5 +28,5 @@
 -LDFLAGS=-syslibroot @prefix@/heavenly @prefix@/csu/crt1.o % -lSystem -lgcc_s_v6.1 -lm -larmfp 
 +LDFLAGS=-syslibroot @prefix@/heavenly @prefix@/csu/crt1.o % -lSystem -lgcc_s_v6.1 -lm -L at prefix@/lib -larmfp 
  LDFLAGS_DYLIB=-syslibroot @prefix@/heavenly -lSystem -lgcc_s_v6.1 -L at prefix@/csu -ldylib1.o -single_module -dylib -dynamic
+ LDFLAGS_BUNDLE=-syslibroot @prefix@/heavenly -bundle -lSystem -lgcc_s_v6.1 -L at prefix@/csu @prefix@/csu/bundle1.o -dynamic
  LDFLAGS_FRAMEWORKSDIR=-F at prefix@/heavenly/System/Library/Frameworks
- 

Copied: trunk/dports/cross/arm-apple-darwin-runtime (from rev 27615, trunk/dports/cross/arm-iphone-runtime)

Modified: trunk/dports/cross/arm-apple-darwin-runtime/Portfile
===================================================================
--- trunk/dports/cross/arm-iphone-runtime/Portfile	2007-08-10 20:30:15 UTC (rev 27615)
+++ trunk/dports/cross/arm-apple-darwin-runtime/Portfile	2007-08-11 03:03:34 UTC (rev 27636)
@@ -1,12 +1,11 @@
 # $Id$
 
 PortSystem 1.0
-name			arm-iphone-runtime
-version			r93
-revision		4
-categories		iphone
+name			arm-apple-darwin-runtime
+version			r118
+categories		cross iphone
 maintainers		landonf at macports.org openmaintainer at macports.org
-description		Free iPhone C runtime, headers and libraries.
+description		Free arm-apple-darwin (iPhone) runtime, headers and libraries.
 long_description	${description}
 
 homepage		http://developer.berlios.de/projects/iphone-binutils/
@@ -14,18 +13,18 @@
 
 master_sites		http://landonf.bikemonkey.org/static/iphone/
 distname		iphone-binutils-${version}
-checksums		md5 e7c782c48307e96a347787cf1d13d0b4
-depends_lib		port:arm-iphone-binutils \
-			port:arm-iphone-cc
+checksums		md5 111b11f80fe535b3beb3d40633962f3b
+depends_lib		port:arm-apple-darwin-binutils \
+			port:arm-apple-darwin-cc
 
 patchfiles		patch-Makefile.in \
-			patch-libarmpf_Makefile.in \
-			patch-Csu-71_Makefile.in
+			patch-libarmfp_Makefile.in
 
-set iphone_prefix	${prefix}/arm-iphone
+set iphone_prefix	${prefix}/arm-apple-darwin
 
 configure.args		--prefix=${iphone_prefix} --with-heavenly=${iphone_prefix}/heavenly
 
+build.target		includes csu libarmfp
 build.args		DESTDIR=${destroot}
 
 pre-build {
@@ -36,9 +35,6 @@
 	set inst ${destroot}/${iphone_prefix}
 	set slf "/System/Library/Frameworks"
 
-	# Add missing header
-	file copy -force ${filespath}/UITextTraitsClientProtocol.h ${inst}/include/UIKit/
-
 	# These are included, non-existent. The contents aren't necessary,
 	# so we create blank ones.
 	system "touch ${inst}/include/UIKit/NSObject.h"
@@ -47,15 +43,10 @@
 	#
 	# Ugly mess to populate include/ and avoid patching system headers.
 	#
-	file mkdir ${inst}/include/sys
 
 	# i386 param.h
 	file copy -force /usr/include/i386/param.h ${inst}/include/machine/
 
-	# i386 cdefs.h
-	file copy -force /usr/include/sys/cdefs.h ${inst}/include/sys/
-	reinplace s|__i386__|__arm__|g ${inst}/include/sys/cdefs.h
-
 	# i386 signal.h
 	file copy -force /usr/include/i386/signal.h ${inst}/include/machine/
 
@@ -66,7 +57,7 @@
 	# Symlink CoreGraphics
 	system "ln -s ${slf}/ApplicationServices.framework/Frameworks/CoreGraphics.framework/Headers ${inst}/include/CoreGraphics"
 
-	# Patch CarbonCore
+	# Copy & Patch CarbonCore
 	set ccframework "${slf}/CoreServices.framework/Frameworks/CarbonCore.framework"
 	file mkdir ${inst}/include/CarbonCore
 	file copy ${ccframework}/Headers/MachineExceptions.h \

Deleted: trunk/dports/cross/arm-apple-darwin-runtime/files/UITextTraitsClientProtocol.h
===================================================================
--- trunk/dports/cross/arm-iphone-runtime/files/UITextTraitsClientProtocol.h	2007-08-10 20:30:15 UTC (rev 27615)
+++ trunk/dports/cross/arm-apple-darwin-runtime/files/UITextTraitsClientProtocol.h	2007-08-11 03:03:34 UTC (rev 27636)
@@ -1,61 +0,0 @@
-/*
- *     Generated by class-dump 3.1.1.
- *
- *     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2006 by Steve Nygard.
- */
-
- at protocol UITextTraitsClient
-+ (int)defaultAutoCapsType;	// IMP=0x324aabec
-+ (int)defaultAutoCorrectionType;	// IMP=0x324aabf4
-+ (BOOL)defaultAutoEnablesReturnKey;	// IMP=0x324aabfc
-+ (struct CGColor *)defaultCaretColor;	// IMP=0x324aac14
-+ (unsigned int)defaultCaretWidth;	// IMP=0x324aac58
-+ (id)defaultEditingDelegate;	// IMP=0x324aac04
-+ (int)defaultInitialSelectionBehavior;	// IMP=0x324aac0c
-+ (int)defaultPreferredKeyboardType;	// IMP=0x324aac60
-+ (int)defaultReturnKeyType;	// IMP=0x324aac68
-+ (BOOL)defaultSecureTextEntryFlag;	// IMP=0x324aac70
-+ (BOOL)defaultSingleCompletionEntryFlag;	// IMP=0x324aac78
-+ (int)defaultTextDomain;	// IMP=0x324aac80
-+ (int)defaultTextLoupeVisibility;	// IMP=0x324aac88
-+ (id)defaultTextSuggestionDelegate;	// IMP=0x324aac90
-+ (struct __CFCharacterSet *)defaultTextTrimmingSet;	// IMP=0x324aac98
-+ (id)defaultTraits;	// IMP=0x324aaca0
-- (int)autoCapsType;	// IMP=0x324ab3c4
-- (int)autoCorrectionType;	// IMP=0x324ab3f8
-- (BOOL)autoEnablesReturnKey;	// IMP=0x324ab42c
-- (struct CGColor *)caretColor;	// IMP=0x324ab45c
-- (unsigned int)caretWidth;	// IMP=0x324ab48c
-- (void)dealloc;	// IMP=0x324aad44
-- (id)editingDelegate;	// IMP=0x324ab43c
-- (id)init;	// IMP=0x324aace8
-- (int)initialSelectionBehavior;	// IMP=0x324ab44c
-- (int)preferredKeyboardType;	// IMP=0x324ab49c
-- (int)returnKeyType;	// IMP=0x324ab4ac
-- (BOOL)secureTextEntry;	// IMP=0x324ab4bc
-- (void)setAutoCapsType:(int)fp8;	// IMP=0x324ab3cc
-- (void)setAutoCorrectionType:(int)fp8;	// IMP=0x324ab400
-- (void)setAutoEnablesReturnKey:(BOOL)fp8;	// IMP=0x324ab434
-- (void)setCaretColor:(struct CGColor *)fp8;	// IMP=0x324ab464
-- (void)setCaretWidth:(unsigned int)fp8;	// IMP=0x324ab494
-- (void)setEditingDelegate:(id)fp8;	// IMP=0x324ab444
-- (void)setInitialSelectionBehavior:(int)fp8;	// IMP=0x324ab454
-- (void)setPreferredKeyboardType:(int)fp8;	// IMP=0x324ab4a4
-- (void)setReturnKeyType:(int)fp8;	// IMP=0x324ab4b4
-- (void)setSecureTextEntry:(BOOL)fp8;	// IMP=0x324ab4c4
-- (void)setSingleCompletionEntry:(BOOL)fp8;	// IMP=0x324ab4f4
-- (void)setTextDomain:(int)fp8;	// IMP=0x324ab504
-- (void)setTextLoupeVisibility:(int)fp8;	// IMP=0x324ab514
-- (void)setTextSuggestionDelegate:(id)fp8;	// IMP=0x324ab524
-- (void)setTextTrimmingSet:(struct __CFCharacterSet *)fp8;	// IMP=0x324ab534
-- (void)setToDefaultValues;	// IMP=0x324ab0a0
-- (void)setToSecureValues;	// IMP=0x324ab38c
-- (BOOL)singleCompletionEntry;	// IMP=0x324ab4ec
-- (void)takeTraitsFrom:(id)fp8;	// IMP=0x324aad98
-- (int)textDomain;	// IMP=0x324ab4fc
-- (int)textLoupeVisibility;	// IMP=0x324ab50c
-- (id)textSuggestionDelegate;	// IMP=0x324ab51c
-- (struct __CFCharacterSet *)textTrimmingSet;	// IMP=0x324ab52c
-
- at end
-

Deleted: trunk/dports/cross/arm-apple-darwin-runtime/files/patch-Csu-71_Makefile.in
===================================================================
--- trunk/dports/cross/arm-iphone-runtime/files/patch-Csu-71_Makefile.in	2007-08-10 20:30:15 UTC (rev 27615)
+++ trunk/dports/cross/arm-apple-darwin-runtime/files/patch-Csu-71_Makefile.in	2007-08-11 03:03:34 UTC (rev 27636)
@@ -1,15 +0,0 @@
---- Csu-71/Makefile.in.orig	2007-08-03 01:53:19.000000000 -0700
-+++ Csu-71/Makefile.in	2007-08-03 01:53:54.000000000 -0700
-@@ -42,9 +42,9 @@
- 	rm -f $(NOPIC_OBJS) $(PIC_OBJS) crt1.o dylib1.o *~
- 
- install: all
--	install -d $(IPHONEROOT)/csu
--	install $(NOPIC_RESULT) $(IPHONEROOT)/csu
--	install $(PIC_RESULT) $(IPHONEROOT)/csu
-+	install -d $(DESTDIR)$(IPHONEROOT)/csu
-+	install $(NOPIC_RESULT) $(DESTDIR)$(IPHONEROOT)/csu
-+	install $(PIC_RESULT) $(DESTDIR)$(IPHONEROOT)/csu
- 
- crt: $(NOPIC_OBJS)
- 	$(LINK) -o $(NOPIC_RESULT) $(LINKFLAGS) $(NOPIC_OBJS) $(DYLD)

Modified: trunk/dports/cross/arm-apple-darwin-runtime/files/patch-Makefile.in
===================================================================
--- trunk/dports/cross/arm-iphone-runtime/files/patch-Makefile.in	2007-08-10 20:30:15 UTC (rev 27615)
+++ trunk/dports/cross/arm-apple-darwin-runtime/files/patch-Makefile.in	2007-08-11 03:03:34 UTC (rev 27636)
@@ -1,24 +1,17 @@
---- Makefile.in.orig	2007-08-03 02:44:49.000000000 -0700
-+++ Makefile.in	2007-08-03 02:45:52.000000000 -0700
-@@ -15,14 +15,14 @@
- PREFIX = @prefix@
- HEAVENLY = @heavenly@
- 
--all: heavenly includes llvmgcc llvm cctools driver csu libarmfp
-+all: includes csu libarmfp
- 	
- heavenly:
+--- Makefile.in.orig	2007-08-10 19:40:20.000000000 -0700
++++ Makefile.in	2007-08-10 19:41:43.000000000 -0700
+@@ -21,8 +21,8 @@
  	install -d $(PREFIX)/heavenly && cp -Rn $(HEAVENLY)/* $(PREFIX)/heavenly
  
  includes:
 -	install -d $(PREFIX)/include
--	cp -Rn include/* $(PREFIX)/include
+-	cp -Rvn include/* $(PREFIX)/include
 +	install -d $(DESTDIR)/$(PREFIX)/include
-+	cp -Rn include/* $(DESTDIR)/$(PREFIX)/include
++	cp -Rvn include/* $(DESTDIR)/$(PREFIX)/include
  
- llvmgcc:
- 	./install-llvmgcc.sh
-@@ -45,13 +45,13 @@
+ cctools:
+ 	install /usr/include/ar.h cctools/include
+@@ -36,13 +36,13 @@
  
  csu:
  	cd Csu-71 && $(MAKE)
@@ -35,5 +28,5 @@
 +	cd libarmfp && $(MAKE) DESTDIR=$(DESTDIR)
 +	cd libarmfp && $(MAKE) DESTDIR=$(DESTDIR) install
  
- .PHONY : heavenly includes llvmgcc llvm cctools driver csu libarmfp
+ .PHONY : heavenly includes cctools driver csu libarmfp
  

Added: trunk/dports/cross/arm-apple-darwin-runtime/files/patch-libarmfp_Makefile.in
===================================================================
--- trunk/dports/cross/arm-apple-darwin-runtime/files/patch-libarmfp_Makefile.in	                        (rev 0)
+++ trunk/dports/cross/arm-apple-darwin-runtime/files/patch-libarmfp_Makefile.in	2007-08-11 03:03:34 UTC (rev 27636)
@@ -0,0 +1,20 @@
+--- libarmfp/Makefile.in.orig	2007-08-03 02:49:36.000000000 -0700
++++ libarmfp/Makefile.in	2007-08-03 02:51:09.000000000 -0700
+@@ -15,7 +15,7 @@
+ 
+ CC = $(IPHONEROOT)/bin/arm-apple-darwin-cc
+ CCFLAGS = -O0 -dynamiclib
+-LINKFLAGS = -dynamiclib
++LINKFLAGS = -dynamiclib -L../Csu-71/
+ 
+ RESULT = libarmfp.dylib
+ SRCS = armfp.c
+@@ -33,7 +33,7 @@
+ 	rm -f $(RESULT)
+ 
+ install: all
+-	install $(RESULT) $(IPHONEROOT)/lib
++	install $(RESULT) $(DESTDIR)$(IPHONEROOT)/lib
+ 
+ %.o: %.c
+ 	$(CC) -c $(LINKFLAGS) $(CCFLAGS) -o $@ $<

Deleted: trunk/dports/cross/arm-apple-darwin-runtime/files/patch-libarmpf_Makefile.in
===================================================================
--- trunk/dports/cross/arm-iphone-runtime/files/patch-libarmpf_Makefile.in	2007-08-10 20:30:15 UTC (rev 27615)
+++ trunk/dports/cross/arm-apple-darwin-runtime/files/patch-libarmpf_Makefile.in	2007-08-11 03:03:34 UTC (rev 27636)
@@ -1,20 +0,0 @@
---- libarmfp/Makefile.in.orig	2007-08-03 02:49:36.000000000 -0700
-+++ libarmfp/Makefile.in	2007-08-03 02:51:09.000000000 -0700
-@@ -15,7 +15,7 @@
- 
- CC = $(IPHONEROOT)/bin/arm-apple-darwin-cc
- CCFLAGS = -O0 -dynamiclib
--LINKFLAGS = -dynamiclib
-+LINKFLAGS = -dynamiclib -L../Csu-71/
- 
- RESULT = libarmfp.dylib
- SRCS = armfp.c
-@@ -33,7 +33,7 @@
- 	rm -f $(RESULT)
- 
- install: all
--	install $(RESULT) $(IPHONEROOT)/lib
-+	install $(RESULT) $(DESTDIR)$(IPHONEROOT)/lib
- 
- %.o: %.c
- 	$(CC) -c $(LINKFLAGS) $(CCFLAGS) -o $@ $<

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070810/682d6df9/attachment.html

More information about the macports-changes mailing list