rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move buildroot to bsp directory.

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2016-11-16 22:05:33 +01:00
parent 317c040ea8
commit 807ab03547
7408 changed files with 0 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
bsp/buildroot/package/beecrypt/0001-cppglue.cxx-cplusplus-only.patch Normal file
View File

@@ -0,0 +1,28 @@
Makefile.am: Only compile/link cppglue.cxx if --with-cplusplus is used
Bloats libbeecrypt for no use and breaks build on systems without a C++
compiler.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
Makefile.am | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
Index: beecrypt-4.2.1/Makefile.am
===================================================================
--- beecrypt-4.2.1.orig/Makefile.am
+++ beecrypt-4.2.1/Makefile.am
@@ -62,7 +62,12 @@
lib_LTLIBRARIES = libbeecrypt.la
-libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhies.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha224.c hmacsha256.c md4.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c ripemd128.c ripemd160.c ripemd256.c ripemd320.c rsa.c rsakp.c rsapk.c sha1.c sha224.c sha256.c sha384.c sha512.c sha2k32.c sha2k64.c timestamp.c cppglue.cxx
+libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhies.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha224.c hmacsha256.c md4.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c ripemd128.c ripemd160.c ripemd256.c ripemd320.c rsa.c rsakp.c rsapk.c sha1.c sha224.c sha256.c sha384.c sha512.c sha2k32.c sha2k64.c timestamp.c
+
+if WITH_CPLUSPLUS
+libbeecrypt_la_SOURCES += cppglue.cxx
+endif
+
libbeecrypt_la_DEPENDENCIES = $(BEECRYPT_OBJECTS)
libbeecrypt_la_LIBADD = blowfishopt.lo mpopt.lo sha1opt.lo $(OPENMP_LIBS)
libbeecrypt_la_LDFLAGS = -no-undefined -version-info $(LIBBEECRYPT_LT_CURRENT):$(LIBBEECRYPT_LT_REVISION):$(LIBBEECRYPT_LT_AGE)

31
bsp/buildroot/package/beecrypt/0002-icu-check-cross-compile.patch Normal file
View File

