[arch-commits] Commit in mono/trunk (PKGBUILD mini_amd64.patch mono.install)

[Andreas Radke]

    Date: Tuesday, February 4, 2014 @ 22:11:29
  Author: andyrtr
Revision: 205435

upgpkg: mono 3.2.3-2

drop static libs (as other distros do); drop old patch from svn; remove install file - there's already a link in /usr/bin - FS#37994; use common LGPL license known by the system; add missing python dep; don't update to current 3.2.6 release that fails to compile and needs further fixes

Modified:
  mono/trunk/PKGBUILD
Deleted:
  mono/trunk/mini_amd64.patch
  mono/trunk/mono.install

------------------+
 PKGBUILD         |   22 +++++++++++-----------
 mini_amd64.patch |   13 -------------
 mono.install     |    7 -------
 3 files changed, 11 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-04 20:56:24 UTC (rev 205434)
+++ PKGBUILD	2014-02-04 21:11:29 UTC (rev 205435)
@@ -4,24 +4,20 @@
 
 pkgname=mono
 pkgver=3.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Free implementation of the .NET platform including runtime and compiler"
 arch=(i686 x86_64)
-license=('GPL' 'LGPL2' 'MPL' 'custom:MITX11')
+license=('GPL' 'LGPL2.1' 'MPL' 'custom:MITX11')
 url="http://www.mono-project.com/"
-depends=('zlib' 'libgdiplus>=2.10' 'sh')
-makedepends=('pkgconfig')
+depends=('zlib' 'libgdiplus>=2.10' 'sh' 'python')
 options=('!makeflags')
 provides=('monodoc')
 conflicts=('monodoc')
-install=mono.install
 source=(http://download.mono-project.com/sources/mono/${pkgname}-${pkgver}.tar.bz2
         mono.binfmt.d
-	mono.install
-	sgen_fix.patch)
+        sgen_fix.patch)
 md5sums=('a66c6309fad071e21f77f4c6b67a0f10'
          'b9ef8a65fea497acf176cca16c1e2402'
-         'ca1108e9638b01c26453ee663592a4e5'
          '8a700b94bff7a913f920e95890d2fb4c')
 
 build() {
@@ -28,7 +24,11 @@
   cd "${srcdir}"/${pkgname}-${pkgver}
   patch -p1 < ../sgen_fix.patch
   # build mono
-  ./configure --prefix=/usr --sysconfdir=/etc --bindir=/usr/bin --sbindir=/usr/bin
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --bindir=/usr/bin \
+    --sbindir=/usr/bin \
+    --disable-static
   make
 
   # build jay
@@ -41,9 +41,9 @@
   make DESTDIR="${pkgdir}" install
 
   # install jay
-  cd "${srcdir}"/${pkgname}-${pkgver}/mcs/jay
+  pushd "${srcdir}"/${pkgname}-${pkgver}/mcs/jay
   make DESTDIR="${pkgdir}" prefix=/usr INSTALL=../../install-sh install
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  popd
 
   # install binfmt conf file and pathes
   install -D -m644 "${srcdir}"/mono.binfmt.d "${pkgdir}"/usr/lib/binfmt.d/mono.conf

Deleted: mini_amd64.patch
===================================================================
--- mini_amd64.patch	2014-02-04 20:56:24 UTC (rev 205434)
+++ mini_amd64.patch	2014-02-04 21:11:29 UTC (rev 205435)
@@ -1,13 +0,0 @@
---- mono/mini/mini-amd64.c	2009-03-19 21:08:18 UTC (rev 129824)
-+++ mono/mini/mini-amd64.c	2009-03-19 21:09:53 UTC (rev 129825)
-@@ -1009,7 +1009,7 @@
- 		locals_size += mono_type_size (ins->inst_vtype, &ialign);
- 	}
- 
--	if ((cfg->num_varinfo > 10000) || (locals_size >= (1 << 15))) {
-+	if ((cfg->num_varinfo > 5000) || (locals_size >= (1 << 15)) || (header->code_size > 110000)) {
- 		/* Avoid hitting the stack_alloc_size < (1 << 16) assertion in emit_epilog () */
- 		cfg->arch.omit_fp = FALSE;
- 	}
-
- 			

Deleted: mono.install
===================================================================
--- mono.install	2014-02-04 20:56:24 UTC (rev 205434)
+++ mono.install	2014-02-04 21:11:29 UTC (rev 205435)
@@ -1,7 +0,0 @@
-post_install() {
-ln -sf /bin/mono-sgen /bin/mono
-}
-
-post_upgrade() {
-post_install
-}