Thu Aug 22 12:53:14 2013 UTC ()
Fix build on NetBSD/i386 6.1's gcc 4.5.3.
For PR pkg/48134.

* Convert check of gcc 4.2 or later to 4.6 or later.


(ryoon)
diff -r1.7 -r1.8 pkgsrc/security/crypto++/distinfo
diff -r1.4 -r1.5 pkgsrc/security/crypto++/patches/patch-aa
cvs diff -r1.7 -r1.8 pkgsrc/security/crypto++/distinfo (expand / switch to unified diff)

--- pkgsrc/security/crypto++/distinfo 2013/06/12 12:00:08 1.7
+++ pkgsrc/security/crypto++/distinfo 2013/08/22 12:53:14 1.8
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.7 2013/06/12 12:00:08 ryoon Exp $ 1$NetBSD: distinfo,v 1.8 2013/08/22 12:53:14 ryoon Exp $
2 2
3SHA1 (cryptopp562.zip) = ddc18ae41c2c940317cd6efe81871686846fa293 3SHA1 (cryptopp562.zip) = ddc18ae41c2c940317cd6efe81871686846fa293
4RMD160 (cryptopp562.zip) = b41af768b3a5ba927dac44ec554dc2095e21b1bb 4RMD160 (cryptopp562.zip) = b41af768b3a5ba927dac44ec554dc2095e21b1bb
5Size (cryptopp562.zip) = 1137964 bytes 5Size (cryptopp562.zip) = 1137964 bytes
6SHA1 (patch-aa) = 99569a955773758526969c9893dfbb08aacfdc4d 6SHA1 (patch-aa) = 5897457ab2a8ca894ef88a6d7a4968c6503a4d1e
cvs diff -r1.4 -r1.5 pkgsrc/security/crypto++/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/security/crypto++/patches/Attic/patch-aa 2013/06/12 12:00:08 1.4
+++ pkgsrc/security/crypto++/patches/Attic/patch-aa 2013/08/22 12:53:14 1.5
@@ -1,10 +1,27 @@ @@ -1,10 +1,27 @@
1$NetBSD: patch-aa,v 1.4 2013/06/12 12:00:08 ryoon Exp $ 1$NetBSD: patch-aa,v 1.5 2013/08/22 12:53:14 ryoon Exp $
2 2
3--- GNUmakefile.orig 2013-02-20 06:30:52.000000000 +0000 3--- GNUmakefile.orig 2013-02-20 06:30:52.000000000 +0000
4+++ GNUmakefile 4+++ GNUmakefile
5@@ -1,4 +1,4 @@ 5@@ -1,4 +1,4 @@
6-CXXFLAGS = -DNDEBUG -g -O2 6-CXXFLAGS = -DNDEBUG -g -O2
7+CXXFLAGS = $(CPPFLAGS) -DNDEBUG -g -O2 7+CXXFLAGS = $(CPPFLAGS) -DNDEBUG -g -O2
8 # -O3 fails to link on Cygwin GCC version 4.5.3 8 # -O3 fails to link on Cygwin GCC version 4.5.3
9 # -fPIC is supported. Please report any breakage of -fPIC as a bug. 9 # -fPIC is supported. Please report any breakage of -fPIC as a bug.
10 # CXXFLAGS += -fPIC 10 # CXXFLAGS += -fPIC
 11@@ -28,14 +28,14 @@ endif
 12
 13 ifeq ($(ISX86),1)
 14
 15-GCC42_OR_LATER = $(shell $(CXX) -v 2>&1 | $(EGREP) -c "^gcc version (4.[2-9]|[5-9])")
 16+GCC46_OR_LATER = $(shell $(CXX) -v 2>&1 | $(EGREP) -c "^gcc version (4.[6-9]|[5-9])")
 17 INTEL_COMPILER = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(ICC\)")
 18 ICC111_OR_LATER = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(ICC\) ([2-9][0-9]|1[2-9]|11\.[1-9])")
 19 GAS210_OR_LATER = $(shell $(CXX) -xc -c /dev/null -Wa,-v -o/dev/null 2>&1 | $(EGREP) -c "GNU assembler version (2\.[1-9][0-9]|[3-9])")
 20 GAS217_OR_LATER = $(shell $(CXX) -xc -c /dev/null -Wa,-v -o/dev/null 2>&1 | $(EGREP) -c "GNU assembler version (2\.1[7-9]|2\.[2-9]|[3-9])")
 21 GAS219_OR_LATER = $(shell $(CXX) -xc -c /dev/null -Wa,-v -o/dev/null 2>&1 | $(EGREP) -c "GNU assembler version (2\.19|2\.[2-9]|[3-9])")
 22
 23-ifneq ($(GCC42_OR_LATER),0)
 24+ifneq ($(GCC46_OR_LATER),0)
 25 ifeq ($(UNAME),Darwin)
 26 CXXFLAGS += -arch x86_64 -arch i386
 27 else