Don't use gcc, just use default value of cc. Don't override CFLAGS,

keep the user settings in.

1 files changed, 22 insertions, 16 deletions

diff --git a/math/dieharder/patches/patch-ad b/math/dieharder/patches/patch-ad
index 40b527b4105..4b755365c19 100644
--- a/math/dieharder/patches/patch-ad
+++ b/math/dieharder/patches/patch-ad
@@ -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 @@ $NetBSD: patch-ad,v 1.1.1.1 2007/09/13 10:07:36 gson Exp $
  
  #========================================================================
  # 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 @@ $NetBSD: patch-ad,v 1.1.1.1 2007/09/13 10:07:36 gson Exp $
 +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 @@ $NetBSD: patch-ad,v 1.1.1.1 2007/09/13 10:07:36 gson Exp $
  
  #========================================================================
  # 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 @@ $NetBSD: patch-ad,v 1.1.1.1 2007/09/13 10:07:36 gson Exp $
  	install -d $(includedir)/dieharder; \
  	install -m 644 ../include/dieharder/*.h $(includedir)/dieharder; \
 -	install -d $(prefix)/share/man/man3; \
-+	install -d $(mandir)/man3; \
- 	gzip -c -9 $(PROGMAN) > $(PROGMAN).gz; \
+-	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 -d $(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) $<