@@ -0,0 +1,31 @@
configure: Use AC_COMPILE_IFELSE for ICU check for cross compilation compat
AC_RUN_IFELSE doesn't work when cross compiling, but we can do the
check in the preprocessor instead, so use AC_COMPILE_IFELSE instead.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: beecrypt-4.2.1/configure.ac
===================================================================
--- beecrypt-4.2.1.orig/configure.ac
+++ beecrypt-4.2.1/configure.ac
@@ -295,13 +295,13 @@
if test "$ac_with_cplusplus" = yes; then
AC_MSG_CHECKING([for IBM's ICU library version >= 2.8])
AC_LANG_PUSH(C)
- AC_RUN_IFELSE([
+ AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([[#include <unicode/uversion.h>]],[[
#if U_ICU_VERSION_MAJOR_NUM < 2
- exit(1);
+ #error too old
#elif U_ICU_VERSION_MAJOR_NUM == 2
# if U_ICU_VERSION_MINOR_NUM < 8
- exit(1);
+ #error too old
# else
exit(0);
# endif

173
bsp/buildroot/package/beecrypt/0003-build-system.patch Normal file
View File

@@ -0,0 +1,173 @@
Fix build with BR2_ENABLE_DEBUG=yes, no need for expert mode anymore
Otherwise configure issues this error message:
configure: error: --enable-debug cannot be used in conjunction with --enable-expert-mode
Downloaded from Gentoo:
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/beecrypt/files/beecrypt-4.2.1-build-system.patch?revision=1.2&view=markup
This patch also removes the hard-coded CFLAGS provided by beecrypt in favour
of the CFLAGS provided by buildroot.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
--- beecrypt-4.2.1/configure.ac
+++ beecrypt-4.2.1/configure.ac
@@ -11,7 +11,7 @@
# Checks for package options
AC_ARG_ENABLE(expert-mode, [ --enable-expert-mode follow user-defined CFLAGS settings [[default=no]]],[
- ac_enable_expert_mode=yes
+ ac_enable_expert_mode=$enableval
],[
if test "X$CFLAGS" != "X"; then
echo "enabling expert mode"
@@ -25,7 +25,7 @@
if test "$ac_enable_expert_mode" = yes; then
AC_MSG_ERROR([--enable-debug cannot be used in conjunction with --enable-expert-mode])
fi
- ac_enable_debug=yes
+ ac_enable_debug=$enableval
],[
ac_enable_debug=no
])
@@ -456,7 +456,7 @@
ac_cv_python_include="-I`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_inc()'`"
])
AC_CACHE_CHECK([where to install python libraries], ac_cv_python_libdir, [
- ac_cv_python_libdir=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()'`
+ ac_cv_python_libdir=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, 0)'`
])
fi
fi
--- beecrypt-4.2.1/acinclude.m4
+++ beecrypt-4.2.1/acinclude.m4
@@ -498,15 +498,6 @@ AC_DEFUN([BEE_GNU_CC],[
AC_SUBST(OPENMP_LIBS,"-lgomp")
fi
case $bc_target_arch in
- x86_64 | athlon64 | athlon-fx | k8 | opteron | em64t | nocona)
- CC="$CC -m64"
- ;;
- i[[3456]]86 | \
- pentium* | \
- athlon*)
- CC="$CC -m32"
- CCAS="$CCAS -m32"
- ;;
ia64)
case $target_os in
# HP/UX on Itanium needs to be told that a long is 64-bit!
@@ -525,17 +516,8 @@ AC_DEFUN([BEE_GNU_CC],[
aix*)
CC="$CC -maix64"
;;
- linux*)
- CC="$CC -m64"
- ;;
esac
;;
- sparc | sparcv8*)
- CC="$CC -m32"
- ;;
- sparc64 | sparcv9*)
- CC="$CC -m64"
- ;;
esac
# Certain platforms needs special flags for multi-threaded code
if test "$ac_enable_threads" = yes; then
@@ -646,14 +646,6 @@ dnl BEE_GNU_CXX
AC_DEFUN([BEE_GNU_CXX],[
AC_REQUIRE([AC_PROG_CXX])
case $bc_target_arch in
- x86_64 | athlon64 | athlon-fx | k8 | opteron | em64t | nocona | core2)
- CXX="$CXX -m64"
- ;;
- i[[3456]]86 | \
- pentium* | \
- athlon*)
- CXX="$CXX -m32"
- ;;
ia64)
case $target_os in
# HP/UX on Itanium needs to be told that a long is 64-bit!
@@ -672,17 +664,8 @@ AC_DEFUN([BEE_GNU_CXX],[
aix*)
CXX="$CXX -maix64"
;;
- linux*)
- CXX="$CXX -m64"
- ;;
esac
;;
- sparc | sparcv8*)
- CXX="$CXX -m32"
- ;;
- sparc64 | sparcv9*)
- CXX="$CXX -m64"
- ;;
esac
# Certain platforms needs special flags for multi-threaded code
if test "$ac_enable_threads" = yes; then
--- beecrypt-4.2.1/java/Makefile.am
+++ beecrypt-4.2.1/java/Makefile.am
@@ -26,7 +26,7 @@
INCLUDES = -I$(top_srcdir)/include
-libaltdir=$(prefix)/lib@LIBALT@
+libaltdir=$(libdir)
libalt_LTLIBRARIES = libbeecrypt_java.la
--- beecrypt-4.2.1/acinclude.m4
+++ beecrypt-4.2.1/acinclude.m4
@@ -1589,20 +1589,5 @@
AC_SUBST(TYPEDEF_BC_THREADID_T,$bc_typedef_bc_threadid_t)
])
-
-AH_BOTTOM([
-#if ENABLE_THREADS
-# ifndef _REENTRANT
-# define _REENTRANT
-# endif
-# if LINUX
-# define _LIBC_REENTRANT
-# endif
-#else
-# ifdef _REENTRANT
-# undef _REENTRANT
-# endif
-#endif
-])
dnl BEE_THREAD_LOCAL_STORAGE
@@ -1623,7 +1609,5 @@
])
AH_BOTTOM([
-#if !ENABLE_THREAD_LOCAL_STORAGE
-# define __thread
-#endif
+#include "config.threads.h"
])
--- beecrypt-4.2.1/config.threads.h
+++ beecrypt-4.2.1/config.threads.h
@@ -0,0 +1,16 @@
+#if ENABLE_THREADS
+# ifndef _REENTRANT
+# define _REENTRANT
+# endif
+# if LINUX
+# define _LIBC_REENTRANT
+# endif
+#else
+# ifdef _REENTRANT
+# undef _REENTRANT
+# endif
+#endif
+
+#if !ENABLE_THREAD_LOCAL_STORAGE
+# define __thread
+#endif

