[Lunar-commits] <moonbase> beecrypt: fix compilation for rpm

[Paul Bredbury]

commit adb0a8e4ee3ffde7da44346e8771bca27cff0521
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Thu Sep 10 07:01:11 2009 +0700

    beecrypt: fix compilation for rpm
    
    rpm needs beecrypt compiled with --disable-openmp
---
 crypto/beecrypt/BUILD   |   19 ++++++++++++++-----
 crypto/beecrypt/DETAILS |    2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/crypto/beecrypt/BUILD b/crypto/beecrypt/BUILD
index 99fe35e..6c0af20 100644
--- a/crypto/beecrypt/BUILD
+++ b/crypto/beecrypt/BUILD
@@ -1,18 +1,27 @@
 (
 
+  # Was installing /usr/lib at LIBALT@/libbeecrypt_java.so.7.0.0
+  sedit "s:lib at LIBALT@:lib:" java/Makefile.in  &&
+
   # Fixes compilation error:
   # mpopt.s:62: Error: bad register name `%rdi'
   # http://bugs.sourcemage.org/show_bug.cgi?id=15293#c2
   if [[ $(arch) == i686 ]] ; then
     # Workaround for bad configure script
-    export CFLAGS=${CFLAGS/-march=nocona/-march=i686}
-    export CFLAGS=${CFLAGS/-march=core2/-march=i686}
-    export CFLAGS=${CFLAGS/-march=athlon-fx/-march=i686}
-    export CFLAGS=${CFLAGS/-march=k8/-march=i686}
-    export CFLAGS=${CFLAGS/-march=opteron/-march=i686}
+    export CFLAGS=${CFLAGS/-march=nocona/-march=i686}     &&
+    export CFLAGS=${CFLAGS/-march=core2/-march=i686}      &&
+    export CFLAGS=${CFLAGS/-march=athlon-fx/-march=i686}  &&
+    export CFLAGS=${CFLAGS/-march=k8/-march=i686}         &&
+    export CFLAGS=${CFLAGS/-march=opteron/-march=i686}    &&
     export CFLAGS=${CFLAGS/-march=em64t/-march=i686}
   fi  &&
 
+  # Fixes compilation of rpm - http://rpm5.org/cvs/tktview?tn=51
+  # checking for mpfprintln in -lbeecrypt... no
+  # checking whether to build with BeeCrypt library... no
+  # configure: error: mandatory BeeCrypt library not found
+  OPTS+=" --disable-openmp"  &&
+
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/crypto/beecrypt/DETAILS b/crypto/beecrypt/DETAILS
index 2368bb6..43b0ebb 100644
--- a/crypto/beecrypt/DETAILS
+++ b/crypto/beecrypt/DETAILS
@@ -5,7 +5,7 @@
       SOURCE_VFY=sha1:b1c62c2480c79302a8ca5c09063b3d654275eae0
         WEB_SITE=http://sourceforge.net/projects/beecrypt/
          ENTERED=20070522
-         UPDATED=20090908
+         UPDATED=20090909
            SHORT="provides a strong and fast cryptography toolkit"
 cat << EOF
 BeeCrypt is an ongoing project to provide a strong and fast