commit b6940fa1e09d088aeb1a7e3d85f1ccfbcf977812
parent 98defc0964eb5e20dc60021c70d8c34cc9ee5c5a
Author: Jaromil <jaromil@dyne.org>
Date: Fri, 15 Jun 2012 23:30:57 +0200
correct build with search engine on gnu systems
Diffstat:
5 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/build/build-gnu.sh b/build/build-gnu.sh
@@ -10,6 +10,7 @@ which apt-get && distro=debian
case $distro in
debian)
+ mkdir -p build/gnu
echo "Checking software to install..."
which zsh || sudo apt-get install zsh
which mutt || sudo apt-get install mutt
@@ -26,7 +27,14 @@ case $distro in
gcc -Os -c -static fetchaddr.c helpers.c rfc2047.c rfc822.c; \
gcc -Os -static -o fetchaddr fetchaddr.o helpers.o rfc2047.o rfc822.o;
cd - > /dev/null
+ cp src/fetchaddr build/gnu/
echo
+ echo "Compiling the search engine..."
+ cd src/mairix
+ ./configure
+ make > /dev/null
+ cd - > /dev/null
+ cp src/mairix/mairix build/gnu/
if [ -r /usr/bin/gnome-keyring ]; then
echo "Compiling gnome-keyring, need to install -dev packages"
sudo apt-get install libglib2.0-dev libgnome-keyring-dev
@@ -36,10 +44,12 @@ case $distro in
`pkg-config --cflags --libs glib-2.0 gnome-keyring-1` \
-O2 -o jaro-gnome-keyring
cd - > /dev/null
- echo "Done compiling."
- echo "Now run ./install.sh and Jaro Mail will be ready in ~/Mail"
- echo "or \"./install.sh path\" to install it somewhere else."
+ cp src/gnome-keyring/jaro-gnome-keyring build/gnu/
fi
+
+ echo "Done compiling."
+ echo "Now run ./install.sh and Jaro Mail will be ready in ~/Mail"
+ echo "or \"./install.sh path\" to install it somewhere else."
;;
*)
diff --git a/install.sh b/install.sh
@@ -216,7 +216,7 @@ cp src/fetchaddr $WORKDIR/bin/
case $OS in
MAC) cp -a build/osx/* $WORKDIR/bin ;;
- GNU)
+ GNU) cp -a build/gnu/* $WORKDIR/bin
rm -f $WORKDIR/bin/dotlock
cat <<EOF > $WORKDIR/bin/dotlock
#!/usr/bin/env zsh
diff --git a/src/mairix/Makefile b/src/mairix/Makefile
@@ -22,7 +22,7 @@
#########################################################################
# Edit the following variables as required
CC=gcc
-CFLAGS=-O2 -m64 -DHAS_STDINT_H -DHAS_INTTYPES_H -DUSE_GZIP_MBOX -DUSE_BZIP_MBOX
+CFLAGS=-O2 -Wall -DHAS_STDINT_H -DHAS_INTTYPES_H -DUSE_GZIP_MBOX -DUSE_BZIP_MBOX
CPPFLAGS=
LDFLAGS=
LIBS=-lz -lbz2
diff --git a/src/mairix/mairix.32 b/src/mairix/mairix.32
Binary files differ.
diff --git a/src/mairix/mairix.64 b/src/mairix/mairix.64
Binary files differ.