diff options
| author | Michael Hanson <hansonorders@verizon.net> | 2010-11-24 02:50:43 (GMT) |
|---|---|---|
| committer | Michael Hanson <hansonorders@verizon.net> | 2010-11-24 02:50:43 (GMT) |
| commit | 04ebe83f866a6f595263fdb1387ae2ccf4d40c96 (patch) | |
| tree | a37ef37137c404b430167883335bad4c5d901ef9 | |
| parent | 2c42ba77257f45f41d56fc2ab3487b72217c0f6a (diff) | |
| download | linhes_pkgbuild-04ebe83f866a6f595263fdb1387ae2ccf4d40c96.zip linhes_pkgbuild-04ebe83f866a6f595263fdb1387ae2ccf4d40c96.tar.gz linhes_pkgbuild-04ebe83f866a6f595263fdb1387ae2ccf4d40c96.tar.bz2 | |
libx86: upgrade
| -rw-r--r-- | abs/core/libx86/PKGBUILD | 31 | ||||
| -rw-r--r-- | abs/core/libx86/libx86-ifmask.patch | 21 |
2 files changed, 42 insertions, 10 deletions
diff --git a/abs/core/libx86/PKGBUILD b/abs/core/libx86/PKGBUILD index 5cf3488..a686b6b 100644 --- a/abs/core/libx86/PKGBUILD +++ b/abs/core/libx86/PKGBUILD @@ -1,27 +1,38 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 21250 2008-12-11 16:58:44Z thayer $ +# Contributor: Eric Belanger <eric@archlinux.org> # Contributor: tardo <tardo@nagi-fanboi.net> +# Maintainer: Thayer Williams <thayer@archlinux.org> pkgname=libx86 -pkgver=0.99 -pkgrel=1 +pkgver=1.1 +pkgrel=2 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') depends=('glibc') -source=(http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$pkgver.tar.gz lrmi.patch) -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 - patch -p1 < ../lrmi.patch + cd $srcdir/$pkgname-$pkgver + + # lrmi.c patch courtesy of Gentoo + patch -Np0 -i $srcdir/libx86-ifmask.patch || return 1 + + # compensate for x86_64 if [ "$CARCH" = "x86_64" ]; then make BACKEND=x86emu || return 1 else make || return 1 fi +} +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install || return 1 + chmod 644 $pkgdir/usr/lib/libx86.a || return 1 - make DESTDIR=$startdir/pkg install - install -D -m 644 COPYRIGHT $startdir/pkg/usr/share/licenses/$pkgname/COPYRIGHT + install -D -m 644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT || return 1 } diff --git a/abs/core/libx86/libx86-ifmask.patch b/abs/core/libx86/libx86-ifmask.patch new file mode 100644 index 0000000..c99eeb8 --- /dev/null +++ b/abs/core/libx86/libx86-ifmask.patch @@ -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) |