Github messages for voidlinux
 help / color / mirror / Atom feed
From: mahiuchun <mahiuchun@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] bin86: dev86: make bin86 a subpackage of dev86.
Date: Thu, 30 Sep 2021 05:36:41 +0200	[thread overview]
Message-ID: <20210930033641.ALJ3dyzgrG5SEvh8RCiM0mNpWDpSd2a35NZWvyQdzZk@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-33185@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1616 bytes --]

There is an updated pull request by mahiuchun against master on the void-packages repository

https://github.com/mahiuchun/void-packages dev86
https://github.com/void-linux/void-packages/pull/33185

bin86: dev86: make bin86 a subpackage of dev86.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/33185.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dev86-33185.patch --]
[-- Type: text/x-diff, Size: 3805 bytes --]

From 85dfae3b909718cf4d2685eabeb5f5833b9f2d2f Mon Sep 17 00:00:00 2001
From: Hill Ma <maahiuzeon@gmail.com>
Date: Wed, 29 Sep 2021 00:25:33 -0700
Subject: [PATCH] bin86: dev86: make bin86 a subpackage of dev86.

---
 srcpkgs/bin86                         |  1 +
 srcpkgs/bin86/patches/fix_x86_64.diff | 12 -----------
 srcpkgs/bin86/template                | 20 ------------------
 srcpkgs/dev86/template                | 29 ++++++++++++++++-----------
 4 files changed, 18 insertions(+), 44 deletions(-)
 create mode 120000 srcpkgs/bin86
 delete mode 100644 srcpkgs/bin86/patches/fix_x86_64.diff
 delete mode 100644 srcpkgs/bin86/template

diff --git a/srcpkgs/bin86 b/srcpkgs/bin86
new file mode 120000
index 000000000000..6c075505a031
--- /dev/null
+++ b/srcpkgs/bin86
@@ -0,0 +1 @@
+dev86
\ No newline at end of file
diff --git a/srcpkgs/bin86/patches/fix_x86_64.diff b/srcpkgs/bin86/patches/fix_x86_64.diff
deleted file mode 100644
index 05c374aeb6f2..000000000000
--- a/srcpkgs/bin86/patches/fix_x86_64.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/ld/x86_aout.h    2005-11-07 20:07:31.506442000 +0100
-+++ b/ld/x86_aout.h 2020-02-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
diff --git a/srcpkgs/bin86/template b/srcpkgs/bin86/template
deleted file mode 100644
index 8d711210193e..000000000000
--- a/srcpkgs/bin86/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'bin86'
-pkgname=bin86
-version=0.16.21
-revision=4
-short_desc="A complete 8086 assembler and loader"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://v3.sk/~lkundrak/dev86/"
-license="GPL-2"
-distfiles="http://v3.sk/~lkundrak/dev86/bin86-${version}.tar.gz"
-checksum=021e37cde3a20632c4c9000993cb4aa9f58cb82b1d3c26b9aeb62d6566925738
-archs="i686* x86_64*"
-
-do_build() {
-	make ${makejobs} CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" PREFIX=/usr
-}
-do_install() {
-	vmkdir usr/bin
-	vmkdir usr/share/man/man1
-	make PREFIX=${DESTDIR}/usr MANDIR=${DESTDIR}/usr/share/man/man1 install
-}
diff --git a/srcpkgs/dev86/template b/srcpkgs/dev86/template
index 174e6d9602a8..4e026e86591b 100644
--- a/srcpkgs/dev86/template
+++ b/srcpkgs/dev86/template
@@ -1,31 +1,36 @@
 # Template file for 'dev86'
 pkgname=dev86
 version=0.16.21
-revision=4
-archs="i686* x86_64*"
-makedepends="bin86"
-depends="${makedepends}"
+revision=5
 short_desc="8086 cross development compiler, assembler and linker"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-1.0-or-later, GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="http://v3.sk/~lkundrak/dev86/"
-distfiles="${homepage}/Dev86src-$version.tar.gz"
-checksum=234b110e6df9b7f6843e2ee53473127c2211243a16748f229fc0127845f68d94
+homepage="https://github.com/lkundrak/dev86/"
+distfiles="https://github.com/lkundrak/dev86/archive/v${version}.tar.gz"
+checksum=49c7ee9102d45c2eef072bfb8a49ba3821c9fe3ef31ccd3290f658b667b579a8
 nostrip=yes
 nopie=yes
 
-do_build() {
+pre_build() {
 	for f in libc/bcc libc/misc libc/msdos libc/string libc/syscall \
 		libc/bios; do
 		sed -i -e "s|\$(CCFLAGS) ||g" ${wrksrc}/${f}/Makefile
 	done
-	make DIST=${DESTDIR}
 }
 
 do_install() {
 	make DIST=${DESTDIR} MANDIR=/usr/share/man install install-man
+}
 
-	# Remove stuff supplied by bin86
-	rm -f ${DESTDIR}/usr/bin/{as,ld,nm,objdump,size}86
-	rm -f ${DESTDIR}/usr/share/man/man1/{as,ld}86.1
+bin86_package() {
+	short_desc="Complete 8086 assembler and loader"
+	pkg_install() {
+		vmove /usr/bin/as86
+		vmove /usr/bin/ld86
+		vmove /usr/bin/nm86
+		vmove /usr/bin/objdump86
+		vmove /usr/bin/size86
+		vmove /usr/share/man/man1/as86.1
+		vmove /usr/share/man/man1/ld86.1
+	}
 }

  reply	other threads:[~2021-09-30  3:36 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-30  3:33 [PR PATCH] " mahiuchun
2021-09-30  3:36 ` mahiuchun [this message]
2021-09-30  3:39 ` [PR PATCH] [Updated] " mahiuchun
2021-09-30 20:33 ` [PR REVIEW] " Chocimier
2021-10-01  2:38 ` mahiuchun
2021-10-12 19:34 ` [PR PATCH] [Merged]: " ericonr

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210930033641.ALJ3dyzgrG5SEvh8RCiM0mNpWDpSd2a35NZWvyQdzZk@z \
    --to=mahiuchun@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).