Selaa lähdekoodia

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>
Bernd Kuhls 10 vuotta sitten
vanhempi
commit
2717199e13
2 muutettua tiedostoa jossa 19 lisäystä ja 6 poistoa
  1. 19 0
      package/beecrypt/beecrypt-0004-gcc-4.7.patch
  2. 0 6
      package/beecrypt/beecrypt.mk

+ 19 - 0
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;
+ 			}

+ 0 - 6
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 \