[arch-commits] Commit in bin86/repos/community-x86_64 (4 files)
Christian Hesse
eworm at archlinux.org
Wed May 30 23:16:21 UTC 2018
Date: Wednesday, May 30, 2018 @ 23:16:21
Author: eworm
Revision: 333572
archrelease: copy trunk to community-x86_64
Added:
bin86/repos/community-x86_64/PKGBUILD
(from rev 333571, bin86/trunk/PKGBUILD)
bin86/repos/community-x86_64/bin86-0.16.17-x86_64-1.patch
(from rev 333571, bin86/trunk/bin86-0.16.17-x86_64-1.patch)
Deleted:
bin86/repos/community-x86_64/PKGBUILD
bin86/repos/community-x86_64/bin86-0.16.17-x86_64-1.patch
------------------------------+
PKGBUILD | 69 ++++++++++++++++----------------
bin86-0.16.17-x86_64-1.patch | 88 ++++++++++++++++++++---------------------
2 files changed, 79 insertions(+), 78 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-05-30 23:16:17 UTC (rev 333571)
+++ PKGBUILD 2018-05-30 23:16:21 UTC (rev 333572)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: judd <jvinet at zeroflux.org>
-
-pkgname=bin86
-pkgver=0.16.21
-pkgrel=1
-pkgdesc="A complete 8086 assembler and loader"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://v3.sk/~lkundrak/dev86/"
-depends=('glibc')
-source=(http://v3.sk/~lkundrak/dev86/$pkgname-$pkgver.tar.gz
- bin86-0.16.17-x86_64-1.patch)
-sha1sums=('35a1222350adce5b6d62dd56f3477d9416c59174'
- '2c967c062fbee4e40ca1bf55feec2033e132e0a9')
-
-prepare() {
- cd $pkgname-$pkgver
- if [[ $CARCH = x86_64 ]]; then
- patch -Np1 < "$srcdir/bin86-0.16.17-x86_64-1.patch"
- fi
-}
-
-build() {
- cd $pkgname-$pkgver
- make PREFIX=/usr
-}
-
-package() {
- cd $pkgname-$pkgver
- install -d "$pkgdir"/usr/{bin,share/man/man1}
- make PREFIX="$pkgdir/usr" MANDIR="$pkgdir/usr/share/man/man1" install
-}
Copied: bin86/repos/community-x86_64/PKGBUILD (from rev 333571, bin86/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-05-30 23:16:21 UTC (rev 333572)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=bin86
+pkgver=0.16.21
+pkgrel=2
+pkgdesc='A complete 8086 assembler and loader'
+arch=('x86_64')
+license=('GPL')
+url='http://v3.sk/~lkundrak/dev86/'
+depends=('glibc')
+source=("http://v3.sk/~lkundrak/dev86/$pkgname-$pkgver.tar.gz"
+ 'bin86-0.16.17-x86_64-1.patch')
+sha1sums=('35a1222350adce5b6d62dd56f3477d9416c59174'
+ '2c967c062fbee4e40ca1bf55feec2033e132e0a9')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ patch -Np1 < "$srcdir/bin86-0.16.17-x86_64-1.patch"
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ make PREFIX=/usr
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ install -d "$pkgdir"/usr/{bin,share/man/man1}
+ make PREFIX="$pkgdir/usr" MANDIR="$pkgdir/usr/share/man/man1" install
+}
Deleted: bin86-0.16.17-x86_64-1.patch
===================================================================
--- bin86-0.16.17-x86_64-1.patch 2018-05-30 23:16:17 UTC (rev 333571)
+++ bin86-0.16.17-x86_64-1.patch 2018-05-30 23:16:21 UTC (rev 333572)
@@ -1,44 +0,0 @@
-Submitted By: Ken Moffat <ken at kenmoffat.uklinux.net>
-Date: 2005-06-28
-Initial Package Version: 0.16.14
-Upstream Status: Submitted Upstream
-Origin: from ROCK Linux
-Description: Allows bin86 to compile on x86_64, which permits lilo to
- be used in a 64-bit system. I'm dubious about ROCK's attempts to
- automatically add dual-licensing to all their patches, but bin86 is
- already GPL'd. I've heard from the maintainer that this will be
- included in the next upload.
-
-
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-#
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-#
-# ROCK Linux: rock-src/package/x86/bin86/x86_64.patch
-# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-diff -urN bin86-0.16.14-orig/ld/x86_aout.h bin86-0.16.14/ld/x86_aout.h
---- bin86-0.16.14-orig/ld/x86_aout.h 2004-11-07 20:07:31.506442000 +0100
-+++ bin86-0.16.14/ld/x86_aout.h 2004-11-07 20:07:41.106982496 +0100
-@@ -12,6 +12,9 @@
- #if defined(i386) || defined(__BCC__) || defined(MSDOS)
- typedef long Long;
- #define __OUT_OK 1
-+#elif defined(__x86_64__)
-+typedef int Long;
-+#define __OUT_OK 1
- #else
- typedef char Long[4];
- #endif
Copied: bin86/repos/community-x86_64/bin86-0.16.17-x86_64-1.patch (from rev 333571, bin86/trunk/bin86-0.16.17-x86_64-1.patch)
===================================================================
--- bin86-0.16.17-x86_64-1.patch (rev 0)
+++ bin86-0.16.17-x86_64-1.patch 2018-05-30 23:16:21 UTC (rev 333572)
@@ -0,0 +1,44 @@
+Submitted By: Ken Moffat <ken at kenmoffat.uklinux.net>
+Date: 2005-06-28
+Initial Package Version: 0.16.14
+Upstream Status: Submitted Upstream
+Origin: from ROCK Linux
+Description: Allows bin86 to compile on x86_64, which permits lilo to
+ be used in a 64-bit system. I'm dubious about ROCK's attempts to
+ automatically add dual-licensing to all their patches, but bin86 is
+ already GPL'd. I've heard from the maintainer that this will be
+ included in the next upload.
+
+
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+#
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+#
+# ROCK Linux: rock-src/package/x86/bin86/x86_64.patch
+# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+diff -urN bin86-0.16.14-orig/ld/x86_aout.h bin86-0.16.14/ld/x86_aout.h
+--- bin86-0.16.14-orig/ld/x86_aout.h 2004-11-07 20:07:31.506442000 +0100
++++ bin86-0.16.14/ld/x86_aout.h 2004-11-07 20:07:41.106982496 +0100
+@@ -12,6 +12,9 @@
+ #if defined(i386) || defined(__BCC__) || defined(MSDOS)
+ typedef long Long;
+ #define __OUT_OK 1
++#elif defined(__x86_64__)
++typedef int Long;
++#define __OUT_OK 1
+ #else
+ typedef char Long[4];
+ #endif
More information about the arch-commits
mailing list