Updated to compile on archlinux current

3 files changed, 37 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5a5513f42b71..c058bd7bcc25 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Fri Jun  3 17:25:40 UTC 2016
 pkgbase = salome-hexablock
 	pkgdesc = Generic platform for Pre and Post-Processing for numerical simulation - HEXABLOCK Module
 	pkgver = 7.6.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.salome-platform.org
 	arch = i686
 	arch = x86_64
@@ -12,7 +14,7 @@ pkgbase = salome-hexablock
 	depends = salome-geom>=7.6.0
 	depends = salome-geom<7.7.0
 	source = salome-hexablock.profile
-	md5sums = decac3c084d3d9eba96ea046276bad6e
+	md5sums = 566edb75962f9d51c991648e48c198fa
 
 pkgname = salome-hexablock
 
diff --git a/PKGBUILD b/PKGBUILD
index d1096d4651a9..4ee52a812154 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=salome-hexablock
 pkgver=7.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Generic platform for Pre and Post-Processing for numerical simulation - HEXABLOCK Module"
 url="http://www.salome-platform.org"
 depends=('salome-geom>=7.6.0' 'salome-geom<7.7.0')
@@ -12,7 +12,9 @@ license=('LGPL')
 source=(${pkgname}.profile)
 
 _source=hexablock
-_installdir=/opt/salome/hexablock
+_basedir=/opt/salome
+_installdir=${_basedir}
+_profiledir=${_basedir}/env.d
 
 prepare() {
   msg "Connecting to git server..."
@@ -35,9 +37,9 @@ prepare() {
 }
 
 build() {
-  source /etc/salome/profile.d/salome-kernel.sh
-  source /etc/salome/profile.d/salome-gui.sh
-  source /etc/salome/profile.d/salome-geom.sh
+  source "${_profiledir}/salome-kernel.sh"
+  source "${_profiledir}/salome-gui.sh"
+  source "${_profiledir}/salome-geom.sh"
 
   rm -rf "$srcdir/$_source/build"
   mkdir -p "$srcdir/$_source/build"
@@ -45,6 +47,7 @@ build() {
 
   cmake .. \
      -DCMAKE_INSTALL_PREFIX=$_installdir \
+     -DCMAKE_CXX_STANDARD=98 \
      -DPYTHON_EXECUTABLE=/usr/bin/python2 \
      -DSWIG_EXECUTABLE=/usr/bin/swig-2 \
      -DLIBXML2_ROOT_DIR=/usr \
@@ -60,8 +63,17 @@ package() {
   cd "$srcdir/$_source/build"
 
   make DESTDIR="$pkgdir/" install
+  
+  for _FILE in `find -L ${pkgdir}${_installdir} -iname *.py`
+  do
+    sed -i -e "s|${srcdir}||" ${_FILE}
+    sed -i -e "s|${pkgdir}||" ${_FILE}
+  done
+  
+  rm -f "${pkgdir}${_installdir}/bin/salome/VERSION"
 
   install -D -m755 "$srcdir/$pkgname.profile" \
-                   "$pkgdir/etc/salome/profile.d/$pkgname.sh"
+                  "${pkgdir}${_profiledir}/${pkgname}.sh"
+		   
 }
-md5sums=('decac3c084d3d9eba96ea046276bad6e')
+md5sums=('566edb75962f9d51c991648e48c198fa')
diff --git a/salome-hexablock.profile b/salome-hexablock.profile
index 632800a7a37e..61fd8697ffe9 100644
--- a/salome-hexablock.profile
+++ b/salome-hexablock.profile
@@ -1,8 +1,11 @@
 # module var
-export HEXABLOCK_ROOT_DIR=/opt/salome/hexablock
+export HEXABLOCK_ROOT_DIR=/opt/salome
 
 # local vars
 _pythonver=2.7
+_hexablock_path=$HEXABLOCK_ROOT_DIR/bin/salome
+_hexablock_librarypath=$HEXABLOCK_ROOT_DIR/lib/salome
+_hexablock_pythonpath=$HEXABLOCK_ROOT_DIR/lib/python${_pythonver}/site-packages/salome
 _paraviewver=4.2
 _paraview_pythonpath="/usr/lib/paraview-${_paraviewver}/site-packages/:/usr/lib/paraview-${_paraviewver}/site-packages/vtk"
 _paraview_librarypath="/usr/lib/paraview-${_paraviewver}"
@@ -11,13 +14,19 @@ _paraview_librarypath="/usr/lib/paraview-${_paraviewver}"
 if [[ $PYTHONPATH != *${_paraview_pythonpath}* ]]; then
   export PYTHONPATH=${_paraview_pythonpath}:$PYTHONPATH
 fi
-export PYTHONPATH=$HEXABLOCK_ROOT_DIR/lib/python${_pythonver}/site-packages/salome:$PYTHONPATH
+if [[ $PYTHONPATH != *${_hexablock_pythonpath}* ]]; then
+  export PYTHONPATH=${_hexablock_pythonpath}:$PYTHONPATH
+fi
 
 # LD_LIBRARY_PATH
 if [[ $LD_LIBRARY_PATH != *${_paraview_librarypath}* ]]; then
   export LD_LIBRARY_PATH=${_paraview_librarypath}:$LD_LIBRARY_PATH
 fi
-export LD_LIBRARY_PATH=$HEXABLOCK_ROOT_DIR/lib/salome:$LD_LIBRARY_PATH
+if [[ $LD_LIBRARY_PATH != *${_hexablock_librarypath}* ]]; then
+  export LD_LIBRARY_PATH=${_hexablock_librarypath}:$LD_LIBRARY_PATH
+fi
 
-# bin
-export PATH=$HEXABLOCK_ROOT_DIR/bin/salome:$PATH
\ No newline at end of file
+# PATH
+if [[ $PATH != *${_hexablock_path}* ]]; then
+  export PATH=${_hexablock_path}:$PATH
+fi