aboutsummaryrefslogtreecommitdiff
path: root/package/beecrypt
diff options
context:
space:
mode:
authorGravatar Bernd Kuhls <bernd.kuhls@t-online.de>2014-10-19 19:07:57 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-10-22 18:00:56 +0200
commit2717199e1359d287cc47fa255928c7737f09a9a9 (patch)
tree1938c00a6063f30591a67131f207e351f1dd7674 /package/beecrypt
parent8511314f9b955a1354251f89356b57bfa4e12b25 (diff)
downloadbuildroot-2717199e1359d287cc47fa255928c7737f09a9a9.tar.gz
buildroot-2717199e1359d287cc47fa255928c7737f09a9a9.tar.bz2
package/beecrypt: Replace work-around to fix gcc-4.7 compile error
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/beecrypt')
-rw-r--r--package/beecrypt/beecrypt-0004-gcc-4.7.patch19
-rw-r--r--package/beecrypt/beecrypt.mk6
2 files changed, 19 insertions, 6 deletions
diff --git a/package/beecrypt/beecrypt-0004-gcc-4.7.patch b/package/beecrypt/beecrypt-0004-gcc-4.7.patch
new file mode 100644
index 0000000000..767f789069
--- /dev/null
+++ b/package/beecrypt/beecrypt-0004-gcc-4.7.patch
@@ -0,0 +1,19 @@
+Really fixes gcc-4.7 related compile error:
+../../include/beecrypt/c++/util/AbstractSet.h:59:27: error: 'containsAll' was not declared in this scope, and no declarations were found by argument-dependent lookup at the point of instantiation [-fpermissive]
+
+Downloaded from upstream bugtracker:
+http://sourceforge.net/p/beecrypt/patches/10/
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+--- a/include/beecrypt/c++/util/AbstractSet.h
++++ b/include/beecrypt/c++/util/AbstractSet.h
+@@ -56,7 +56,7 @@
+ if (c->size() != size())
+ return false;
+
+- return containsAll(*c);
++ return this->containsAll(*c);
+ }
+ return false;
+ }
diff --git a/package/beecrypt/beecrypt.mk b/package/beecrypt/beecrypt.mk
index e9e701b65a..7d2ee0839a 100644
--- a/package/beecrypt/beecrypt.mk
+++ b/package/beecrypt/beecrypt.mk
@@ -11,12 +11,6 @@ BEECRYPT_INSTALL_STAGING = YES
BEECRYPT_LICENSE = LGPLv2.1+
BEECRYPT_LICENSE_FILES = COPYING.LIB
-# beecrypt contains C++ code that g++ 4.7 doesn't really
-# like. Upstream does not seem to be really active, so workaround this
-# by passing -fpermissive.
-BEECRYPT_CONF_ENV = \
- CXXFLAGS="$(TARGET_CXXFLAGS) -fpermissive"
-
BEECRYPT_CONF_OPTS = \
--disable-expert-mode \
--without-java \