[pkgsrc/trunk]: pkgsrc/benchmarks/benchfft Do not intermingle build phases, C...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/benchmarks/benchfft Do not intermingle build phases, C...
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 02:33:50 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/ead7c102c376
branches:  trunk
changeset: 502535:ead7c102c376
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Nov 05 21:04:36 2005 +0000

description:
Do not intermingle build phases, CONFIGURE_DIRS can specify a list of
directories to process. The removal of pre-configure fixes the config.*
handling at the same time. Also specify the config.status overrides.
Patch configure to not try to detect -lrfftw, just link the static
version explicitly. Do the same for -lfftw. This ensures that we
actually do get the static versions without having to worry about
libtool being too clever. Retire manual config.sub hacks, this should be
handled by config.guess already.

<jlam> just go ahead and commit that benchfft patch and let's
<jlam> never speak of it again :)

diffstat:

 benchmarks/benchfft/Makefile         |    7 +-
 benchmarks/benchfft/distinfo         |   10 +-
 benchmarks/benchfft/patches/patch-ac |   22 +-
 benchmarks/benchfft/patches/patch-ad |   19 +-
 benchmarks/benchfft/patches/patch-ae |  754 ++++------------------------------
 benchmarks/benchfft/patches/patch-af |   13 -
 benchmarks/benchfft/patches/patch-ag |   13 -
 7 files changed, 148 insertions(+), 690 deletions(-)

diffs (truncated from 1126 to 300 lines):

diff -r 6b0f171287b3 -r ead7c102c376 benchmarks/benchfft/Makefile
--- a/benchmarks/benchfft/Makefile      Sat Nov 05 20:54:38 2005 +0000
+++ b/benchmarks/benchfft/Makefile      Sat Nov 05 21:04:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/05/22 20:07:40 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/11/05 21:04:36 joerg Exp $
 
 DISTNAME=              benchfft-2.0
 PKGREVISION=   1
@@ -21,12 +21,11 @@
 LTCONFIG_OVERRIDE=     ${WRKDIR}/fftw-2.0.1/ltconfig
 CONFIG_GUESS_OVERRIDE= config.guess ../fftw-*/config.guess
 CONFIG_SUB_OVERRIDE=   config.sub ../fftw-*/config.sub
+CONFIG_STATUS_OVERRIDE=        config.status ../fftw-*/config.status
 
 INSTALLATION_DIRS=     bin
 
-pre-configure:
-       CONFIGURE_DIRS=${WRKDIR}/fftw-2.0.1 ${MAKE} ${MAKEFLAGS} do-configure
-       BUILD_DIRS=${WRKDIR}/fftw-2.0.1 ${MAKE} ${MAKEFLAGS} do-build
+CONFIGURE_DIRS=                ${WRKDIR}/fftw-2.0.1 ${WRKSRC}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/bench ${PREFIX}/bin/bench-fft
diff -r 6b0f171287b3 -r ead7c102c376 benchmarks/benchfft/distinfo
--- a/benchmarks/benchfft/distinfo      Sat Nov 05 20:54:38 2005 +0000
+++ b/benchmarks/benchfft/distinfo      Sat Nov 05 21:04:36 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/22 21:16:35 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/11/05 21:04:36 joerg Exp $
 
 SHA1 (benchfft-2.0.tar.gz) = b49cbad9d390e54d3afe661d51d3dce7b3d6435e
 RMD160 (benchfft-2.0.tar.gz) = bd9ef45e633b8384c836e32e1e1cee877495bb26
@@ -8,8 +8,6 @@
 Size (fftw-2.0.1.tar.gz) = 894543 bytes
 SHA1 (patch-aa) = 11c7d759af18a51da99231c964a079147656c9cc
 SHA1 (patch-ab) = 1c1be2e043ea9280f70dddd8082d20e929ea9d49
-SHA1 (patch-ac) = 91214ddd89c6eed3ff3b172e02bab720afc84b52
-SHA1 (patch-ad) = 6a40bc4f223029a5c654f6e8cbf4e476d40a6e56
-SHA1 (patch-ae) = 15985b9db54402feeddbcde1e74b9fc8c4320018
-SHA1 (patch-af) = 7275eb82bc58ed656e70f3aabec7dd393655b553
-SHA1 (patch-ag) = 6016462040b0052cd33a0a313ce24381c6eb802c
+SHA1 (patch-ac) = 24a1f01426f7e905f5033202b075786f2a632aa4
+SHA1 (patch-ad) = af0b491821b32d4039dd5bc17613b2a0872d13c0
+SHA1 (patch-ae) = ea3cc3719931d2d99484b5291e878a289565174f
diff -r 6b0f171287b3 -r ead7c102c376 benchmarks/benchfft/patches/patch-ac
--- a/benchmarks/benchfft/patches/patch-ac      Sat Nov 05 20:54:38 2005 +0000
+++ b/benchmarks/benchfft/patches/patch-ac      Sat Nov 05 21:04:36 2005 +0000
@@ -1,13 +1,31 @@
-$NetBSD: patch-ac,v 1.1 2000/05/13 14:51:12 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.2 2005/11/05 21:04:36 joerg Exp $
 
 need to be able to link with -lf2c when using f2c or -lg2c when using
 g77.
 
 --- configure.in.orig  Tue Oct 20 12:42:05 1998
 +++ configure.in       Fri May 12 17:10:03 2000
