Changeset 1850e89 for core

Timestamp:

Sep 7, 2009 5:33:29 PM (11 years ago)

Author:

mkvore-commit <mkvore-commit@…>

Branches:

master

Children:

5eccc01

Parents:

1f1d089

Message:

removes a bug in SAM v1 and v2 (introduced when merging with v3)

Location:

core/c

Files:

• jbigi/build.sh (modified) (4 diffs)
• jcpuid/build.sh (modified) (2 diffs)

core/c/jbigi/build.sh

@@ -16 +16 @@
 mkdir -p lib/
 mkdir -p bin/local
-VER=4.2.4
+VER=4.3.1
 
 if [ "$1" != "dynamic" -a ! -d gmp-$VER ]
 then
-        TAR=gmp-$VER.tar.bz2
+        TAR=gmp-$VER.tar.lzma
         if [ ! -f $TAR ]
         then
-                echo "GMP tarball $TAR not found. You must download it from http://gmplib.org/"
-                exit 1
+            echo "Downloading ftp://ftp.gmplib.org/pub/gmp-4.3.1/gmp-4.3.1.tar.lzma"
+            wget ftp://ftp.gmplib.org/pub/gmp-4.3.1/gmp-4.3.1.tar.lzma
         fi
 
@@ -30 +30 @@
 
         echo "Extracting GMP..."
-        tar -xjf gmp-$VER.tar.bz2
+        tar -xf gmp-$VER.tar.lzma --lzma
 fi
 
@@ -43 +43 @@
                         ../../gmp-$VER/configure --with-pic;;
                 *)
-                        ../../gmp-$VER/configure;;
+                        ../../gmp-$VER/configure --with-pic;;
         esac
         make
@@ -55 +55 @@
 cd ../..
 
-I2P=~/i2p
+I2P=~/i2p/i2p
 if [ ! -f $I2P/lib/i2p.jar ]
 then

core/c/jcpuid/build.sh

@@ -38 +38 @@
         COMPILEFLAGS="-fPIC -Wall"
         INCLUDES="-I. -Iinclude -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
-        LINKFLAGS="-shared -static -static-libgcc -Wl,-soname,libjcpuid-x86-linux.so"
+        LINKFLAGS="-shared -Wl,-soname,libjcpuid-x86-linux.so"
         LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-linux.so";;
 esac
@@ -44 +44 @@
 echo "Compiling C code..."
 rm -f $LIBFILE
-$CC $LINKFLAGS $INCLUDES src/*.c -o $LIBFILE
+$CC $COMPILEFLAGS $LINKFLAGS $INCLUDES src/*.c -o $LIBFILE
 strip $LIBFILE
 echo Built $LIBFILE