Ticket #40003: wgrib2.diff

Portfile

@@ -38 +38 @@
 use_configure       no
 use_parallel_build  no
 
-if {[variant_isset universal]} {
-    set cflags "${configure.cflags} ${configure.universal_cflags}"
-    set ldflags "${configure.ldflags} ${configure.universal_ldflags}"
-} else {
-    set cflags "${configure.cflags} ${configure.cc_archflags}"
-    set ldflags "${configure.ldflags} ${configure.cc_archflags}"
-}
 set ip ${worksrcpath}/iplib.${version_iplib}
 set lipolate ${ip}/libipolate.a
 set g2c ${worksrcpath}/g2clib-${version_g2clib}
@@ -84 +77 @@
     configure.fc    ${prefix}/bin/gfortran-mp-4.8
 }
 
-build.env           LDFLAGS=\"${libs} ${configure.ldflags} -lpng -ljasper -lnetcdf\" \
+build.env           LDFLAGS=\"${libs} ${configure.ldflags} [get_canonical_archflags ld] -lpng -ljasper -lnetcdf\" \
                     CC=\"${configure.cc}\" \
                     CPPFLAGS=\"${fsymbol} ${configure.cppflags}\" \
-                    CFLAGS=\"${cflags}\"
+                    CFLAGS=\"${configure.cflags} [get_canonical_archflags cc]\"
 build.args         "-f makefile \
                     zlib=\"\" plib=\"\" jlib=\"\" h5lib=\"\" n4lib=\"\" \
                     iip=\"${iip}\" "