Ticket #42048: apple-gcc42.diff

Portfile

@@ -71 +71 @@
 #+  --with-mpfr=$DEST_ROOT \
 #depends_lib             port:gmp port:mpfr
 
-#depends_lib             port:libiconv
-depends_lib             port:ld64 port:cctools
 depends_run             port:gcc_select
-depends_skip_archcheck  ld64 cctools
 
 use_configure no
 variant universal {}
@@ -166 +163 @@
 compiler.cpath /usr/include
 compiler.library_path /usr/lib
 
-# TODO: Better use of MacPorts dependencies
 build.env \
-    LIBRARY_PATH="/usr/lib" \
-    CPATH="/usr/include" \
     PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
-    LANGUAGES="c,c++,objc,obj-c++" \
-    AR_FOR_TARGET=${prefix}/bin/ar \
-    AS_FOR_TARGET=${prefix}/bin/as \
-    LD_FOR_TARGET=${prefix}/bin/ld \
-    NM_FOR_TARGET=${prefix}/bin/nm \
-    OBJDUMP_FOR_TARGET=${prefix}/bin/objdump \
-    RANLIB_FOR_TARGET=${prefix}/bin/ranlib \
-    STRIP_FOR_TARGET=${prefix}/bin/strip \
-    DSYMUTIL_FOR_HOST=${prefix}/bin/dsymutil \
-    RANLIB_FOR_HOST=${prefix}/bin/ranlib \
-    STRIP_FOR_HOST=${prefix}/bin/strip \
-    OTOOL=${prefix}/bin/otool \
-    OTOOL64=${prefix}/bin/otool
+    LANGUAGES="c,c++,objc,obj-c++"
 
+if {![variant_isset bootstrap]} {
+    #depends_lib-append              port:libiconv
+    depends_lib-append              port:ld64 port:cctools
+    depends_skip_archcheck-append   ld64 cctools
+    
+    # TODO: Better use of MacPorts dependencies
+    build.env-append \
+        AR_FOR_TARGET=${prefix}/bin/ar \
+        AS_FOR_TARGET=${prefix}/bin/as \
+        LD_FOR_TARGET=${prefix}/bin/ld \
+        NM_FOR_TARGET=${prefix}/bin/nm \
+        OBJDUMP_FOR_TARGET=${prefix}/bin/objdump \
+        RANLIB_FOR_TARGET=${prefix}/bin/ranlib \
+        STRIP_FOR_TARGET=${prefix}/bin/strip \
+        DSYMUTIL_FOR_HOST=${prefix}/bin/dsymutil \
+        RANLIB_FOR_HOST=${prefix}/bin/ranlib \
+        STRIP_FOR_HOST=${prefix}/bin/strip \
+        OTOOL=${prefix}/bin/otool \
+        OTOOL64=${prefix}/bin/otool
+}
+
 build.args-append \
     CC="${configure.cc} -pipe -std=gnu89" \
     PREFIX="${prefix}" \
@@ -200 +203 @@
 
 # On Tiger, we need apple-gcc42 to build llvm, which is needed for cctools
 variant bootstrap description {Variant to break a dependency cycle on Tiger by first building an apple-gcc42 using host ld and cctools} {
-#    depends_lib-delete      port:libiconv
-    depends_lib-delete      port:ld64 port:cctools
-
-    build.env \
-        LIBRARY_PATH="/usr/lib" \
-        CPATH="/usr/include" \
-        PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
-        LANGUAGES="c,c++,objc,obj-c++"
-
     pre-fetch {
         if {([file exists ${prefix}/bin/ld] && [file exists ${prefix}/bin/as]) || ${os.major} > 8} {
             ui_error "Please install this port without the bootstrap variant."