[51696] trunk/dports/emulators/minivmac-devel

[ryandesign at macports.org]

Revision: 51696
          http://trac.macports.org/changeset/51696
Author:   ryandesign at macports.org
Date:     2009-05-31 14:36:30 -0700 (Sun, 31 May 2009)
Log Message:
-----------
minivmac-devel: use ${configure.cc} instead of gcc

Modified Paths:
--------------
    trunk/dports/emulators/minivmac-devel/Portfile

Added Paths:
-----------
    trunk/dports/emulators/minivmac-devel/files/patch-gcc.diff

Modified: trunk/dports/emulators/minivmac-devel/Portfile
===================================================================
--- trunk/dports/emulators/minivmac-devel/Portfile	2009-05-31 21:32:31 UTC (rev 51695)
+++ trunk/dports/emulators/minivmac-devel/Portfile	2009-05-31 21:36:30 UTC (rev 51696)
@@ -51,7 +51,8 @@
         rmd160  cef6d7d7578464538d0042b0d98379ae7f18fab7
 
 patchfiles \
-    patch-build.diff
+    patch-build.diff \
+    patch-gcc.diff
 
 set my_appdir           "${applications_dir}/Mini vMac"
 set my_target           ""
@@ -144,10 +145,12 @@
     }
 }
 
+build.env-append        CC=${configure.cc}
+
 configure {
     # Build the build system.
     if {![file exists ${worksrcpath}/Build.app]} {
-        set my_cmd "cd ${worksrcpath}/projects/gcc_${my_target} && [build_getnicevalue] make [build_getmakejobs]"
+        set my_cmd "cd ${worksrcpath}/projects/gcc_${my_target} && ${build.env} [build_getnicevalue] make [build_getmakejobs]"
         ui_debug ${my_cmd}
         system ${my_cmd}
         file rename ${worksrcpath}/projects/gcc_${my_target}/Build.app ${worksrcpath}
@@ -182,7 +185,7 @@
         ui_debug "Building ${variation_id}"
         
         build.dir ${workpath}/${my_target}/${variation_id}
-        set my_cmd "cd ${build.dir} && [build_getnicevalue] ${build.cmd} ${build.target} [build_getmakejobs]"
+        set my_cmd "cd ${build.dir} && ${build.env} [build_getnicevalue] ${build.cmd} ${build.target} [build_getmakejobs]"
         ui_debug ${my_cmd}
         system ${my_cmd}
         

Added: trunk/dports/emulators/minivmac-devel/files/patch-gcc.diff
===================================================================
--- trunk/dports/emulators/minivmac-devel/files/patch-gcc.diff	                        (rev 0)
+++ trunk/dports/emulators/minivmac-devel/files/patch-gcc.diff	2009-05-31 21:36:30 UTC (rev 51696)
@@ -0,0 +1,62 @@
+--- projects/gcc_imch/Makefile	2009-05-31 16:19:35.000000000 -0500
++++ projects/gcc_imch/Makefile	2009-05-31 16:21:17.000000000 -0500
+@@ -8,7 +8,7 @@
+ TheDefaultOutput : Build.app/Contents/MacOS/Build
+ 
+ bld/program.o : src/program.c
+-	gcc "src/program.c" -o "bld/program.o" $(mk_COptions) \
++	$(CC) "src/program.c" -o "bld/program.o" $(mk_COptions) \
+ 		-I "../../source/build/c_src/" -I "../../source/app/build/"
+ 
+ ObjFiles = \
+@@ -30,7 +30,7 @@
+ 	mv "AppTemp/" "Build.app/"
+ 
+ Build.app/Contents/MacOS/Build : $(ObjFiles) Build.app/Contents/Resources/AppIcon.icns Build.app/Contents/Resources/Build.rsrc
+-	gcc \
++	$(CC) \
+ 		-o "Build.app/Contents/MacOS/Build" -framework Carbon -framework OpenGL -framework AGL -arch i386 -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
+ 		$(ObjFiles)
+ 	strip -u -r "Build.app/Contents/MacOS/Build"
+--- projects/gcc_mach/Makefile	2009-05-31 16:19:35.000000000 -0500
++++ projects/gcc_mach/Makefile	2009-05-31 16:20:59.000000000 -0500
+@@ -8,7 +8,7 @@
+ TheDefaultOutput : Build.app/Contents/MacOS/Build
+ 
+ bld/program.o : src/program.c
+-	gcc "src/program.c" -o "bld/program.o" $(mk_COptions) \
++	$(CC) "src/program.c" -o "bld/program.o" $(mk_COptions) \
+ 		-I "../../source/build/c_src/" -I "../../source/app/build/"
+ 
+ ObjFiles = \
+@@ -30,7 +30,7 @@
+ 	mv "AppTemp/" "Build.app/"
+ 
+ Build.app/Contents/MacOS/Build : $(ObjFiles) Build.app/Contents/Resources/AppIcon.icns Build.app/Contents/Resources/Build.rsrc
+-	gcc \
++	$(CC) \
+ 		-o "Build.app/Contents/MacOS/Build" -framework Carbon -framework OpenGL -framework AGL -arch ppc -mmacosx-version-min=10.1 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
+ 		$(ObjFiles)
+ 	strip -u -r "Build.app/Contents/MacOS/Build"
+--- source/build/c_src/BLDUTIL3.i	2009-05-31 16:33:04.000000000 -0500
++++ source/build/c_src/BLDUTIL3.i	2009-05-31 16:34:01.000000000 -0500
+@@ -962,7 +962,7 @@
+ 			break;
+ 		case gbk_ide_bgc:
+ 		case gbk_ide_xcd:
+-			WriteCStrToDestFile("gcc");
++			WriteCStrToDestFile("$(CC)");
+ 			break;
+ 		case gbk_ide_snc:
+ 			WriteCStrToDestFile("cc");
+--- source/build/c_src/WRBGCFLS.i	2009-05-31 16:27:08.000000000 -0500
++++ source/build/c_src/WRBGCFLS.i	2009-05-31 16:30:33.000000000 -0500
+@@ -48,7 +48,7 @@
+ 		WriteCStrToDestFile(" ; ");
+ 	}
+ #endif
+-	WriteCStrToDestFile("gcc");
++	WriteCStrToDestFile("$(CC)");
+ }
+ 
+ LOCALPROC WriteXCDBgcCompileLinkCommonOptions(void)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090531/15e71597/attachment.html>