From 8955a66153b23347fdb89635468e9829ec9b0960 Mon Sep 17 00:00:00 2001 From: Don Bright Date: Fri, 14 Mar 2014 22:19:45 +0200 Subject: [PATCH] do not build gettext or glib2 by default. fix glib2.pri to find system version. fix spaces. --- glib-2.0.pri | 8 ++++++++ scripts/uni-build-dependencies.sh | 32 ++++++++++++++++++++++--------- scripts/uni-get-dependencies.sh | 14 +++++++------- 3 files changed, 38 insertions(+), 16 deletions(-) diff --git a/glib-2.0.pri b/glib-2.0.pri index 1f70a840..3da29fc2 100644 --- a/glib-2.0.pri +++ b/glib-2.0.pri @@ -19,6 +19,14 @@ GLIB2_DIR = $$(GLIB2DIR) } } +!exists($GLIB2_INCLUDEPATH/glib.h) { + !exists($GLIB2_INCLUDEPATH_2/glib.h) { + GLIB2_INCLUDEPATH = + GLIB2_INCLUDEPATH_2 = + GLIB2_LIBPATH = + } +} + isEmpty(GLIB2_INCLUDEPATH) { GLIB2_CFLAGS = $$system("pkg-config --cflags glib-2.0") } else { diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh index 5b9e1290..7aed7f8b 100755 --- a/scripts/uni-build-dependencies.sh +++ b/scripts/uni-build-dependencies.sh @@ -32,11 +32,13 @@ # If your system lacks qt4, build like this: # # ./scripts/uni-build-dependencies.sh qt4 -# . ./scripts/setenv-unibuild.sh +# . ./scripts/setenv-unibuild.sh #(Rerun to re-detect qt4) # -# If your system lacks glu, try to build like this: +# If your system lacks glu, gettext, or glib2, you can build them as well: # # ./scripts/uni-build-dependencies.sh glu +# ./scripts/uni-build-dependencies.sh glib2 +# ./scripts/uni-build-dependencies.sh gettext # # If you want to try Clang compiler (experimental, only works on linux): # @@ -433,17 +435,17 @@ build_glib2() maj_min_version="${version%.*}" #Drop micro if [ -e $DEPLOYDIR/lib/glib-2.0 ]; then -echo "glib2 already installed. not building" + echo "glib2 already installed. not building" return -fi + fi -echo "Building glib2 $version..." + echo "Building glib2 $version..." cd "$BASEDIR"/src rm -rf "glib-$version" if [ ! -f "glib-$version.tar.xz" ]; then -curl --insecure -LO "http://ftp.gnome.org/pub/gnome/sources/glib/$maj_min_version/glib-$version.tar.xz" + curl --insecure -LO "http://ftp.gnome.org/pub/gnome/sources/glib/$maj_min_version/glib-$version.tar.xz" fi -tar xJf "glib-$version.tar.xz" + tar xJf "glib-$version.tar.xz" cd "glib-$version" ./configure --disable-gtk-doc --disable-man --prefix="$DEPLOYDIR" CFLAGS="-I$DEPLOYDIR/include" LDFLAGS="-L$DEPLOYDIR/lib" @@ -628,6 +630,16 @@ if [ $1 ]; then build_glu 9.0.0 exit $? fi + if [ $1 = "gettext" ]; then + # such a huge build, put here by itself + build_gettext 0.18.3.1 + exit $? + fi + if [ $1 = "glib2" ]; then + # such a huge build, put here by itself + build_glib2 2.38.2 + exit $? + fi fi @@ -636,7 +648,11 @@ fi # # Main build of libraries # edit version numbers here as needed. +# This is only for libraries most systems won't have new enough versions of. +# For big things like Qt4, see the notes at the head of this file on +# building individual dependencies. # + build_eigen 3.1.1 build_gmp 5.0.5 build_mpfr 3.1.1 @@ -645,7 +661,5 @@ build_boost 1.53.0 build_cgal 4.0.2 build_glew 1.9.0 build_opencsg 1.3.2 -build_gettext 0.18.3.1 -build_glib2 2.38.2 echo "OpenSCAD dependencies built and installed to " $BASEDIR diff --git a/scripts/uni-get-dependencies.sh b/scripts/uni-get-dependencies.sh index a9769856..04b52ff1 100755 --- a/scripts/uni-get-dependencies.sh +++ b/scripts/uni-get-dependencies.sh @@ -9,7 +9,7 @@ get_fedora_deps() yum install qt-devel bison flex eigen3-devel python-paramiko \ boost-devel mpfr-devel gmp-devel glew-devel CGAL-devel gcc gcc-c++ pkgconfig \ opencsg-devel git libXmu-devel curl imagemagick ImageMagick glib2-devel make \ - xorg-x11-server-Xvfb + xorg-x11-server-Xvfb gettext } get_qomo_deps() @@ -21,7 +21,7 @@ get_altlinux_deps() { for i in boost-devel boost-filesystem-devel gcc4.5 gcc4.5-c++ boost-program_options-devel \ boost-thread-devel boost-system-devel boost-regex-devel eigen3 libmpfr libgmp libgmp_cxx-devel qt4-devel libcgal-devel git-core \ - libglew-devel flex bison curl imagemagick glib2-devel; do apt-get install $i; done + libglew-devel flex bison curl imagemagick gettext glib2-devel; do apt-get install $i; done } get_freebsd_deps() @@ -29,21 +29,21 @@ get_freebsd_deps() pkg_add -r bison boost-libs cmake git bash eigen3 flex gmake gmp mpfr \ xorg libGLU libXmu libXi xorg-vfbserver glew \ qt4-corelib qt4-gui qt4-moc qt4-opengl qt4-qmake qt4-rcc qt4-uic \ - opencsg cgal curl imagemagick glib2-devel + opencsg cgal curl imagemagick glib2-devel gettext } get_netbsd_deps() { pkgin install bison boost cmake git bash eigen flex gmake gmp mpfr \ qt4 glew cgal opencsg modular-xorg python27 py27-paramiko curl \ - imagemagick ImageMagick glib2-devel + imagemagick ImageMagick glib2-devel gettext } get_opensuse_deps() { zypper install libeigen3-devel mpfr-devel gmp-devel boost-devel \ libqt4-devel glew-devel cmake git bison flex cgal-devel opencsg-devel curl \ - glib2-devel + glib2-devel gettext } get_mageia_deps() @@ -51,7 +51,7 @@ get_mageia_deps() urpmi ctags urpmi task-c-devel task-c++-devel libqt4-devel libgmp-devel \ libmpfr-devel libboost-devel eigen3-devel libglew-devel bison flex \ - cmake imagemagick glib2-devel python curl git x11-server-xvfb + cmake imagemagick glib2-devel python curl git x11-server-xvfb gettext } get_debian_deps() @@ -60,7 +60,7 @@ get_debian_deps() libxmu-dev cmake bison flex git-core libboost-all-dev \ libXi-dev libmpfr-dev libboost-dev libglew-dev \ libeigen3-dev libcgal-dev libopencsg-dev libgmp3-dev libgmp-dev \ - python-paramiko curl imagemagick libglib2.0-dev; do + python-paramiko curl imagemagick libglib2.0-dev gettext; do apt-get -y install $pkg; done }