@@ -1,12 +1,14 @@ #!/bin/bash if [ x"$1" == x"release" ] ; then + echo "Building release binaries" output=`pwd`/out.release cfg_switches=--disable-debug tinyxml_switches="DEBUG=YES" CPPFLAGS="-O2" LDFLAGS="-g" elif [ x"$1" == x"debug" ] ; then + echo "Building debug binaries" output=`pwd`/out.debug tinyxml_switches= cfg_switches=--enable-debug @@ -17,6 +19,18 @@ else exit 1 fi +LBITS=`getconf LONG_BIT` +if [ x$LBITS == x"64" ] ; then + echo "Building 64-bit binaries" + WXWIDGETS_EXTRA_CFLAGS= +elif [ x$LBITS == x"32" ] ; then + echo "Building 32-bit binaries" + WXWIDGETS_EXTRA_CFLAGS="-D_FILE_OFFSET_BITS=32" +else + echo "Cannot determine target architecture" + exit 1 +fi + echo "Going to place output in $output" if [[ ! -e $output ]]; then @@ -74,7 +88,7 @@ popd pushd wxwidgets ./configure --prefix=$output --enable-monolithic=yes --enable-shared=no --enable-unicode --enable-ffile \ --without-libtiff --enable-graphics_ctx $cfg_switches \ - --disable-largefile CPPFLAGS="$CPPCFLAGS -D_FILE_OFFSET_BITS=32" && + --disable-largefile CPPFLAGS="$CPPCFLAGS $WXWIDGETS_EXTRA_CFLAGS" && make clean && make && make install || external/build_externals_linux.sh @@ -4,8 +4,8 @@ Section: editors Priority: optional Architecture: all Essential: no -Depends: gtk2, curl, sqlite3, libxml2, libxslt, libjpg, icu, cairo, openssl -Installed-Size: 31000 +Depends: libxml2, openssl, libcurl3, libgtk2.0-0, libsqlite3-0, libxslt1.1, libjpeg62, libicu38, libcairo2, ruby +Installed-Size: 62000 Maintainer: Alexander Stigsen [source@e-texteditor.com] Provides: AlexanderStigsen Description: e is a fast and elegant text editor with many innovative features. external/stuff/control.in @@ -16,7 +16,7 @@ make DEBUG=1 If you choose to install packages manually, these are the Ubuntu packages required before building: - build-essential -- libwxgtk2.8-dev +- libgtk2.0-dev - libglib2.0-dev - libatk1.0-dev - libcurl-dev linux-notes.txt 956f5039eae0d964de283d132a36a646ba00241a Andrey Turkin aturkin@aturkin-ubuntu64.(none) http://github.com/etexteditor/e/commit/8e324bc97c540cbff47ec1e91ef8f5b25da83e04 8e324bc97c540cbff47ec1e91ef8f5b25da83e04 2009-05-06T05:01:46-07:00 2009-05-06T05:01:46-07:00 64-bit and Ubuntu-related changes ebd33336b3c942d96be3c18b7d20acb515f2759a Andrey Turkin aturkin@aturkin-ubuntu64.(none)