aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <bluelightning@bluelightning.org>2008-10-09 18:45:35 +0000
committerPaul Eggleton <bluelightning@bluelightning.org>2008-10-09 18:45:35 +0000
commita45047da3de16071ec5f66689ff5e4c28f82c111 (patch)
tree096b3ec317db3219e511c69abc5e6eddb4c9fbca
parent9c879dc9f73066f6a2a9b0989ab7247715d6380e (diff)
downloadopenembedded-a45047da3de16071ec5f66689ff5e4c28f82c111.tar.gz
beecrypt: merge duplicate recipes
* Merge do_stage from portabase/beecrypt into beecrypt * Delete portabase/beecrypt (patches no longer seem to be necessary) Applied to .dev in: 88676b03209e4a8147b6f9ab4d6f5c66d0132128
-rw-r--r--packages/beecrypt/beecrypt_3.1.0.bb16
-rw-r--r--packages/portabase/beecrypt/.mtn2git_empty0
-rw-r--r--packages/portabase/beecrypt/config.m416
-rw-r--r--packages/portabase/beecrypt/gas.patch166
-rw-r--r--packages/portabase/beecrypt/m4.diff155
-rw-r--r--packages/portabase/beecrypt_3.1.0.bb34
6 files changed, 16 insertions, 371 deletions
diff --git a/packages/beecrypt/beecrypt_3.1.0.bb b/packages/beecrypt/beecrypt_3.1.0.bb
index 3187b9b12a..f9a45e74df 100644
--- a/packages/beecrypt/beecrypt_3.1.0.bb
+++ b/packages/beecrypt/beecrypt_3.1.0.bb
@@ -6,7 +6,23 @@ DESCRIPTION="Beecrypt is a general-purpose cryptography library."
HOMEPAGE="http://sourceforge.net/projects/beecrypt"
SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz"
+PR = "r2"
+
inherit autotools
acpaths=""
EXTRA_OECONF="--with-arch=${TARGET_ARCH} --enable-shared --enable-static"
+
+do_stage() {
+
+# oe_libinstall -a -C .libs libbeecrypt ${STAGING_LIBDIR}
+ cp .libs/libbeecrypt.a ${STAGING_LIBDIR}/
+ install -d ${STAGING_INCDIR}/
+ install -d ${STAGING_INCDIR}/beecrypt
+ for X in beecrypt.h beecrypt.api.h memchunk.h mpnumber.h beecrypt.gnu.h mp.h mpopt.h blockmode.h endianness.h
+ do
+ install -m 0644 ${X} ${STAGING_INCDIR}/beecrypt/${X}
+ done
+
+}
+
diff --git a/packages/portabase/beecrypt/.mtn2git_empty b/packages/portabase/beecrypt/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/portabase/beecrypt/.mtn2git_empty
+++ /dev/null
diff --git a/packages/portabase/beecrypt/config.m4 b/packages/portabase/beecrypt/config.m4
deleted file mode 100644
index 05d2d1593d..0000000000
--- a/packages/portabase/beecrypt/config.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-dnl config.m4
-ifdef(`__CONFIG_M4_INCLUDED__',,`
-define(`CONFIG_TOP_SRCDIR',`/home/hrw/zaurus/oe/build/0930/tmp/work/beecrypt-3.1.0-r0/beecrypt-3.1.0')
-define(`ASM_OS',`linux-gnu')
-define(`ASM_CPU',`arm')
-define(`ASM_ARCH',`arm')
-define(`ASM_BIGENDIAN',`no')
-define(`ASM_SRCDIR',`/home/hrw/zaurus/oe/build/0930/tmp/work/beecrypt-3.1.0-r0/beecrypt-3.1.0/gas')
-define(`TEXTSEG',`.text')
-define(`GLOBL',`.globl')
-define(`GSYM_PREFIX',`')
-define(`LSYM_PREFIX',`.L')
-define(`ALIGN',`')
-define(`__CONFIG_M4_INCLUDED__')
-include(asmdefs.m4)
-')
diff --git a/packages/portabase/beecrypt/gas.patch b/packages/portabase/beecrypt/gas.patch
deleted file mode 100644
index bdb20944d3..0000000000
--- a/packages/portabase/beecrypt/gas.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-diff -ur beecrypt-3.1.0/gas.orig/aesopt.ppc.m4 beecrypt-3.1.0/gas/aesopt.ppc.m4
---- beecrypt-3.1.0/gas.orig/aesopt.ppc.m4 2003-06-09 08:03:21 +0200
-+++ beecrypt-3.1.0/gas/aesopt.ppc.m4 2004-10-06 17:59:31 +0200
-@@ -21,7 +21,7 @@
- dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- include(config.m4)
--include(ASM_SRCDIR/ppc.m4)
-+include(ppc.m4)
-
- define(`s0',`r24')
- define(`s1',`r25')
-diff -ur beecrypt-3.1.0/gas.orig/aesopt.x86.m4 beecrypt-3.1.0/gas/aesopt.x86.m4
---- beecrypt-3.1.0/gas.orig/aesopt.x86.m4 2003-06-09 10:35:39 +0200
-+++ beecrypt-3.1.0/gas/aesopt.x86.m4 2004-10-06 17:54:36 +0200
-@@ -1,5 +1,5 @@
- include(config.m4)
--include(ASM_SRCDIR/x86.m4)
-+include(x86.m4)
-
- ifdef(`USE_MMX',`
-
-diff -ur beecrypt-3.1.0/gas.orig/blowfishopt.i586.m4 beecrypt-3.1.0/gas/blowfishopt.i586.m4
---- beecrypt-3.1.0/gas.orig/blowfishopt.i586.m4 2003-06-09 10:25:11 +0200
-+++ beecrypt-3.1.0/gas/blowfishopt.i586.m4 2004-10-06 17:54:58 +0200
-@@ -19,7 +19,7 @@
- dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- include(config.m4)
--include(ASM_SRCDIR/x86.m4)
-+include(x86.m4)
-
- dnl during this macro we assume:
- dnl bp in %esi, xl and xr in %ecx and %edx, %eax and %ebx clear
-diff -ur beecrypt-3.1.0/gas.orig/blowfishopt.ppc.m4 beecrypt-3.1.0/gas/blowfishopt.ppc.m4
---- beecrypt-3.1.0/gas.orig/blowfishopt.ppc.m4 2003-06-04 19:39:57 +0200
-+++ beecrypt-3.1.0/gas/blowfishopt.ppc.m4 2004-10-06 17:59:36 +0200
-@@ -21,7 +21,7 @@
- dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- include(config.m4)
--include(ASM_SRCDIR/ppc.m4)
-+include(ppc.m4)
-
- define(`round',`
- lwz r9,$3(r3)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.alpha.m4 beecrypt-3.1.0/gas/mpopt.alpha.m4
---- beecrypt-3.1.0/gas.orig/mpopt.alpha.m4 2003-05-29 10:44:37 +0200
-+++ beecrypt-3.1.0/gas/mpopt.alpha.m4 2004-10-06 17:57:20 +0200
-@@ -19,7 +19,7 @@
- dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- include(config.m4)
--include(ASM_SRCDIR/alpha.m4)
-+include(alpha.m4)
-
-
- C_FUNCTION_BEGIN(mpadd)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.ia64.m4 beecrypt-3.1.0/gas/mpopt.ia64.m4
---- beecrypt-3.1.0/gas.orig/mpopt.ia64.m4 2003-05-28 10:40:44 +0200
-+++ beecrypt-3.1.0/gas/mpopt.ia64.m4 2004-10-06 17:57:32 +0200
-@@ -19,7 +19,7 @@
- dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- include(config.m4)
--include(ASM_SRCDIR/ia64.m4)
-+include(ia64.m4)
-
- define(`sze',`r14')
- define(`dst',`r15')
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.m68k.m4 beecrypt-3.1.0/gas/mpopt.m68k.m4
---- beecrypt-3.1.0/gas.orig/mpopt.m68k.m4 2003-04-26 14:01:57 +0200
-+++ beecrypt-3.1.0/gas/mpopt.m68k.m4 2004-10-06 17:57:38 +0200
-@@ -19,7 +19,7 @@
- dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- include(config.m4)
--include(ASM_SRCDIR/m68k.m4)
-+include(m68k.m4)
-
- dnl works
- C_FUNCTION_BEGIN(mpadd)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.ppc64.m4 beecrypt-3.1.0/gas/mpopt.ppc64.m4
---- beecrypt-3.1.0/gas.orig/mpopt.ppc64.m4 2003-04-19 18:05:43 +0200
-+++ beecrypt-3.1.0/gas/mpopt.ppc64.m4 2004-10-06 17:57:54 +0200
-@@ -19,7 +19,7 @@
- dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- include(config.m4)
--include(ASM_SRCDIR/ppc64.m4)
-+include(ppc64.m4)
-
-
- C_FUNCTION_BEGIN(mpaddw)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.ppc.m4 beecrypt-3.1.0/gas/mpopt.ppc.m4
---- beecrypt-3.1.0/gas.orig/mpopt.ppc.m4 2003-04-19 18:05:43 +0200
-+++ beecrypt-3.1.0/gas/mpopt.ppc.m4 2004-10-06 17:57:50 +0200
-@@ -19,7 +19,7 @@
- dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- include(config.m4)
--include(ASM_SRCDIR/ppc.m4)
-+include(ppc.m4)
-
-
- C_FUNCTION_BEGIN(mpaddw)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.sparcv8.m4 beecrypt-3.1.0/gas/mpopt.sparcv8.m4
---- beecrypt-3.1.0/gas.orig/mpopt.sparcv8.m4 2003-04-19 18:05:43 +0200
-+++ beecrypt-3.1.0/gas/mpopt.sparcv8.m4 2004-10-06 17:56:54 +0200
-@@ -19,7 +19,7 @@
- dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- include(config.m4)
--include(ASM_SRCDIR/sparc.m4)
-+include(sparc.m4)
-
-
- C_FUNCTION_BEGIN(mpsetmul)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.sparcv8plus.m4 beecrypt-3.1.0/gas/mpopt.sparcv8plus.m4
---- beecrypt-3.1.0/gas.orig/mpopt.sparcv8plus.m4 2003-04-19 18:05:43 +0200
-+++ beecrypt-3.1.0/gas/mpopt.sparcv8plus.m4 2004-10-06 17:57:04 +0200
-@@ -19,7 +19,7 @@
- dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- include(config.m4)
--include(ASM_SRCDIR/sparc.m4)
-+include(sparc.m4)
-
-
- C_FUNCTION_BEGIN(mpaddw)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.x86_64.m4 beecrypt-3.1.0/gas/mpopt.x86_64.m4
---- beecrypt-3.1.0/gas.orig/mpopt.x86_64.m4 2003-05-29 14:40:37 +0200
-+++ beecrypt-3.1.0/gas/mpopt.x86_64.m4 2004-10-06 17:56:14 +0200
-@@ -21,7 +21,7 @@
- .file "mpopt.s"
-
- include(config.m4)
--include(ASM_SRCDIR/x86_64.m4)
-+include(x86_64.m4)
-
-
- C_FUNCTION_BEGIN(mpzero)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.x86.m4 beecrypt-3.1.0/gas/mpopt.x86.m4
---- beecrypt-3.1.0/gas.orig/mpopt.x86.m4 2003-06-04 19:39:58 +0200
-+++ beecrypt-3.1.0/gas/mpopt.x86.m4 2004-10-06 17:56:27 +0200
-@@ -19,7 +19,7 @@
- dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- include(config.m4)
--include(ASM_SRCDIR/x86.m4)
-+include(x86.m4)
-
-
- C_FUNCTION_BEGIN(mpzero)
-diff -ur beecrypt-3.1.0/gas.orig/sha1opt.x86.m4 beecrypt-3.1.0/gas/sha1opt.x86.m4
---- beecrypt-3.1.0/gas.orig/sha1opt.x86.m4 2003-05-08 19:52:54 +0200
-+++ beecrypt-3.1.0/gas/sha1opt.x86.m4 2004-10-06 17:55:20 +0200
-@@ -19,7 +19,7 @@
- dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- include(config.m4)
--include(ASM_SRCDIR/x86.m4)
-+include(x86.m4)
-
- .equ K00, 0x5a827999
- .equ K20, 0x6ed9eba1
diff --git a/packages/portabase/beecrypt/m4.diff b/packages/portabase/beecrypt/m4.diff
deleted file mode 100644
index 0d07f75cb2..0000000000
--- a/packages/portabase/beecrypt/m4.diff
+++ /dev/null
@@ -1,155 +0,0 @@
---- beecrypt-3.1.0/acinclude.m4.orig 2004-10-06 17:09:25.000000000 +0200
-+++ beecrypt-3.1.0/acinclude.m4 2004-10-06 17:12:22.000000000 +0200
-@@ -9,7 +9,7 @@
-
-
- dnl BEECRYPT_INT_TYPES
--AC_DEFUN(BEECRYPT_INT_TYPES,[
-+AC_DEFUN([BEECRYPT_INT_TYPES],[
- AC_TYPE_SIZE_T
- bc_typedef_size_t=
- if test $ac_cv_type_size_t != yes; then
-@@ -112,7 +112,7 @@
-
-
- dnl BEECRYPT_CPU_BITS
--AC_DEFUN(BEECRYPT_CPU_BITS,[
-+AC_DEFUN([BEECRYPT_CPU_BITS],[
- AC_CHECK_SIZEOF([unsigned long])
- if test $ac_cv_sizeof_unsigned_long -eq 8; then
- AC_SUBST(MP_WBITS,64U)
-@@ -125,7 +125,7 @@
-
-
- dnl BEECRYPT_WORKING_AIO
--AC_DEFUN(BEECRYPT_WORKING_AIO,[
-+AC_DEFUN([BEECRYPT_WORKING_AIO],[
- AC_CHECK_HEADERS(aio.h)
- if test "$ac_cv_header_aio_h" = yes; then
- AC_SEARCH_LIBS([aio_read],[c rt aio posix4],[
-@@ -228,7 +228,7 @@
-
-
- dnl BEECRYPT_CFLAGS_REM
--AC_DEFUN(BEECRYPT_CFLAGS_REM,[
-+AC_DEFUN([BEECRYPT_CFLAGS_REM],[
- if test "$CFLAGS" != ""; then
- CFLAGS_save=""
- for flag in $CFLAGS
-@@ -243,7 +243,7 @@
-
-
- dnl BEECRYPT_GNU_CC
--AC_DEFUN(BEECRYPT_GNU_CC,[
-+AC_DEFUN([BEECRYPT_GNU_CC],[
- AC_REQUIRE([AC_PROG_CC])
- case $bc_target_arch in
- ia64)
-@@ -331,7 +331,7 @@
-
-
- dnl BEECRYPT_COMPAQ_CC
--AC_DEFUN(BEECRYPT_COMPAQ_CC,[
-+AC_DEFUN([BEECRYPT_COMPAQ_CC],[
- AC_REQUIRE([AC_PROG_CC])
- AC_REQUIRE([AC_PROG_CPP])
- AC_CACHE_CHECK([whether we are using Compaq's C compiler],bc_cv_prog_COMPAQ_CC,[
-@@ -355,7 +355,7 @@
-
-
- dnl BEECRYPT_HPUX_CC
--AC_DEFUN(BEECRYPT_HPUX_CC,[
-+AC_DEFUN([BEECRYPT_HPUX_CC],[
- if test "$ac_enable_debug" != yes; then
- BEECRYPT_CFLAGS_REM([-g])
- CFLAGS="$CFLAGS -fast"
-@@ -364,7 +364,7 @@
-
-
- dnl BEECRYPT_IBM_CC
--AC_DEFUN(BEECRYPT_IBM_CC,[
-+AC_DEFUN([BEECRYPT_IBM_CC],[
- AC_REQUIRE([AC_PROG_CC])
- AC_REQUIRE([AC_PROG_CPP])
- AC_CACHE_CHECK([whether we are using IBM C],bc_cv_prog_IBM_CC,[
-@@ -398,7 +398,7 @@
-
-
- dnl BEECRYPT_INTEL_CC
--AC_DEFUN(BEECRYPT_INTEL_CC,[
-+AC_DEFUN([BEECRYPT_INTEL_CC],[
- AC_REQUIRE([AC_PROG_CC])
- AC_REQUIRE([AC_PROG_CPP])
- AC_CACHE_CHECK([whether we are using Intel C++],bc_cv_prog_INTEL_CC,[
-@@ -448,7 +448,7 @@
-
-
- dnl BEECRYPT_SUN_FORTE_CC
--AC_DEFUN(BEECRYPT_SUN_FORTE_CC,[
-+AC_DEFUN([BEECRYPT_SUN_FORTE_CC],[
- AC_REQUIRE([AC_PROG_CC])
- AC_REQUIRE([AC_PROG_CPP])
- AC_CACHE_CHECK([whether we are using Sun Forte C],bc_cv_prog_SUN_FORTE_CC,[
-@@ -485,7 +485,7 @@
-
-
- dnl BEECRYPT_ASM_DEFS
--AC_DEFUN(BEECRYPT_ASM_DEFS,[
-+AC_DEFUN([BEECRYPT_ASM_DEFS],[
- AC_SUBST(ASM_OS,$target_os)
- AC_SUBST(ASM_CPU,$bc_target_cpu)
- AC_SUBST(ASM_ARCH,$bc_target_arch)
-@@ -494,7 +494,7 @@
-
-
- dnl BEECRYPT_ASM_TEXTSEG
--AC_DEFUN(BEECRYPT_ASM_TEXTSEG,[
-+AC_DEFUN([BEECRYPT_ASM_TEXTSEG],[
- AC_CACHE_CHECK([how to switch to text segment],
- bc_cv_asm_textseg,[
- case $target_os in
-@@ -516,7 +516,7 @@
-
-
- dnl BEECRYPT_ASM_GLOBL
--AC_DEFUN(BEECRYPT_ASM_GLOBL,[
-+AC_DEFUN([BEECRYPT_ASM_GLOBL],[
- AC_CACHE_CHECK([how to declare a global symbol],
- bc_cv_asm_globl,[
- case $target_os in
-@@ -529,7 +529,7 @@
-
-
- dnl BEECRYPT_ASM_GSYM_PREFIX
--AC_DEFUN(BEECRYPT_ASM_GSYM_PREFIX,[
-+AC_DEFUN([BEECRYPT_ASM_GSYM_PREFIX],[
- AC_CACHE_CHECK([if global symbols need leading underscore],
- bc_cv_asm_gsym_prefix,[
- case $target_os in
-@@ -542,7 +542,7 @@
-
-
- dnl BEECRYPT_ASM_LSYM_PREFIX
--AC_DEFUN(BEECRYPT_ASM_LSYM_PREFIX,[
-+AC_DEFUN([BEECRYPT_ASM_LSYM_PREFIX],[
- AC_CACHE_CHECK([how to declare a local symbol],
- bc_cv_asm_lsym_prefix,[
- case $target_os in
-@@ -562,7 +562,7 @@
-
-
- dnl BEECRYPT_ASM_ALIGN
--AC_DEFUN(BEECRYPT_ASM_ALIGN,[
-+AC_DEFUN([BEECRYPT_ASM_ALIGN],[
- AC_CACHE_CHECK([how to align symbols],
- bc_cv_asm_align,[
- case $target_cpu in
-@@ -587,7 +587,7 @@
-
-
- dnl BEECRYPT_ASM_SOURCES
--AC_DEFUN(BEECRYPT_ASM_SOURCES,[
-+AC_DEFUN([BEECRYPT_ASM_SOURCES],[
- echo > mpopt.s
- echo > aesopt.s
- echo > blowfishopt.s
diff --git a/packages/portabase/beecrypt_3.1.0.bb b/packages/portabase/beecrypt_3.1.0.bb
deleted file mode 100644
index bd61bad88e..0000000000
--- a/packages/portabase/beecrypt_3.1.0.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-SECTION = "console/utils"
-DESCRIPTION = "BeeCrypt is an ongoing project to provide a strong and fast cryptography \
-toolkit. Includes entropy sources, random generators, block ciphers, hash functions, \
-message authentication codes, multiprecision integer routines, and public key primitives."
-
-HOMEPAGE = "http://sourceforge.net/projects/beecrypt/"
-LICENSE = "LGPL"
-SRC_URI = "${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \
-file://config.m4 \
-file://gas.patch;patch=1 \
-file://m4.diff;patch=1"
-PR = "r1"
-
-inherit autotools
-
-do_configure_prepend() {
-
-cp ${WORKDIR}/config.m4 ${S}/gas/
-
-}
-
-
-do_stage() {
-
-# oe_libinstall -a -C .libs libbeecrypt ${STAGING_LIBDIR}
- cp .libs/libbeecrypt.a ${STAGING_LIBDIR}/
- install -d ${STAGING_INCDIR}/
- install -d ${STAGING_INCDIR}/beecrypt
- for X in beecrypt.h beecrypt.api.h memchunk.h mpnumber.h beecrypt.gnu.h mp.h mpopt.h blockmode.h endianness.h
- do
- install -m 0644 ${X} ${STAGING_INCDIR}/beecrypt/${X}
- done
-
-}