head 1.3; access; symbols pkgsrc-2015Q3:1.2.0.48 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.46 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.44 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.42 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.40 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.38 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.36 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.34 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.32 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.30 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.28 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.26 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.24 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.22 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.20 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.18 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.16 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.14 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.12 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.10 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.8 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.6 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.4 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.2 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.1.1.1.0.22 pkgsrc-2009Q3-base:1.1.1.1 pkgsrc-2009Q2:1.1.1.1.0.20 pkgsrc-2009Q2-base:1.1.1.1 pkgsrc-2009Q1:1.1.1.1.0.18 pkgsrc-2009Q1-base:1.1.1.1 pkgsrc-2008Q4:1.1.1.1.0.16 pkgsrc-2008Q4-base:1.1.1.1 pkgsrc-2008Q3:1.1.1.1.0.14 pkgsrc-2008Q3-base:1.1.1.1 cube-native-xorg:1.1.1.1.0.12 cube-native-xorg-base:1.1.1.1 pkgsrc-2008Q2:1.1.1.1.0.10 pkgsrc-2008Q2-base:1.1.1.1 cwrapper:1.1.1.1.0.8 pkgsrc-2008Q1:1.1.1.1.0.6 pkgsrc-2008Q1-base:1.1.1.1 pkgsrc-2007Q4:1.1.1.1.0.4 pkgsrc-2007Q4-base:1.1.1.1 pkgsrc-2007Q3:1.1.1.1.0.2 pkgsrc-2007Q3-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2015.10.26.05.52.06; author agc; state dead; branches; next 1.2; commitid G6WinjL1Ynbz3AGy; 1.2 date 2009.11.30.17.25.08; author joerg; state Exp; branches; next 1.1; 1.1 date 2007.09.13.10.07.36; author gson; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2007.09.13.10.07.36; author gson; state Exp; branches; next ; desc @@ 1.3 log @Update dieharder to 3.31.1 Changes since 2.24.4 + new interface, some tests corrected pkgsrc changes + remove custom make-flags + add license + pkgsrc patches no longer necessary "lgtm" gson@@ @ text @$NetBSD: patch-ac,v 1.2 2009/11/30 17:25:08 joerg Exp $ --- 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 # and library at the same time. Maybe with particular make targets... LIBINCLUDES = $(shell ls ../include/dieharder/*.h 2>&1 | sed -e "/\/bin\/ls:/d") -PROGLIB_SONAME = $(LIBDIR)/libdieharder.so.$(VERSION) SOURCES = $(LIBSOURCES) $(SRCSOURCES) INCLUDES = $(LIBINCLUDES) $(SRCINCLUDES) @@@@ -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) - -# 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 +69,8 @@@@ LIBS = -L ../libdieharder -ldieharder -l #======================================================================== all: $(PROGRAM) -$(PROGRAM): $(OBJECTS) $(PROGLIB_SONAME) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@@ $(OBJECTS) $(LIBS) - -#======================================================================== -# This is cautiously permitted. REALLY, though, we need a conditional -# that punts with a warning if we try this during an rpm build and -# the library is not found -- the right solution then is to install -# the library first! -#======================================================================== -$(PROGLIB_SONAME): - - (cd ../libdieharder ;\ - $(MAKE)) +$(PROGRAM): $(OBJECTS) ../libdieharder/libdieharder.la + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@@ $(OBJECTS) $(LIBS) #======================================================================== # The only safe place to do commits is in the toplevel directory @@@@ -123,15 +106,15 @@@@ clean : install : $(PROGRAM) (strip $(PROGRAM);\ install -d $(prefix)/bin; \ - install -m 755 $(PROGRAM) $(prefix)/bin; \ - install -d $(prefix)/share/man/man1; \ + $(LIBTOOL) --mode=install install -m 755 $(PROGRAM) $(prefix)/bin; \ + install -d $(mandir)/man1; \ gzip -c -9 $(PROGRAM).1 > $(PROGRAM).1.gz; \ - install -m 644 $(PROGRAM).1.gz $(prefix)/share/man/man1) + install -m 644 $(PROGRAM).1.gz $(mandir)/man1) #======================================================================== # 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) $< @ 1.2 log @Don't use gcc, just use default value of cc. Don't override CFLAGS, keep the user settings in. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- dieharder/Makefile.am.orig 2007-05-22 03:34:27.000000000 +0300 d13 7 a19 1 @@@@ -63,11 +62,8 @@@@ CC = gcc d21 2 a22 2 CFLAGS = -O3 -I ../include $(DEFINES) d25 2 a26 1 - d33 1 a33 1 @@@@ -76,18 +72,8 @@@@ LIBS = -L ../libdieharder -ldieharder -l d54 1 a54 1 @@@@ -123,10 +109,10 @@@@ clean : d68 6 @ 1.1.1.1 log @Initial import of dieharder-2.24.4 into pkgsrc. DieHarder is a test suite for random number generators. It includes a reimplementation in C of the well-known Diehard test suite as well as additional tests. @ text @@