diff options
| author | Xin LI <delphij@FreeBSD.org> | 2013-05-22 22:51:57 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2013-05-22 22:51:57 +0000 |
| commit | 38fdae7228e6b133016903194a040a3942900d9e (patch) | |
| tree | 51c434f39d2f53cd005831574a4f24262cf663f7 /security/cryptopp/files/patch-GNUmakefile | |
| parent | This changeset fixes two issues with crypto++ library: (diff) | |
Update to 5.6.2.
Notes
Notes:
svn path=/head/; revision=318803
Diffstat (limited to 'security/cryptopp/files/patch-GNUmakefile')
| -rw-r--r-- | security/cryptopp/files/patch-GNUmakefile | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/security/cryptopp/files/patch-GNUmakefile b/security/cryptopp/files/patch-GNUmakefile index 61a065dc0425..1a8d60ec4520 100644 --- a/security/cryptopp/files/patch-GNUmakefile +++ b/security/cryptopp/files/patch-GNUmakefile @@ -1,30 +1,17 @@ ---- ./GNUmakefile.orig 2010-08-09 14:22:42.000000000 -0700 -+++ ./GNUmakefile 2012-07-21 03:14:01.000000000 +0200 +--- GNUmakefile.orig 2013-02-20 15:30:52.000000000 -0800 ++++ GNUmakefile 2013-05-22 15:43:40.000000000 -0700 @@ -1,4 +1,4 @@ -CXXFLAGS = -DNDEBUG -g -O2 +#CXXFLAGS = -DNDEBUG -g -O2 - #CXXFLAGS = -g + # -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,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) -@@ -151,7 +151,7 @@ - $(RANLIB) $@ +@@ -165,7 +165,7 @@ + $(RANLIB) $@ libcryptopp.so: $(LIBOBJS) - $(CXX) -shared -o $@ $(LIBOBJS) + $(CXX) -shared -o $@ $(CXXFLAGS) $(LDFLAGS) $(LIBOBJS) cryptest.exe: libcryptopp.a $(TESTOBJS) - $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) -L. -lcryptopp $(LDFLAGS) $(LDLIBS) + $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) ./libcryptopp.a $(LDFLAGS) $(LDLIBS) |