Date: Tuesday, December 6, 2016 @ 06:27:49 Author: kkeen Revision: 198086
archrelease: copy trunk to community-i686, community-x86_64 Added: libx86/repos/community-i686/PKGBUILD (from rev 198085, libx86/trunk/PKGBUILD) libx86/repos/community-i686/libx86-ifmask.patch (from rev 198085, libx86/trunk/libx86-ifmask.patch) libx86/repos/community-x86_64/PKGBUILD (from rev 198085, libx86/trunk/PKGBUILD) libx86/repos/community-x86_64/libx86-ifmask.patch (from rev 198085, libx86/trunk/libx86-ifmask.patch) Deleted: libx86/repos/community-i686/PKGBUILD libx86/repos/community-i686/libx86-ifmask.patch libx86/repos/community-x86_64/PKGBUILD libx86/repos/community-x86_64/libx86-ifmask.patch --------------------------------------+ /PKGBUILD | 88 +++++++++++++++++++++++++++++++++ /libx86-ifmask.patch | 42 +++++++++++++++ community-i686/PKGBUILD | 41 --------------- community-i686/libx86-ifmask.patch | 21 ------- community-x86_64/PKGBUILD | 41 --------------- community-x86_64/libx86-ifmask.patch | 21 ------- 6 files changed, 130 insertions(+), 124 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2016-12-06 06:27:15 UTC (rev 198085) +++ community-i686/PKGBUILD 2016-12-06 06:27:49 UTC (rev 198086) @@ -1,41 +0,0 @@ -# $Id$ -# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> -# Contributor: Eric Belanger <e...@archlinux.org> -# Contributor: tardo <ta...@nagi-fanboi.net> -# Contributor: Thayer Williams <tha...@archlinux.org> - -pkgname=libx86 -pkgver=1.1 -pkgrel=5 -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/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz" - 'libx86-ifmask.patch') -md5sums=('41bee1f8e22b82d82b5f7d7ba51abc2a' - '573897186eb8670d8d97c64ea7614001') - -build() { - cd "${srcdir}"/$pkgname-$pkgver - - # lrmi.c patch courtesy of Gentoo - patch -Np0 -i "${srcdir}"/libx86-ifmask.patch - - # compensate for x86_64 - if [ "$CARCH" = "x86_64" ]; then - make BACKEND=x86emu - else - make - fi -} - -package() { - cd "${srcdir}"/$pkgname-$pkgver - - make DESTDIR="${pkgdir}" install - chmod 644 "${pkgdir}"/usr/lib/libx86.a - - install -D -m 644 COPYRIGHT "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE -} Copied: libx86/repos/community-i686/PKGBUILD (from rev 198085, libx86/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2016-12-06 06:27:49 UTC (rev 198086) @@ -0,0 +1,44 @@ +# $Id$ +# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> +# Contributor: Eric Belanger <e...@archlinux.org> +# Contributor: tardo <ta...@nagi-fanboi.net> +# Contributor: Thayer Williams <tha...@archlinux.org> + +pkgname=libx86 +pkgver=1.1 +pkgrel=6 +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/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz" + 'libx86-ifmask.patch') +md5sums=('41bee1f8e22b82d82b5f7d7ba51abc2a' + '573897186eb8670d8d97c64ea7614001') + +build() { + cd "${srcdir}"/$pkgname-$pkgver + + # lrmi.c patch courtesy of Gentoo + patch -Np0 -i "${srcdir}"/libx86-ifmask.patch + + # FS#48120 courtesy of rrika + CFLAGS="$CFLAGS -fno-delete-null-pointer-checks" + + # compensate for x86_64 + if [ "$CARCH" = "x86_64" ]; then + make BACKEND=x86emu + else + make + fi +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + + make DESTDIR="${pkgdir}" install + chmod 644 "${pkgdir}"/usr/lib/libx86.a + + install -D -m 644 COPYRIGHT "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE +} Deleted: community-i686/libx86-ifmask.patch =================================================================== --- community-i686/libx86-ifmask.patch 2016-12-06 06:27:15 UTC (rev 198085) +++ community-i686/libx86-ifmask.patch 2016-12-06 06:27:49 UTC (rev 198086) @@ -1,21 +0,0 @@ ---- 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) Copied: libx86/repos/community-i686/libx86-ifmask.patch (from rev 198085, libx86/trunk/libx86-ifmask.patch) =================================================================== --- community-i686/libx86-ifmask.patch (rev 0) +++ community-i686/libx86-ifmask.patch 2016-12-06 06:27:49 UTC (rev 198086) @@ -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) Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2016-12-06 06:27:15 UTC (rev 198085) +++ community-x86_64/PKGBUILD 2016-12-06 06:27:49 UTC (rev 198086) @@ -1,41 +0,0 @@ -# $Id$ -# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> -# Contributor: Eric Belanger <e...@archlinux.org> -# Contributor: tardo <ta...@nagi-fanboi.net> -# Contributor: Thayer Williams <tha...@archlinux.org> - -pkgname=libx86 -pkgver=1.1 -pkgrel=5 -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/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz" - 'libx86-ifmask.patch') -md5sums=('41bee1f8e22b82d82b5f7d7ba51abc2a' - '573897186eb8670d8d97c64ea7614001') - -build() { - cd "${srcdir}"/$pkgname-$pkgver - - # lrmi.c patch courtesy of Gentoo - patch -Np0 -i "${srcdir}"/libx86-ifmask.patch - - # compensate for x86_64 - if [ "$CARCH" = "x86_64" ]; then - make BACKEND=x86emu - else - make - fi -} - -package() { - cd "${srcdir}"/$pkgname-$pkgver - - make DESTDIR="${pkgdir}" install - chmod 644 "${pkgdir}"/usr/lib/libx86.a - - install -D -m 644 COPYRIGHT "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE -} Copied: libx86/repos/community-x86_64/PKGBUILD (from rev 198085, libx86/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2016-12-06 06:27:49 UTC (rev 198086) @@ -0,0 +1,44 @@ +# $Id$ +# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> +# Contributor: Eric Belanger <e...@archlinux.org> +# Contributor: tardo <ta...@nagi-fanboi.net> +# Contributor: Thayer Williams <tha...@archlinux.org> + +pkgname=libx86 +pkgver=1.1 +pkgrel=6 +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/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz" + 'libx86-ifmask.patch') +md5sums=('41bee1f8e22b82d82b5f7d7ba51abc2a' + '573897186eb8670d8d97c64ea7614001') + +build() { + cd "${srcdir}"/$pkgname-$pkgver + + # lrmi.c patch courtesy of Gentoo + patch -Np0 -i "${srcdir}"/libx86-ifmask.patch + + # FS#48120 courtesy of rrika + CFLAGS="$CFLAGS -fno-delete-null-pointer-checks" + + # compensate for x86_64 + if [ "$CARCH" = "x86_64" ]; then + make BACKEND=x86emu + else + make + fi +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + + make DESTDIR="${pkgdir}" install + chmod 644 "${pkgdir}"/usr/lib/libx86.a + + install -D -m 644 COPYRIGHT "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE +} Deleted: community-x86_64/libx86-ifmask.patch =================================================================== --- community-x86_64/libx86-ifmask.patch 2016-12-06 06:27:15 UTC (rev 198085) +++ community-x86_64/libx86-ifmask.patch 2016-12-06 06:27:49 UTC (rev 198086) @@ -1,21 +0,0 @@ ---- 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) Copied: libx86/repos/community-x86_64/libx86-ifmask.patch (from rev 198085, libx86/trunk/libx86-ifmask.patch) =================================================================== --- community-x86_64/libx86-ifmask.patch (rev 0) +++ community-x86_64/libx86-ifmask.patch 2016-12-06 06:27:49 UTC (rev 198086) @@ -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)