Ticket #24669: afni-CC.diff

files/Makefile.i386

@@ -11 +11 @@
 CCDEBS = -DAFNI_DEBUG -DIMSEQ_DEBUG -DDISPLAY_DEBUG -DTHD_DEBUG
 CEXTRA = -Wcomment -Wformat -DUSE_TRACING -DHAVE_XDBE -no-cpp-precomp \
        -DDONT_USE_MCW_MALLOC
-CCFAST = cc $(CC_Intel) -DDARWIN  $(CEXTRA) -O3
-CCVOL  = cc $(CC_Intel) -DDARWIN  $(CEXTRA) -O2
-CC     = cc $(CC_Intel) -DDARWIN  $(CEXTRA) -O
-CCMIN  = cc
+CCFAST = @CC@ $(CC_Intel) -DDARWIN  $(CEXTRA) -O3
+CCVOL  = @CC@ $(CC_Intel) -DDARWIN  $(CEXTRA) -O2
+CC     = @CC@ $(CC_Intel) -DDARWIN  $(CEXTRA) -O
+CCMIN  = @CC@
 CCD    = $(CC) $(CCDEBS)
 
 IFLAGS = -I. -I/usr/X11R6/include -IopenMotif-2.2.3/lib -I/opt/local/include
@@ -34 +34 @@
 TAR    = /usr/bin/tar
 MKDIR  = /bin/mkdir
 GZIP   = /usr/bin/gzip
-LD     = cc
+LD     = @CC@
 
 RM = /bin/rm -f
 MV = /bin/mv -f

files/Makefile.ppc

@@ -10 +10 @@
 
 CCDEBS = -DAFNI_DEBUG -DIMSEQ_DEBUG -DDISPLAY_DEBUG -DTHD_DEBUG
 CEXTRA = -Wcomment -Wformat -DUSE_TRACING -DHAVE_XDBE -no-cpp-precomp -DDONT_USE_MCW_MALLOC
-CCFAST = cc ${CC_PPC} -DDARWIN $(CEXTRA) -O3
-CCVOL  = cc ${CC_PPC} -DDARWIN $(CEXTRA) -O2
-CC     = cc ${CC_PPC} -DDARWIN $(CEXTRA) -O
-CCMIN  = cc
+CCFAST = @CC@ ${CC_PPC} -DDARWIN $(CEXTRA) -O3
+CCVOL  = @CC@ ${CC_PPC} -DDARWIN $(CEXTRA) -O2
+CC     = @CC@ ${CC_PPC} -DDARWIN $(CEXTRA) -O
+CCMIN  = @CC@
 CCD    = $(CC) $(CCDEBS)
 IFLAGS = -I. -I/usr/X11R6/include -IopenMotif-2.2.3/lib -I/opt/local/include
 LFLAGS = -L. -L/usr/X11R6/lib -L/opt/local/lib -Wl,-force_flat_namespace
 
-CCSVD  = cc -O0 ${CC_PPC} -no-cpp-precomp
+CCSVD  = @CC@ -O0 ${CC_PPC} -no-cpp-precomp
 
 PLUGIN_SUFFIX = so
 PLUGIN_LFLAGS = -flat_namespace -bundle -undefined suppress
@@ -32 +32 @@
 TAR    = /usr/bin/tar
 MKDIR  = /bin/mkdir
 GZIP   = /usr/bin/gzip
-LD     = cc
+LD     = @CC@
 
 RM = /bin/rm -f
 MV = /bin/mv -f

Portfile

@@ -56 +56 @@
 post-patch {
                 file copy ${distpath}/3dClustBust.c ${worksrcpath}/
                 reinplace -E "s|AFNI_\[0-9_\]+|${version}|g" ${worksrcpath}/AFNI_label.h
+                reinplace "s|@CC@|${configure.cc}|g" ${worksrcpath}/Makefile
 }
 
 pre-build       {
@@ -72 +73 @@
 #               reinplace "s|%%DATADIR%%|${prefix}/share/afni|g" ${workpath}/afni.profile
                 }
 
+build.args      CC=${configure.cc}
+
 destroot {
 # First, separate files that were all dumped into macosx_bin by the Makefile
                 file mkdir ${worksrcpath}/macosx_lib