svn commit: r368267 - head/math/gotoblas

[Jason E. Hale]

On Mon, Sep 15, 2014 at 10:53 AM, Thomas Zander <riggs at freebsd.org> wrote:
> Author: riggs
> Date: Mon Sep 15 14:53:12 2014
> New Revision: 368267
> URL: http://svnweb.freebsd.org/changeset/ports/368267
> QAT: https://qat.redports.org/buildarchive/r368267/
>
> Log:
>   - Use DYNAMIC_ARCH on i386 and amd64 by default
>   - Bump PORTREVISION
>
>   PR:           161359
>   Submitted by: phd_kimberlite at yahoo.co.jp
>   Patch by:     cpm at fbsd.es (maintainer)
>
> Modified:
>   head/math/gotoblas/Makefile
>
> Modified: head/math/gotoblas/Makefile
> ==============================================================================
> --- head/math/gotoblas/Makefile Mon Sep 15 14:51:35 2014        (r368266)
> +++ head/math/gotoblas/Makefile Mon Sep 15 14:53:12 2014        (r368267)
> @@ -3,7 +3,7 @@
>
>  PORTNAME=      gotoblas
>  PORTVERSION=   2.${GOTOBLAS2VER}.${LAPACKVER}
> -PORTREVISION=  4
> +PORTREVISION=  5
>  CATEGORIES=    math
>  MASTER_SITES=  ${MASTER_SITE_LOCAL:S|%SUBDIR%|maho/gotoblas|} \
>                 NL:lapack,lapack_tmg
> @@ -39,11 +39,6 @@ SUB_FILES=   pkg-message
>  SUB_LIST=      MAXTHREADS=${MAXTHREADS}
>  MAKE_JOBS_UNSAFE=      yes
>
> -.if defined(PACKAGE_BUILDING)
> -OPTIONS_DEFAULT_i386=  DYNAMIC_ARCH
> -OPTIONS_DEFAULT_amd64= DYNAMIC_ARCH
> -.endif
> -
>  OPTIONS_DEFINE_i386=   DYNAMIC_ARCH
>  OPTIONS_DEFINE_amd64=  DYNAMIC_ARCH
>  OPTIONS_DEFINE=        INTERFACE64 OPENMP
> @@ -54,6 +49,12 @@ OPENMP_DESC=         Use OpenMP for threading
>
>  .include <bsd.port.options.mk>
>
> +.if ${ARCH} == "i386"
> +OPTIONS_DEFAULT_i386=  DYNAMIC_ARCH
> +.elif ${ARCH} == "amd64"
> +OPTIONS_DEFAULT_amd64= DYNAMIC_ARCH
> +.endif
> +
>  MAXTHREADS?=   8
>
>  .if ${ARCH:M*64} == ""
>
I think wrapping OPTIONS_DEFAULT_${ARCH} with ${ARCH} defeats the
purpose of having OPTIONS_DEFAULT_${ARCH} in the first place.
Wouldn't simply removing .if defined(PACKAGE_BUILDING)/.endif have
been enough?