diff options
| author | ryoon <ryoon> | 2013-08-22 12:53:14 +0000 |
|---|---|---|
| committer | ryoon <ryoon> | 2013-08-22 12:53:14 +0000 |
| commit | d90cb698619e2f862648b947f0b58194ad4e4f41 (patch) | |
| tree | 8fe20fa20990c5d77da79c61d62aec6c2993b43f /security | |
| parent | b6a63ea71405ac29e859d192c7d52e07d865bb4e (diff) | |
| download | pkgsrc-d90cb698619e2f862648b947f0b58194ad4e4f41.tar.gz | |
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.
Diffstat (limited to 'security')
| -rw-r--r-- | security/crypto++/distinfo | 4 | ||||
| -rw-r--r-- | security/crypto++/patches/patch-aa | 19 |
2 files changed, 20 insertions, 3 deletions
diff --git a/security/crypto++/distinfo b/security/crypto++/distinfo index bef54cf4d84..325ebd2d895 100644 --- a/security/crypto++/distinfo +++ b/security/crypto++/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2013/06/12 12:00:08 ryoon Exp $ +$NetBSD: distinfo,v 1.8 2013/08/22 12:53:14 ryoon Exp $ SHA1 (cryptopp562.zip) = ddc18ae41c2c940317cd6efe81871686846fa293 RMD160 (cryptopp562.zip) = b41af768b3a5ba927dac44ec554dc2095e21b1bb Size (cryptopp562.zip) = 1137964 bytes -SHA1 (patch-aa) = 99569a955773758526969c9893dfbb08aacfdc4d +SHA1 (patch-aa) = 5897457ab2a8ca894ef88a6d7a4968c6503a4d1e diff --git a/security/crypto++/patches/patch-aa b/security/crypto++/patches/patch-aa index 3d9349c2408..e45fae0faf2 100644 --- a/security/crypto++/patches/patch-aa +++ b/security/crypto++/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2013/06/12 12:00:08 ryoon Exp $ +$NetBSD: patch-aa,v 1.5 2013/08/22 12:53:14 ryoon Exp $ --- GNUmakefile.orig 2013-02-20 06:30:52.000000000 +0000 +++ GNUmakefile @@ -8,3 +8,20 @@ $NetBSD: patch-aa,v 1.4 2013/06/12 12:00:08 ryoon Exp $ # -O3 fails to link on Cygwin GCC version 4.5.3 # -fPIC is supported. Please report any breakage of -fPIC as a bug. # CXXFLAGS += -fPIC +@@ -28,14 +28,14 @@ endif + + ifeq ($(ISX86),1) + +-GCC42_OR_LATER = $(shell $(CXX) -v 2>&1 | $(EGREP) -c "^gcc version (4.[2-9]|[5-9])") ++GCC46_OR_LATER = $(shell $(CXX) -v 2>&1 | $(EGREP) -c "^gcc version (4.[6-9]|[5-9])") + INTEL_COMPILER = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(ICC\)") + ICC111_OR_LATER = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(ICC\) ([2-9][0-9]|1[2-9]|11\.[1-9])") + 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])") + 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])") + 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])") + +-ifneq ($(GCC42_OR_LATER),0) ++ifneq ($(GCC46_OR_LATER),0) + ifeq ($(UNAME),Darwin) + CXXFLAGS += -arch x86_64 -arch i386 + else |