Working, without OMOptim

1 files changed, 12 insertions, 32 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f09d98901a12..690eb63a77c1 100644..100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,18 @@
-# Maintainer: Xwang <xwaang1976@gmail.com>
+# Maintainer: M. Mastroeni The_Maxtro@hotmail.it>
+# Contributor: Xwang <xwaang1976@gmail.com>
+
 pkgname=openmodelica-git
-pkgver=1.11.0.dev.r98.g2f90cbe
-pkgrel=1
+pkgver=1.14.0.dev.r334.g4e226ae04
+pkgrel=2
 pkgdesc="The Open Source Modelica Suite"
 arch=('i686' 'x86_64')
 url="https://openmodelica.org"
 license=('OSMC-PL')
-
 depends=('java-environment' 'lpsolve' 'hdf5-openmpi' 'omniorb' 'openscenegraph' 'sundials' 'libatomic_ops' 'python' 'gtkglext' 'ruby' 'coin-or-ipopt' 'qjson' 'suitesparse' 'boost-libs' 'qt5-webkit' 'qt5-svg' 'qt5-tools' 'gnuplot')
-
 makedepends=('autoconf' 'automake' 'libtool' 'gcc' 'gcc-fortran-multilib' 'boost' 'clang' 'cmake' 'jre7-openjdk' 'antlr2' 'subversion' 'lib32-expat' 'lib32-ncurses' 'lib32-readline')
-
 provides=('openmodelica')
 conflicts=('openmodelica' 'openmodelica-svn' 'openmodelica-dev')
 
-#source=("omedit.patch") 
-#md5sums=('79376887eb1c754893b2e1cf01720145')
-
 prepare() {
     # clone all submodules
     mkdir -p "$srcdir/$pkgname"
@@ -29,42 +25,26 @@ prepare() {
     git submodule sync
     git submodule update --init --recursive
     cd "$srcdir"
-    #patch -p1 < ${srcdir}/omedit.patch
     cd "$srcdir/$pkgname"
 }
-
+ 
 pkgver() {
     cd "$pkgname"
     git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
-
-
+ 
 build() {
-    cd "$srcdir/$pkgname"
+cd "$srcdir/$pkgname"
     autoconf
     export CPPFLAGS="$CPPFLAGS -DH5_USE_18_API"
-    ./configure --prefix=/usr/ --without-omc --with-omniORB  --with-cppruntime --with-lapack='-llapack -lblas'
+    ./configure --prefix=/usr/ CC=clang CXX=clang++
     make
 }
-
-#check() {
-#   cd "${srcdir}/${_svnmod}"
-#   make test
-#}
-
-#package() {
-#    mkdir -p ${pkgdir}/usr/
-#    cd "$srcdir/$pkgname"
-#    cp -r build/bin/ ${pkgdir}/usr/bin/
-#    cp -r build/include/ ${pkgdir}/usr/include/
-#    cp -r build/lib/ ${pkgdir}/usr/lib/
-#    cp -r build/share/ ${pkgdir}/usr/share/
-#}
-
+ 
 package() {  
-    cd "$srcdir/$pkgname"   
+    cd "$srcdir/$pkgname"  
     make install DESTDIR=${pkgdir}
-    
+   
     install -D -m644 "OMEdit/OMEdit/OMEditGUI/Resources/icons/omedit.ico" "${pkgdir}/usr/share/openmodelica/icons/omedit.ico"
     install -D -m644 "OMNotebook/OMNotebook/OMNotebookGUI/Resources/OMNotebook_icon.ico" "${pkgdir}/usr/share/openmodelica/icons/omnotebook.ico"
     install -D -m644 "OMOptim/OMOptim/GUI/Resources/omoptim.ico" "${pkgdir}/usr/share/openmodelica/icons/omoptim.ico"