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

[Eric Bélanger]

    Date: Monday, November 17, 2008 @ 22:10:20
  Author: eric
Revision: 19264

fixed svn conflict

Added:
  libx86/repos/extra-x86_64/libx86-ifmask.patch
    (from rev 19219, libx86/trunk/libx86-ifmask.patch)
Modified:
  libx86/repos/extra-x86_64/	(properties)
  libx86/repos/extra-x86_64/PKGBUILD

---------------------+
 PKGBUILD            |   24 ++++++++++++++++--------
 libx86-ifmask.patch |   21 +++++++++++++++++++++
 2 files changed, 37 insertions(+), 8 deletions(-)


Property changes on: libx86/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /libx86/trunk:1
   + /libx86/trunk:1-19262

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-18 03:04:03 UTC (rev 19263)
+++ extra-x86_64/PKGBUILD	2008-11-18 03:10:20 UTC (rev 19264)
@@ -1,25 +1,33 @@
 # $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
 # Contributor: tardo <tardo at nagi-fanboi.net>
+# Maintainer: Thayer Williams <thayer at archlinux.org>
 
 pkgname=libx86
-pkgver=0.99
+pkgver=1.1
 pkgrel=1
 pkgdesc="Provides an lrmi interface that works on x86, am64 and alpha"
-arch=('i686' 'x86_64')
 url="http://www.codon.org.uk/~mjg59/libx86/"
 license=('custom')
+arch=('i686' 'x86_64')
 depends=('glibc')
-source=(http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$pkgver.tar.gz)
-md5sums=('c426d4f29fdf3499158cf49d4f374315')
+source=(http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$pkgver.tar.gz 
+        libx86-ifmask.patch)
+md5sums=('41bee1f8e22b82d82b5f7d7ba51abc2a'
+         '573897186eb8670d8d97c64ea7614001')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
+
+  # lrmi.c patch courtesy of Gentoo
+  patch -Np0 -i $srcdir/libx86-ifmask.patch || return 1
+
   if [ "$CARCH" = "x86_64" ]; then
 		make BACKEND=x86emu || return 1
     else
 	  make || return 1
   fi
-  make DESTDIR=$startdir/pkg install
-  install -D -m 644 COPYRIGHT $startdir/pkg/usr/share/licenses/$pkgname/COPYRIGHT
+
+  make DESTDIR=$pkgdir install || return 1
+  install -D -m 644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT || return 1
 }

Copied: libx86/repos/extra-x86_64/libx86-ifmask.patch (from rev 19219, libx86/trunk/libx86-ifmask.patch)
===================================================================
--- extra-x86_64/libx86-ifmask.patch	                        (rev 0)
+++ extra-x86_64/libx86-ifmask.patch	2008-11-18 03:10:20 UTC (rev 19264)
@@ -0,0 +1,21 @@
+--- lrmi.c.orig	2008-09-06 12:24:36.070136428 +0200
++++ lrmi.c	2008-09-06 12:28:10.584287458 +0200
+@@ -55,6 +55,18 @@ OTHER DEALINGS IN THE SOFTWARE.
+ #include "x86-common.h"
+ 
+ #if defined(__linux__)
++#ifndef TF_MASK
++#define TF_MASK X86_EFLAGS_TF
++#endif
++#ifndef IF_MASK
++#define IF_MASK X86_EFLAGS_IF
++#endif
++#ifndef IOPL_MASK
++#define IOPL_MASK X86_EFLAGS_IOPL
++#endif
++#ifndef VIF_MASK
++#define VIF_MASK X86_EFLAGS_VIF
++#endif
+ #define DEFAULT_VM86_FLAGS 	(IF_MASK | IOPL_MASK)
+ #elif defined(__NetBSD__) || defined(__FreeBSD__)
+ #define DEFAULT_VM86_FLAGS  (PSL_I | PSL_IOPL)