diff options
| author | delphij <delphij@FreeBSD.org> | 2011-01-28 04:47:30 +0800 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2011-01-28 04:47:30 +0800 |
| commit | 8a04ad4dd768df9d3b39d923296fe7b43d2ccd1e (patch) | |
| tree | 7d624dd429d34de8e8ea30d5078b4d74c346cd39 /security | |
| parent | b76b433b8c2e7736b8317de625135d4affde85b9 (diff) | |
| download | freebsd-ports-gnome-8a04ad4dd768df9d3b39d923296fe7b43d2ccd1e.tar.gz freebsd-ports-gnome-8a04ad4dd768df9d3b39d923296fe7b43d2ccd1e.tar.zst freebsd-ports-gnome-8a04ad4dd768df9d3b39d923296fe7b43d2ccd1e.zip | |
crypto++ assumes that the as(1) in PATH is the one used by c++(1),
which is not always true. When PATH is being configured to a
non-standard sequence, we may found an as(1) newer than the base
one and draw wrong conclusion which leads to failed builds.
Use the result given by c++. This is also accepted to upstream.
PR: ports/154325
Submitted by: swell.k gmail.com
Feature safe: yes
Diffstat (limited to 'security')
| -rw-r--r-- | security/cryptopp/files/patch-GNUmakefile | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/security/cryptopp/files/patch-GNUmakefile b/security/cryptopp/files/patch-GNUmakefile index 4da1b1a4f76e..43ca3c81f89f 100644 --- a/security/cryptopp/files/patch-GNUmakefile +++ b/security/cryptopp/files/patch-GNUmakefile @@ -1,8 +1,21 @@ ---- ./GNUmakefile.orig 2009-03-15 02:48:02.000000000 -0700 -+++ ./GNUmakefile 2009-03-26 16:26:05.337805000 -0700 +--- ./GNUmakefile.orig 2010-08-09 14:22:42.000000000 -0700 ++++ ./GNUmakefile 2011-01-27 12:43:08.905856979 -0800 @@ -1,4 +1,4 @@ -CXXFLAGS = -DNDEBUG -g -O2 +#CXXFLAGS = -DNDEBUG -g -O2 #CXXFLAGS = -g # -fPIC is supported. Please report any breakage of -fPIC as a bug. # CXXFLAGS += -fPIC +@@ -28,9 +28,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])") + IS_SUN_CC = $(shell $(CXX) -V 2>&1 | $(EGREP) -c "CC: Sun") +-GAS210_OR_LATER = $(shell echo "" | $(AS) -v 2>&1 | $(EGREP) -c "GNU assembler version (2\.[1-9][0-9]|[3-9])") +-GAS217_OR_LATER = $(shell echo "" | $(AS) -v 2>&1 | $(EGREP) -c "GNU assembler version (2\.1[7-9]|2\.[2-9]|[3-9])") +-GAS219_OR_LATER = $(shell echo "" | $(AS) -v 2>&1 | $(EGREP) -c "GNU assembler version (2\.19|2\.[2-9]|[3-9])") ++GAS210_OR_LATER = $(shell echo "" | $(CXX) -xc -c -Wa,-v -o/dev/null - 2>&1 | $(EGREP) -c "GNU assembler version (2\.[1-9][0-9]|[3-9])") ++GAS217_OR_LATER = $(shell echo "" | $(CXX) -xc -c -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 echo "" | $(CXX) -xc -c -Wa,-v -o/dev/null - 2>&1 | $(EGREP) -c "GNU assembler version (2\.19|2\.[2-9]|[3-9])") + ISMINGW = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "mingw") + + ifneq ($(GCC42_OR_LATER),0) |