[pkgsrc/trunk]: pkgsrc/math/dieharder Don't use gcc, just use default value o...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/da798eb9fa2f
branches:  trunk
changeset: 567987:da798eb9fa2f
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Nov 30 17:25:08 2009 +0000

description:
Don't use gcc, just use default value of cc. Don't override CFLAGS,
keep the user settings in.

diffstat:

 math/dieharder/distinfo         |   6 +++---
 math/dieharder/patches/patch-ac |  29 +++++++++++++++++++++--------
 math/dieharder/patches/patch-ad |  38 ++++++++++++++++++++++----------------
 3 files changed, 46 insertions(+), 27 deletions(-)

diffs (166 lines):

diff -r 7be5bfd8f47f -r da798eb9fa2f math/dieharder/distinfo
--- a/math/dieharder/distinfo   Mon Nov 30 16:47:11 2009 +0000
+++ b/math/dieharder/distinfo   Mon Nov 30 17:25:08 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/09/13 10:07:36 gson Exp $
+$NetBSD: distinfo,v 1.2 2009/11/30 17:25:08 joerg Exp $
 
 SHA1 (dieharder-2.24.4.tgz) = 09db7de25b024afad242a0aeb38d303c26226c93
 RMD160 (dieharder-2.24.4.tgz) = 005e318ae277f331884e183876c2a62095943a50
 Size (dieharder-2.24.4.tgz) = 796175 bytes
 SHA1 (patch-aa) = a710122b5053d5553115e9d2bcecebfc9e2c2486
-SHA1 (patch-ac) = 509814ff4770ee6780fb03e963dd496a3d75d062
-SHA1 (patch-ad) = 37f8d4cc8a150239d3399a545fb15f0f328c3454
+SHA1 (patch-ac) = 6e284ac366193a681d9409a22d85381d4091815f
+SHA1 (patch-ad) = db139fd1c1067cc005bee1310302b2d183b99aa4
diff -r 7be5bfd8f47f -r da798eb9fa2f math/dieharder/patches/patch-ac
--- a/math/dieharder/patches/patch-ac   Mon Nov 30 16:47:11 2009 +0000
+++ b/math/dieharder/patches/patch-ac   Mon Nov 30 17:25:08 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2007/09/13 10:07:36 gson Exp $
+$NetBSD: patch-ac,v 1.2 2009/11/30 17:25:08 joerg Exp $
 
