[ create a new paste ] login | about

Link: http://codepad.org/UBBFTIEi    [ raw code | fork ]

Plain Text, pasted on Jul 19:
diff -rNu3 monetdb/PKGBUILD monetdb_new/PKGBUILD
--- monetdb/PKGBUILD	2013-07-08 22:44:28.000000000 +0400
+++ monetdb_new/PKGBUILD	2013-07-20 01:27:56.244425360 +0400
@@ -7,17 +7,25 @@
 arch=('i686' 'x86_64')
 url="http://www.monetdb.org/Home"
 license=('custom')
-source=("http://dev.monetdb.org/downloads/sources/Latest/MonetDB-$pkgver.tar.bz2")
-sha1sums=('4868b170b38ace0366c97002f3e4f46cd230ebf1')
-
+makedepends=('python')
+source=("http://dev.monetdb.org/downloads/sources/Latest/MonetDB-$pkgver.tar.bz2"
+        "fix_ruby_gem.patch")
 
 build() {
-  rm -Rf $srcdir/build
-  mkdir $srcdir/build
-  cd $srcdir/build
+  cd "$srcdir/MonetDB-$pkgver"
+  patch -p1 -i "$srcdir/fix_ruby_gem.patch"
+  buildtools/autogen/autogen.py
+  autoreconf -i
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-assert \
+      --disable-testing --enable-optimize
+  make
+}
 
-  $srcdir/MonetDB-$pkgver/configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-debug --disable-assert
-  make || return 1
-  make DESTDIR=$pkgdir install
+package() {
+  cd "$srcdir/MonetDB-$pkgver"
+  make "DESTDIR=$pkgdir" install
 }
+
 # vim:syntax=sh
+sha1sums=('4868b170b38ace0366c97002f3e4f46cd230ebf1'
+          '573b1382d34753f56cdb43eb7c5fac44c714541a')
diff -rNu3 monetdb/fix_ruby_gem.patch monetdb_new/fix_ruby_gem.patch
--- monetdb/fix_ruby_gem.patch	1970-01-01 03:00:00.000000000 +0300
+++ monetdb_new/fix_ruby_gem.patch	2013-07-20 01:02:00.686414703 +0400
@@ -0,0 +1,45 @@
+diff -ru3 MonetDB-11.15.11/buildtools/autogen/autogen/am.py MonetDB-11.15.11-new/buildtools/autogen/autogen/am.py
+--- MonetDB-11.15.11/buildtools/autogen/autogen/am.py	2013-01-14 17:06:05.000000000 +0400
++++ MonetDB-11.15.11-new/buildtools/autogen/autogen/am.py	2013-07-20 00:50:35.294424149 +0400
+@@ -974,7 +974,7 @@
+             fd.write("\t[ '$(srcdir)' -ef . ] || rmdir '%s'\n" % d)
+         fd.write("install-exec-local-%s: %s\n" % (sf, f[:-4]))
+         fd.write("\tmkdir -p $(DESTDIR)'%s'\n" % rd)
+-        fd.write("\tgem install --local --install-dir $(DESTDIR)'%s' --force --rdoc '%s'\n" % (rd, f[:-4]))
++        fd.write("\tgem install --local --no-user-install --install-dir $(DESTDIR)'%s' --force --rdoc '%s'\n" % (rd, f[:-4]))
+         fd.write("uninstall-local-%s: %s\n" % (sf, f[:-4]))
+         # remove "-0.1.gemspec" from end of `f'
+         fd.write("\tgem uninstall --install-dir $(DESTDIR)'%s' '%s'\n" % (rd, f[:-12]))
+diff -ru3 MonetDB-11.15.11/buildtools/autogen/autogen/msc.py MonetDB-11.15.11-new/buildtools/autogen/autogen/msc.py
+--- MonetDB-11.15.11/buildtools/autogen/autogen/msc.py	2013-02-08 12:37:17.000000000 +0400
++++ MonetDB-11.15.11-new/buildtools/autogen/autogen/msc.py	2013-07-20 00:50:21.188569143 +0400
+@@ -1000,7 +1000,7 @@
+             fd.write('\t$(INSTALL) "$(srcdir)\\%s" "%s"\n' % (src, src))
+         msc['INSTALL'][f] = f, '', '', '', 'defined(HAVE_RUBYGEM)'
+         fd.write('install_%s: "%s" "%s"\n' % (f, f[:-4], rd))
+-        fd.write('\tgem install "%s" --local --install-dir "%s" --force --rdoc\n' % (f[:-4], rd))
++        fd.write('\tgem install "%s" --local --no-user-install --install-dir "%s" --force --rdoc\n' % (f[:-4], rd))
+         fd.write('"%s":\n' % rd)
+         fd.write('\tif not exist "%s" $(MKDIR) "%s"\n' % (rd, rd))
+     fd.write('!ELSE\n')
+diff -ru3 MonetDB-11.15.11/buildtools/autogen/autogen.py MonetDB-11.15.11-new/buildtools/autogen/autogen.py
+--- MonetDB-11.15.11/buildtools/autogen/autogen.py	2013-01-14 17:06:05.000000000 +0400
++++ MonetDB-11.15.11-new/buildtools/autogen/autogen.py	2013-07-20 00:32:07.000000000 +0400
+@@ -22,8 +22,6 @@
+ # and generates both the makefile.am and makefile.msc
+ #
+ 
+-import sys
+-del sys.path[0]
+ import fileinput
+ import string
+ import re
+@@ -33,6 +31,8 @@
+ import tokenize
+ from autogen import var
+ import os
++import sys
++del sys.path[0]
+ 
+ def isName(t):
+     return t not in ("{", "}", "=")



Create a new paste based on this one


Comments: