[arch-commits] Commit in maude/repos/community-x86_64 (5 files)
Antonio Rojas
arojas at archlinux.org
Fri Jan 12 19:29:40 UTC 2018
Date: Friday, January 12, 2018 @ 19:29:36
Author: arojas
Revision: 281692
archrelease: copy trunk to community-x86_64
Added:
maude/repos/community-x86_64/PKGBUILD
(from rev 281691, maude/trunk/PKGBUILD)
maude/repos/community-x86_64/maude-cvc4-1.5.patch
(from rev 281691, maude/trunk/maude-cvc4-1.5.patch)
maude/repos/community-x86_64/maude.sh
(from rev 281691, maude/trunk/maude.sh)
Deleted:
maude/repos/community-x86_64/PKGBUILD
maude/repos/community-x86_64/maude.sh
----------------------+
PKGBUILD | 95 +++++++++++++++++++++++++------------------------
maude-cvc4-1.5.patch | 24 ++++++++++++
maude.sh | 40 ++++++++++----------
3 files changed, 93 insertions(+), 66 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-12 19:28:57 UTC (rev 281691)
+++ PKGBUILD 2018-01-12 19:29:36 UTC (rev 281692)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: <kaptoxic _at_ yahoo _dot_ com >
-# Contributor: Peter Simons <simons at cryp.to>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-
-pkgname=maude
-pkgver=2.7.1
-pkgrel=1
-pkgdesc="High-level Specification Language"
-arch=('i686' 'x86_64')
-url="http://maude.cs.uiuc.edu"
-license=('GPL')
-depends=('buddy' 'cvc4' 'libtecla' 'gmp' 'libsigsegv')
-makedepends=('flex' 'bison')
-source=("http://maude.cs.illinois.edu/w/images/d/d8/Maude-$pkgver.tar.gz"
- "http://maude.cs.illinois.edu/w/images/c/ca/Full-Maude-$pkgver.zip"
- maude.sh)
-md5sums=('aa31753f742f976940c69aa699c3d0ec'
- 'b365fe0fdd161880e95aeb089f166657'
- '0a51738365579574b40a3d32da6f3291')
-
-prepare() {
- cd "$srcdir/maude-$pkgver"
- autoreconf -i
-}
-
-build() {
- cd "$srcdir/maude-$pkgver"
- ./configure --prefix=/usr --datadir=/usr/share/maude
- make -j1 all CVC4_LIB="-lcvc4 -lcln"
-}
-
-check() {
- cd "$srcdir/maude-$pkgver"
- make check
-}
-
-package() {
- cd "$srcdir/maude-$pkgver"
- make DESTDIR="$pkgdir/" install
- install -D -m 444 "$srcdir/full-maude.maude" \
- "$pkgdir/usr/share/maude/full-maude.maude"
-
- install -D -m 555 "$srcdir/maude.sh" "$pkgdir/etc/profile.d/maude.sh"
-}
Copied: maude/repos/community-x86_64/PKGBUILD (from rev 281691, maude/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-01-12 19:29:36 UTC (rev 281692)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: <kaptoxic _at_ yahoo _dot_ com >
+# Contributor: Peter Simons <simons at cryp.to>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+
+pkgname=maude
+pkgver=2.7.1
+pkgrel=2
+pkgdesc="High-level Specification Language"
+arch=('x86_64')
+url="http://maude.cs.uiuc.edu"
+license=('GPL')
+depends=('buddy' 'cvc4' 'libtecla' 'gmp' 'libsigsegv')
+makedepends=('flex' 'bison')
+source=("http://maude.cs.illinois.edu/w/images/d/d8/Maude-$pkgver.tar.gz"
+ "http://maude.cs.illinois.edu/w/images/c/ca/Full-Maude-$pkgver.zip"
+ maude.sh maude-cvc4-1.5.patch)
+md5sums=('aa31753f742f976940c69aa699c3d0ec'
+ 'b365fe0fdd161880e95aeb089f166657'
+ '0a51738365579574b40a3d32da6f3291'
+ '9e759db427d9d6e77d35cc56b7690e0b')
+
+prepare() {
+ cd "$srcdir/maude-$pkgver"
+ autoreconf -i
+
+ patch -p1 -i ../maude-cvc4-1.5.patch # Fix build with CVC4 1.5
+}
+
+build() {
+ cd "$srcdir/maude-$pkgver"
+ ./configure --prefix=/usr --datadir=/usr/share/maude
+ make -j1 all CVC4_LIB="-lcvc4 -lcln"
+}
+
+check() {
+ cd "$srcdir/maude-$pkgver"
+ make check
+}
+
+package() {
+ cd "$srcdir/maude-$pkgver"
+ make DESTDIR="$pkgdir/" install
+ install -D -m 444 "$srcdir/full-maude.maude" \
+ "$pkgdir/usr/share/maude/full-maude.maude"
+
+ install -D -m 555 "$srcdir/maude.sh" "$pkgdir/etc/profile.d/maude.sh"
+}
Copied: maude/repos/community-x86_64/maude-cvc4-1.5.patch (from rev 281691, maude/trunk/maude-cvc4-1.5.patch)
===================================================================
--- maude-cvc4-1.5.patch (rev 0)
+++ maude-cvc4-1.5.patch 2018-01-12 19:29:36 UTC (rev 281692)
@@ -0,0 +1,24 @@
+diff --git a/src/Mixfix/variableGenerator.cc b/src/Mixfix/variableGenerator.cc
+index 4761dfc..086b4ee 100755
+--- a/src/Mixfix/variableGenerator.cc
++++ b/src/Mixfix/variableGenerator.cc
+@@ -312,18 +312,7 @@ VariableGenerator::dagToCVC4(DagNode* dag)
+ //
+ case SMT_Symbol::EQUALS:
+ {
+- //
+- // Bizarrely CVC4 requires the IFF be used for Boolean equality so we need to
+- // check the SMT type associated with our first argument sort to catch this case.
+- //
+- Sort* domainSort = s->getOpDeclarations()[0].getDomainAndRange()[0];
+- SMT_Info::SMT_Type smtType = smtInfo.getType(domainSort);
+- if (smtType == SMT_Info::NOT_SMT)
+- {
+- IssueWarning("term " << QUOTE(dag) << " does not belong to an SMT sort.");
+- goto fail;
+- }
+- return exprManager->mkExpr(((smtType == SMT_Info::BOOLEAN) ? kind::IFF : kind::EQUAL), exprs[0], exprs[1]);
++ return exprManager->mkExpr(kind::EQUAL, exprs[0], exprs[1]);
+ }
+ case SMT_Symbol::NOT_EQUALS:
+ {
Deleted: maude.sh
===================================================================
--- maude.sh 2018-01-12 19:28:57 UTC (rev 281691)
+++ maude.sh 2018-01-12 19:29:36 UTC (rev 281692)
@@ -1,20 +0,0 @@
-# /etc/profile.d/maude.sh
-
-if [ -d "/usr/share/maude" ]; then
- case "${MAUDE_LIB}" in
- /usr/share/maude)
- ;;
- /usr/share/maude:*)
- ;;
- *:/usr/share/maude)
- ;;
- *:/usr/share/maude:*)
- ;;
- *)
- MAUDE_LIB="${MAUDE_LIB:-}${MAUDE_LIB:+:}/usr/share/maude"
- export MAUDE_LIB
- ;;
- esac
-fi
-
-# /etc/profile.d/maude.sh ends here.
Copied: maude/repos/community-x86_64/maude.sh (from rev 281691, maude/trunk/maude.sh)
===================================================================
--- maude.sh (rev 0)
+++ maude.sh 2018-01-12 19:29:36 UTC (rev 281692)
@@ -0,0 +1,20 @@
+# /etc/profile.d/maude.sh
+
+if [ -d "/usr/share/maude" ]; then
+ case "${MAUDE_LIB}" in
+ /usr/share/maude)
+ ;;
+ /usr/share/maude:*)
+ ;;
+ *:/usr/share/maude)
+ ;;
+ *:/usr/share/maude:*)
+ ;;
+ *)
+ MAUDE_LIB="${MAUDE_LIB:-}${MAUDE_LIB:+:}/usr/share/maude"
+ export MAUDE_LIB
+ ;;
+ esac
+fi
+
+# /etc/profile.d/maude.sh ends here.
More information about the arch-commits
mailing list