---- dieharder/Makefile.am.orig 2007-05-22 03:34:27.000000000 +0300
+--- dieharder/Makefile.am.orig 2007-05-22 02:34:27.000000000 +0200
 +++ dieharder/Makefile.am
 @@ -46,7 +46,6 @@ SRCINCLUDES = $(shell ls *.h  2>&1 | sed
  # see how to force a consistent build when working on the UI
@@ -10,20 +10,27 @@
  
  SOURCES = $(LIBSOURCES) $(SRCSOURCES)
  INCLUDES = $(LIBINCLUDES) $(SRCINCLUDES)
-@@ -63,11 +62,8 @@ CC = gcc
+@@ -57,17 +56,11 @@ DEFINES = -DVERSION=$(VERSION)
+ #========================================================================
+ # Define parameters and directives needed in compile/link steps.
+ #========================================================================
+-# C Compiler
+-CC = gcc
+-
  # Compile flags (use fairly standard -O3 as default)
- CFLAGS = -O3 -I ../include $(DEFINES) 
- 
+-CFLAGS = -O3 -I ../include $(DEFINES) 
+-
 -# Linker flags.
 -LDFLAGS =
--
++CFLAGS += -I ../include $(DEFINES) 
+ 
  # Libraries
 -LIBS = -L ../libdieharder -ldieharder -lgsl -lgslcblas -lm
 +LIBS = ../libdieharder/libdieharder.la -lgsl -lgslcblas -lm
  
  #========================================================================
  # List of variants one can make.  all is the default.  We always
-@@ -76,18 +72,8 @@ LIBS = -L ../libdieharder -ldieharder -l
+@@ -76,18 +69,8 @@ LIBS = -L ../libdieharder -ldieharder -l
  #========================================================================
  all: $(PROGRAM)
  
@@ -44,7 +51,7 @@
  
  #========================================================================
  # The only safe place to do commits is in the toplevel directory
-@@ -123,10 +109,10 @@ clean : 
+@@ -123,15 +106,15 @@ clean : 
  install : $(PROGRAM)
        (strip $(PROGRAM);\
        install -d $(prefix)/bin; \
@@ -58,3 +65,9 @@
  
  #========================================================================
  # We give all generic rules below.  Currently we only need a rule for 
+ # objects.
+ #========================================================================
+ %.o:%.c
+-      $(CC) -c $(CFLAGS) $<
++      $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $<
+ 
diff -r 7be5bfd8f47f -r da798eb9fa2f math/dieharder/patches/patch-ad
--- a/math/dieharder/patches/patch-ad   Mon Nov 30 16:47:11 2009 +0000
+++ b/math/dieharder/patches/patch-ad   Mon Nov 30 17:25:08 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1.1.1 2007/09/13 10:07:36 gson Exp $
+$NetBSD: patch-ad,v 1.2 2009/11/30 17:25:08 joerg Exp $
 
---- libdieharder/Makefile.am.orig      2007-05-22 03:34:27.000000000 +0300
+--- libdieharder/Makefile.am.orig      2007-05-22 02:34:27.000000000 +0200
 +++ libdieharder/Makefile.am
 @@ -38,10 +38,7 @@ RELEASE=0
  # other stuff in the future) is built.
@@ -14,17 +14,23 @@
  
  #========================================================================
  # Define all sources.  Note that we choose to depend on ALL the includes
-@@ -61,9 +58,6 @@ CC = gcc
+@@ -55,14 +52,8 @@ DEFINES = -DVERSION=$(VERSION)
+ #========================================================================
+ # Define parameters and directives needed in compile/link steps.
+ #========================================================================
+-# C Compiler
+-CC = gcc
+-
  # Compile flags (use fairly standard -O3 as default)
- CFLAGS = -O3 $(DEFINES) -I ../include
- 
+-CFLAGS = -O3 $(DEFINES) -I ../include
+-
 -# Linker flags
 -LDFLAGS = -g -fpic -shared -Wl,-soname,$(PROGLIB_SONAME)
--
++CFLAGS += $(DEFINES) -I ../include
+ 
  # Libraries
  LIBS = -lgsl -lgslcblas -lm
- 
-@@ -72,22 +66,11 @@ LIBS = -lgsl -lgslcblas -lm
+@@ -72,22 +63,11 @@ LIBS = -lgsl -lgslcblas -lm
  # presume the simplest of dependencies and remake if includes change
  # for example.
  #========================================================================
@@ -47,11 +53,11 @@
 +all: $(PROGLIB_A)
 +
 +$(PROGLIB_A): $(LIBOBJECTS)
-+      $(LIBTOOL) --mode=link gcc -o $(PROGLIB_A:.a=.la) $(LIBOBJECTS:.o=.lo) -rpath ${PREFIX}/lib -version-info 0:0
++      $(LIBTOOL) --mode=link $(CC) -o $(PROGLIB_A:.a=.la) $(LIBOBJECTS:.o=.lo) -rpath ${PREFIX}/lib -version-info 0:0
  
  #========================================================================
  # The only safe place to do commits is in the toplevel directory
-@@ -111,7 +94,7 @@ printout:
+@@ -111,7 +91,7 @@ printout:
  #  A standard cleanup target
  #========================================================================
  clean:
@@ -60,7 +66,7 @@
  
  #========================================================================
  # This is critical.  For the toplevel rpm build to succeed,
-@@ -120,15 +103,14 @@ clean:
+@@ -120,15 +100,13 @@ clean:
  # This target has to install precisely the files required by the
  # specfile for the dieharder package, in precisely the right locations.
  #========================================================================
@@ -73,16 +79,16 @@
        install -d $(includedir)/dieharder; \
        install -m 644 ../include/dieharder/*.h $(includedir)/dieharder; \
 -      install -d $(prefix)/share/man/man3; \
+-      gzip -c -9 $(PROGMAN) > $(PROGMAN).gz; \
+-      install -m 644 $(DIR).3.gz $(prefix)/share/man/man3)
 +      install -d $(mandir)/man3; \
-       gzip -c -9 $(PROGMAN) > $(PROGMAN).gz; \
--      install -m 644 $(DIR).3.gz $(prefix)/share/man/man3)
-+      install -m 644 $(DIR).3.gz $(mandir)/man3)
++      install -m 644 $(DIR).3 $(mandir)/man3)
  
  # FC requires no static lib install
  #     install -m 755 $(PROGLIB_A) $(libdir)/$(PROGLIB_A); \
-@@ -138,4 +120,4 @@ install: $(PROGLIB_SO_VERSION) $(PROGLIB
+@@ -138,4 +116,4 @@ install: $(PROGLIB_SO_VERSION) $(PROGLIB
  # objects.
  #========================================================================
  %.o:%.c $(LIBINCLUDES) Makefile
 -      $(CC) -fpic -c $(CFLAGS) $<
-+      $(LIBTOOL) --mode=compile $(CC) -fpic -c $(CFLAGS) $<
++      $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $<