[Lunar-commits] <moonbase-other> Merge branch 'master' of github.com:lunar-linux/moonbase-other
Florin Braescu
florin at lunar-linux.org
Mon Apr 22 18:54:17 CEST 2013
commit 76ff599335af1449d0b3278fcbd19b2e3a6014b1
Author: Florin Braescu <florin at lunar-linux.org>
Date: Mon, 22 Apr 2013 09:21:36 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/76ff599335af1449d0b3278fcbd19b2e3a6014b1
Merge branch 'master' of github.com:lunar-linux/moonbase-other
---
science/ParaView/BUILD | +21/-0
science/ParaView/DEPENDS | +6/-0
science/ParaView/DETAILS | +23/-0
sql/mongodb/BUILD | +27/-16
sql/mongodb/DEPENDS | +1/-0
sql/mongodb/DETAILS | +8/-5
6 files changed, 86 insertions(+), 21 deletions(-)
--- /dev/null
+++ b/science/ParaView/BUILD
@@ -0,0 +1,21 @@
+OPTS+=" -DBUILD_SHARED_LIBS=ON -DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON" &&
+
+# This would be nice, but does not work over here...
+#OPTS+=" -DUSE_EXTERNAL_VTK:BOOL=ON" &&
+
+default_cmake_build &&
+
+install ../Applications/ParaView/pvIcon.png /usr/share/icons &&
+
+# Desktop menu entry
+cat > ${MODULE}.desktop << EOF &&
+[Desktop Entry]
+Type=Application
+Name=ParaView
+Comment=data analysis and visualization
+Exec=/usr/bin/paraview
+Icon=/usr/share/icons/pvIcon.png
+Categories=Qt;KDE;Science;
+EOF
+
+install -D -m644 ${MODULE}.desktop /usr/share/applications/${MODULE}.desktop
--- /dev/null
+++ b/science/ParaView/DEPENDS
@@ -0,0 +1,6 @@
+depends cmake
+# build with the internal VTK for now
+#depends vtk
+optional_depends Python "-DPARAVIEW_ENABLE_PYTHON=ON" "-DPARAVIEW_ENABLE_PYTHON=OFF" "For Python scripting support"
+optional_depends qt4 "-DPARAVIEW_BUILD_QT_GUI=ON" "-DPARAVIEW_BUILD_QT_GUI=OFF" "Build Qt GUI"
+optional_depends ffmpeg "-DPARAVIEW_ENABLE_FFMPEG=ON" "-DPARAVIEW_ENABLE_FFMPEG=OFF" "For FFMPEG video support"
--- /dev/null
+++ b/science/ParaView/DETAILS
@@ -0,0 +1,23 @@
+ MODULE=ParaView
+ VERSION=3.98.1
+ SOURCE=$MODULE-$VERSION-source.tar.gz
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/$MODULE-$VERSION-source
+ SOURCE_URL=http://www.paraview.org/files/v${VERSION%.*}/
+ SOURCE_VFY=sha1:f59dd55b295c804aa3bb75c6ab19b323ef80d861
+ WEB_SITE=http://www.paraview.org/
+ ENTERED=20101121
+ UPDATED=20130421
+ SHORT="data analysis and visualization application"
+
+cat << EOF
+ParaView is an open-source, multi-platform data analysis and visualization
+application. ParaView users can quickly build visualizations to analyze their
+data using qualitative and quantitative techniques. The data exploration can be
+done interactively in 3D or programmatically using ParaView's batch processing
+capabilities.
+
+ParaView was developed to analyze extremely large datasets using distributed
+memory computing resources. It can be run on supercomputers to analyze datasets
+of terascale as well as on laptops for smaller data.
+EOF
+
--- a/sql/mongodb/BUILD
+++ b/sql/mongodb/BUILD
@@ -1,23 +1,34 @@
-(
- # Fix for https://jira.mongodb.org/browse/SERVER-5575
- patch_it $SOURCE3 1 &&
+OPTS+=" --use-system-boost --use-system-pcre" &&
- add_priv_user mongodb:mongodb -d /var/lib/mongodb &&
+# Honor CXXFLAGS and remove -ggdb
+patch_it $SOURCE3 1 &&
- scons -j${MAKES:=1} all --full &&
- prepare_install &&
- scons -j${MAKES:=1} install --full --prefix=/usr &&
+# Propagate Lunar ENV to scons
+patch_it $SOURCE4 1 &&
- rm -f /usr/lib/libmongoclient.a &&
+# that linking dependency is just too stupid. Simply remove the debug function call for now
+sedit 's:(" << errnoWithDescription(err) << ")":":' src/mongo/util/stacktrace.cpp &&
- [ -f /etc/mongodb.conf ] || install -m 644 $SOURCE_CACHE/$SOURCE2 /etc/mongodb.conf &&
+# gcc 4.8 does find something to warn about ;)
+sedit "s:'-Werror':\0, '-Wno-unused-local-typedefs':" src/third_party/v8/SConscript &&
- if module_installed systemd; then
+add_priv_user mongodb:mongodb -d /var/lib/mongodb &&
+
+scons -j${MAKES:=1} $OPTS all &&
+prepare_install &&
+scons -j${MAKES:=1} $OPTS install --full --prefix=/usr &&
+
+if [ ! -f /etc/mongodb.conf ]; then
+ install -m 644 $SOURCE_CACHE/$SOURCE2 /etc/mongodb.conf
+fi &&
+
+if module_installed systemd; then
# Manually create /run/mongodb now, systemd tmpfiles.d will handle this next boot
- [ -d /run/mongodb ] || install -d -o mongodb -g root -m 0755 /run/mongodb
- fi &&
+ if [ ! -d /run/mongodb ]; then
+ install -d -o mongodb -g root -m 0755 /run/mongodb
+ fi
+fi &&
- for i in /var/{lib,log}/mongodb; do
- install -d $i -o mongodb -g mongodb -m 770
- done
-) > $C_FIFO 2>&1
+for i in /var/{lib,log}/mongodb; do
+ install -d $i -o mongodb -g mongodb -m 770
+done
--- a/sql/mongodb/DEPENDS
+++ b/sql/mongodb/DEPENDS
@@ -1,3 +1,4 @@
depends boost
depends scons
depends libpcap
+depends pcre
--- a/sql/mongodb/DETAILS
+++ b/sql/mongodb/DETAILS
@@ -1,18 +1,21 @@
MODULE=mongodb
- VERSION=2.2.3
+ VERSION=2.4.2
SOURCE=$MODULE-src-r$VERSION.tar.gz
SOURCE2=mongodb.conf-0.3
- SOURCE3=mongodb-2.x-SConscript.client.patch
+ SOURCE3=mongodb-2.2-r1-fix-scons.patch
+ SOURCE4=mongodb-2.4.2-use-system-path.patch
SOURCE_URL=http://downloads.mongodb.org/src
SOURCE2_URL=$PATCH_URL
SOURCE3_URL=$PATCH_URL
+ SOURCE4_URL=$PATCH_URL
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-src-r$VERSION
- SOURCE_VFY=sha256:dd292c73f8182eb201ae4dd4bd7132c79c56247a7bc4fcde9d09a5bc6c74978d
+ SOURCE_VFY=sha256:d0a26fef7f425a6652ebfc3addbc7e1b01a10be65c9d68e464730687bd6721c3
SOURCE2_VFY=sha256:29e47681c4a9325a8288e3f5c3591138f08bce36178c21a0a4b41bf4b05922dc
- SOURCE3_VFY=sha256:ca00fedc9f87bc3e013a2d4345fc125b22d614e111cc11c233f544940574c058
+ SOURCE3_VFY=sha256:fe19ffdd046abeb375978dd3ebcb21b3a605206ef9f8dea2bb7620327cc6f7db
+ SOURCE4_VFY=sha256:8907e4be5546ec7ea0146989d4d64d115b66a893adb7f1015ceba67e297c7dd0
WEB_SITE=http://www.mongodb.org/
ENTERED=20101205
- UPDATED=20130202
+ UPDATED=20130421
SHORT="A scalable, high-performance, key-value store, document-oriented database"
cat << EOF
MongoDB bridges the gap between key-value stores (which are fast and
More information about the Lunar-commits
mailing list