From 3baff56fe62440081e22efb650ae07b6e09365bb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 5 Nov 2009 13:11:16 +0000 Subject: beecrypt: Convert to BBCLASSEXTEND Signed-off-by: Richard Purdie --- meta/packages/beecrypt/beecrypt-native_3.1.0.bb | 9 --------- meta/packages/beecrypt/beecrypt/x64fix.patch | 20 ++++++++++++++++++++ meta/packages/beecrypt/beecrypt_3.1.0.bb | 4 ++++ meta/packages/beecrypt/files/x64fix.patch | 20 -------------------- 4 files changed, 24 insertions(+), 29 deletions(-) delete mode 100644 meta/packages/beecrypt/beecrypt-native_3.1.0.bb create mode 100644 meta/packages/beecrypt/beecrypt/x64fix.patch delete mode 100644 meta/packages/beecrypt/files/x64fix.patch diff --git a/meta/packages/beecrypt/beecrypt-native_3.1.0.bb b/meta/packages/beecrypt/beecrypt-native_3.1.0.bb deleted file mode 100644 index b056a0fb4..000000000 --- a/meta/packages/beecrypt/beecrypt-native_3.1.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -# beecrypt-native OE build file -# Copyright (C) 2004-2005, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -require beecrypt_${PV}.bb -S = "${WORKDIR}/beecrypt-${PV}" - -inherit native -EXTRA_OECONF="--enable-shared --enable-static" diff --git a/meta/packages/beecrypt/beecrypt/x64fix.patch b/meta/packages/beecrypt/beecrypt/x64fix.patch new file mode 100644 index 000000000..9ee75c140 --- /dev/null +++ b/meta/packages/beecrypt/beecrypt/x64fix.patch @@ -0,0 +1,20 @@ +Index: beecrypt-3.1.0/configure.ac +=================================================================== +--- beecrypt-3.1.0.orig/configure.ac 2008-08-16 12:08:02.000000000 +0100 ++++ beecrypt-3.1.0/configure.ac 2008-08-16 12:08:26.000000000 +0100 +@@ -754,15 +754,6 @@ + + # Check where to install the libraries + bc_libalt= +-case $target_os in +-linux*) +- case $bc_target_arch in +- alpha* | powerpc64 | s390x | x86_64) +- bc_libalt="64" +- ;; +- esac +- ;; +-esac + AC_SUBST(LIBALT,$bc_libalt) + + # Generate output files. diff --git a/meta/packages/beecrypt/beecrypt_3.1.0.bb b/meta/packages/beecrypt/beecrypt_3.1.0.bb index 78ff5cad2..b7777f886 100644 --- a/meta/packages/beecrypt/beecrypt_3.1.0.bb +++ b/meta/packages/beecrypt/beecrypt_3.1.0.bb @@ -7,7 +7,11 @@ HOMEPAGE="http://sourceforge.net/projects/beecrypt" SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \ file://x64fix.patch;patch=1" +PR = "r1" + inherit autotools_stage acpaths="" EXTRA_OECONF="--with-arch=${TARGET_ARCH} --enable-shared --enable-static" + +BBCLASSEXTEND = "native" diff --git a/meta/packages/beecrypt/files/x64fix.patch b/meta/packages/beecrypt/files/x64fix.patch deleted file mode 100644 index 9ee75c140..000000000 --- a/meta/packages/beecrypt/files/x64fix.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: beecrypt-3.1.0/configure.ac -=================================================================== ---- beecrypt-3.1.0.orig/configure.ac 2008-08-16 12:08:02.000000000 +0100 -+++ beecrypt-3.1.0/configure.ac 2008-08-16 12:08:26.000000000 +0100 -@@ -754,15 +754,6 @@ - - # Check where to install the libraries - bc_libalt= --case $target_os in --linux*) -- case $bc_target_arch in -- alpha* | powerpc64 | s390x | x86_64) -- bc_libalt="64" -- ;; -- esac -- ;; --esac - AC_SUBST(LIBALT,$bc_libalt) - - # Generate output files. -- cgit v1.2.3