19
bsp/buildroot/package/beecrypt/0004-gcc-4.7.patch Normal file
View File

@@ -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;
}

29
bsp/buildroot/package/beecrypt/Config.in Normal file
View File

@@ -0,0 +1,29 @@
comment "beecrypt needs a toolchain w/ threads"
depends on !BR2_TOOLCHAIN_HAS_THREADS
config BR2_PACKAGE_BEECRYPT
bool "beecrypt"
depends on BR2_TOOLCHAIN_HAS_THREADS
help
Beecrypt is a general-purpose cryptography library.
http://beecrypt.sf.net
if BR2_PACKAGE_BEECRYPT
config BR2_PACKAGE_BEECRYPT_CPP
bool "C++ support"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR # icu
depends on !BR2_BINFMT_FLAT # icu
depends on !BR2_STATIC_LIBS
select BR2_PACKAGE_ICU
help
Enable C++ support. This pulls in the (large) icu package.
comment "C++ support needs a toolchain w/ C++, wchar, dynamic libraries"
depends on !BR2_BINFMT_FLAT
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \
|| BR2_STATIC_LIBS
endif # BR2_PACKAGE_BEECRYPT

2
bsp/buildroot/package/beecrypt/beecrypt.hash Normal file
View File

@@ -0,0 +1,2 @@
# Locally computed:
sha256 286f1f56080d1a6b1d024003a5fa2158f4ff82cae0c6829d3c476a4b5898c55d beecrypt-4.2.1.tar.gz

35
bsp/buildroot/package/beecrypt/beecrypt.mk Normal file
View File

@@ -0,0 +1,35 @@
################################################################################
#
# beecrypt
#
################################################################################
BEECRYPT_VERSION = 4.2.1
BEECRYPT_SITE = http://downloads.sourceforge.net/project/beecrypt/beecrypt/$(BEECRYPT_VERSION)
BEECRYPT_AUTORECONF = YES
BEECRYPT_INSTALL_STAGING = YES
BEECRYPT_LICENSE = LGPLv2.1+
BEECRYPT_LICENSE_FILES = COPYING.LIB
BEECRYPT_CONF_OPTS = \
--disable-expert-mode \
--without-java \
--without-python \
--disable-openmp
ifeq ($(BR2_PACKAGE_BEECRYPT_CPP),y)
BEECRYPT_DEPENDENCIES += icu
BEECRYPT_CONF_OPTS += --with-cplusplus
else
BEECRYPT_CONF_OPTS += --without-cplusplus
# automake/libtool uses the C++ compiler to link libbeecrypt because of
# (the optional) cppglue.cxx. Force it to use the C compiler instead.
define BEECRYPT_LINK_WITH_CC
$(SED) 's/--tag=CXX/--tag=CC/g' $(@D)/Makefile
endef
BEECRYPT_POST_CONFIGURE_HOOKS += BEECRYPT_LINK_WITH_CC
endif
$(eval $(autotools-package))