[arch-commits] Commit in erlang/repos (3 files)

[Vesa Kaihlavirta]

    Date: Friday, April 24, 2009 @ 02:20:40
  Author: vesa
Revision: 36521

Merged revisions 36518-36519 via svnmerge from 
svn+ssh://vesa@archlinux.org/srv/svn-packages/erlang/trunk

........
  r36518 | vesa | 2009-04-24 08:37:03 +0300 (Fri, 24 Apr 2009) | 2 lines
  
  Bump to 13B and remove old patch
........
  r36519 | vesa | 2009-04-24 08:38:01 +0300 (Fri, 24 Apr 2009) | 2 lines
  
  oh, and actually remove the patch
........

Modified:
  erlang/repos/extra-i686/	(properties)
  erlang/repos/extra-i686/PKGBUILD
Deleted:
  erlang/repos/extra-i686/erlang-12.2.3-glibc28.patch

-----------------------------+
 PKGBUILD                    |   13 +++++--------
 erlang-12.2.3-glibc28.patch |   13 -------------
 2 files changed, 5 insertions(+), 21 deletions(-)


Property changes on: erlang/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /erlang/trunk:1-18446
   + /erlang/trunk:1-36520

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-24 06:10:24 UTC (rev 36520)
+++ extra-i686/PKGBUILD	2009-04-24 06:20:40 UTC (rev 36521)
@@ -3,7 +3,7 @@
 # Maintainer: Juergen Hoetzel <juergen at archlinux.org>
 
 pkgname=erlang
-pkgver=R12B.5
+pkgver=R13B
 pkgrel=1
 pkgdesc="A small concurrent functional programming language developed by Ericsson."
 arch=(i686 x86_64)
@@ -12,18 +12,15 @@
 license=('custom')
 makedepends=('java-environment' 'perl' 'openssl')
 source=(http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz
-	http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz
-	erlang-12.2.3-glibc28.patch)
-md5sums=('250fc48242a098073474e563c3f23e76' '6231cb172847040395cc34b20781aa3b'\
-         '7167887f35f96fd6f8d4a96bde852329')
-
+	http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz)
+md5sums=('6d8c256468a198458b9f08ba6aa1a384'
+         '9265ebf3b1041be6ae18e323b0933601')
 url="http://www.erlang.org/index.html"
 
 build() {
   ERTSVERSION=5.6.${pkgver#*.}
   cd $startdir/src/otp_src_${pkgver/./-}
-  # patch -p1 -i $startdir/src/erlang-12.2.3-glibc28.patch || return 1 
-  # fix #7633 - shouldn't hurt i686
+
   sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure || return 1
 
   CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support --enable-threads

Deleted: extra-i686/erlang-12.2.3-glibc28.patch
===================================================================
--- extra-i686/erlang-12.2.3-glibc28.patch	2009-04-24 06:10:24 UTC (rev 36520)
+++ extra-i686/erlang-12.2.3-glibc28.patch	2009-04-24 06:20:40 UTC (rev 36521)
@@ -1,13 +0,0 @@
-diff -ur otp_src_R12B-4.orig/erts/emulator/hipe/hipe_x86_signal.c otp_src_R12B-4/erts/emulator/hipe/hipe_x86_signal.c
---- otp_src_R12B-4.orig/erts/emulator/hipe/hipe_x86_signal.c	2008-09-01 14:51:25.000000000 +0200
-+++ otp_src_R12B-4/erts/emulator/hipe/hipe_x86_signal.c	2008-10-29 09:42:04.000000000 +0100
-@@ -33,8 +33,7 @@
- #include "erl_alloc.h"
- #endif
- #include "hipe_signal.h"
--
--#if __GLIBC__ == 2 && (__GLIBC_MINOR__ >= 3)
-+#if __GLIBC__ == 2 && (__GLIBC_MINOR__ >= 3 && __GLIBC_MINOR__ <= 7)
- /* See comment below for glibc 2.2. */
- #ifndef __USE_GNU
- #define __USE_GNU		/* to un-hide RTLD_NEXT */