-@@ -59,4 +59,5 @@
+@@ -58,6 +58,7 @@ if test $F77 = echo; then
+ else
        USE_F77=" "
        AC_DEFINE(HAVE_F77)
 +        AC_F77_LIBRARY_LDFLAGS
  fi
  
+ if test $F90 = echo; then
+@@ -158,13 +159,8 @@ AC_CHECK_FUNCS(dcft3)
+ 
+ dnl Check for librfftw.a (in rfftw 2.0+)
+ AC_MSG_CHECKING(for location of rfftw)
+-if test -r $FFTWDIR/rfftw/.libs/librfftw.a; then
+-        RFFTWLIB="-lrfftw"
+-        AC_MSG_RESULT(found librfftw.a)
+-else
+-        RFFTWLIB="$FFTWDIR/rfftw/rfftw.o $FFTWDIR/rfftw/rfftwnd.o"
+-        AC_MSG_RESULT(using rfftw object code)
+-fi
++RFFTWLIB="$FFTWDIR/rfftw/.libs/librfftw.a"
++AC_MSG_RESULT(found librfftw.a)
+ AC_SUBST(RFFTWLIB)
+ 
+ dnl Check for Numerical Recipes code:
diff -r 6b0f171287b3 -r ead7c102c376 benchmarks/benchfft/patches/patch-ad
--- a/benchmarks/benchfft/patches/patch-ad      Sat Nov 05 20:54:38 2005 +0000
+++ b/benchmarks/benchfft/patches/patch-ad      Sat Nov 05 21:04:36 2005 +0000
@@ -1,19 +1,32 @@
-$NetBSD: patch-ad,v 1.4 2001/04/15 02:20:06 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.5 2005/11/05 21:04:36 joerg Exp $
 
 link required fortran library.
 
 --- Makefile.in.orig   Tue Oct 20 12:42:00 1998
 +++ Makefile.in        Fri May 12 17:11:17 2000
-@@ -377,4 +377,5 @@
+@@ -365,7 +365,7 @@ LIBPATHS = -L$(FFTWDIR)/fftw/.libs -L$(F
+ INCLUDE_FLAGS = -I. -I$(FFTWDIR)/fftw -I$(FFTWDIR)/src -I$(FFTWDIR)/rfftw
+ 
+ # Put libraries that you need to link in here:
+-LIBRARIES = $(LIBPATHS) -lfftw @RFFTWLIB@ @LIBS@
++LIBRARIES = $(LIBPATHS) ../fftw-2.0.1/fftw/.libs/libfftw.a @RFFTWLIB@ @LIBS@
+ 
+ ###########################################################################
+ 
+@@ -376,6 +376,7 @@ CC = @CC@
+ CFLAGS = @CFLAGS@
  F77 = @F77@
  FFLAGS = @FFLAGS@
 +FLIBS = @FLIBS@
  F90 = @F90@
  F90FLAGS = @FFLAGS@
-@@ -496,5 +497,5 @@
+ 
+@@ -495,7 +496,7 @@ bench_utils.o: bench_utils.h bench-confi
+ bench.o: bench_utils.h bench-config.h
  
  bench: $(OBJECTS)
 -      $(CC) $(CFLAGS) $(OBJECTS) $(LIBRARIES) -o $@
 +      $(CC) $(CFLAGS) $(OBJECTS) $(LIBRARIES) $(FLIBS) -u _MAIN__ -u MAIN__ -o $@
  
  submit: bench
+       ./submit-script
diff -r 6b0f171287b3 -r ead7c102c376 benchmarks/benchfft/patches/patch-ae
--- a/benchmarks/benchfft/patches/patch-ae      Sat Nov 05 20:54:38 2005 +0000
+++ b/benchmarks/benchfft/patches/patch-ae      Sat Nov 05 21:04:36 2005 +0000
@@ -1,31 +1,38 @@
-$NetBSD: patch-ae,v 1.1 2000/05/13 14:51:13 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.2 2005/11/05 21:04:36 joerg Exp $
 
 note, this was generated by running autoconf on the patched configure.in
 no additional changes were made.
 
---- configure.orig     Tue Oct 20 12:43:39 1998
-+++ configure  Fri May 12 17:58:39 2000
-@@ -2,5 +2,5 @@
+--- configure.orig     1998-10-20 18:43:39.000000000 +0200
++++ configure
+@@ -1,7 +1,7 @@
+ #! /bin/sh
  
  # Guess values for system-dependent variables and create Makefiles.
 -# Generated automatically using autoconf version 2.12 
 +# Generated automatically using autoconf version 2.13 
  # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
  #
-@@ -56,4 +56,5 @@
+ # This configure script is free software; the Free Software Foundation
+@@ -55,6 +55,7 @@ mandir='${prefix}/man'
+ # Initialize some other variables.
  subdirs=
  MFLAGS= MAKEFLAGS=
 +SHELL=${CONFIG_SHELL-/bin/sh}
  # Maximum number of lines to put in a shell here document.
  ac_max_here_lines=12
-@@ -339,5 +340,5 @@
+ 
+@@ -338,7 +339,7 @@ EOF
+     verbose=yes ;;
  
    -version | --version | --versio | --versi | --vers)
 -    echo "configure generated by autoconf version 2.12"
 +    echo "configure generated by autoconf version 2.13"
      exit 0 ;;
  
-@@ -509,7 +510,9 @@
+   -with-* | --with-*)
+@@ -508,9 +509,11 @@ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -36,26 +43,9 @@
 +ac_objext=o
  if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says ghazi%caip.rutgers.edu@localhost.
-@@ -541,5 +544,5 @@
- 
- echo $ac_n "checking for location of FFTW directory""... $ac_c" 1>&6
--echo "configure:544: checking for location of FFTW directory" >&5
-+echo "configure:547: checking for location of FFTW directory" >&5
- if test '!' '(' -n "$FFTWDIR" ')'; then
-       if test -r ../fftw; then
-@@ -567,9 +570,9 @@
- # Use native cc if present
- echo $ac_n "checking for vendor's cc to be used instead of gcc""... $ac_c" 1>&6
--echo "configure:570: checking for vendor's cc to be used instead of gcc" >&5
-+echo "configure:573: checking for vendor's cc to be used instead of gcc" >&5
- # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:574: checking for $ac_word" >&5
-+echo "configure:577: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -578,6 +581,7 @@
+   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+@@ -577,8 +580,9 @@ else
+   if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
 -  IFS="${IFS=         }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
@@ -65,14 +55,9 @@
 +  for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
-@@ -604,5 +608,5 @@
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:607: checking for $ac_word" >&5
-+echo "configure:611: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -611,6 +615,7 @@
+       ac_cv_prog_CC="cc"
+@@ -610,8 +614,9 @@ else
+   if test -n "$F77"; then
    ac_cv_prog_F77="$F77" # Let the user override the test.
  else
 -  IFS="${IFS=         }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
@@ -82,14 +67,9 @@
 +  for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
-@@ -638,5 +643,5 @@
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:641: checking for $ac_word" >&5
-+echo "configure:646: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_F90'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -645,6 +650,7 @@
+       ac_cv_prog_F77="$ac_prog"
+@@ -644,8 +649,9 @@ else
+   if test -n "$F90"; then
    ac_cv_prog_F90="$F90" # Let the user override the test.
  else
 -  IFS="${IFS=         }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
@@ -99,7 +79,9 @@
 +  for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
-@@ -701,4 +707,342 @@
+       ac_cv_prog_F90="$ac_prog"
+@@ -700,6 +706,344 @@ else
+ #define HAVE_F77 1
  EOF
  
 +        ac_aux_dir=
@@ -442,14 +424,9 @@
 +
  fi
  
-@@ -720,5 +1064,5 @@
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:723: checking for $ac_word" >&5
-+echo "configure:1067: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -727,6 +1071,7 @@
+ if test $F90 = echo; then
+@@ -726,8 +1070,9 @@ else
+   if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
 -  IFS="${IFS=         }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
@@ -459,14 +436,9 @@
 +  for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
-@@ -749,5 +1094,5 @@
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:752: checking for $ac_word" >&5
-+echo "configure:1097: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -756,7 +1101,8 @@
+       ac_cv_prog_CC="gcc"
+@@ -755,9 +1100,10 @@ else
+   if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
 -  IFS="${IFS=         }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
@@ -477,7 +449,9 @@
 +  for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
-@@ -793,9 +1139,43 @@
+       if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+@@ -792,6 +1138,40 @@ else
+   echo "$ac_t""no" 1>&6
  fi
  
 +  if test -z "$CC"; then
@@ -517,12 +491,8 @@
    test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
  fi
  
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:800: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
Prev by Date: [pkgsrc/trunk]: pkgsrc/mk/bulk Reformatted the --help output. Instead of many...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Bump nsd for new rc script and other goodies.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mk/bulk Reformatted the --help output. Instead of many...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Bump nsd for new rc script and other goodies.
Indexes:
Home | Main Index | Thread Index | Old Index