Skip to content

Commit

Permalink
Ports: Fix building the nasm port
Browse files Browse the repository at this point in the history
  • Loading branch information
gunnarbeutner authored and awesomekling committed Apr 14, 2021
1 parent 0a600a3 commit 1942c10
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 24 deletions.
4 changes: 0 additions & 4 deletions Ports/nasm/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,3 @@ version=2.15.05
files="https://www.nasm.us/pub/nasm/releasebuilds/${version}/nasm-${version}.tar.gz nasm-${version}.tar.gz"
useconfigure=true
makeopts=

pre_configure() {
run ./autogen.sh
}
32 changes: 12 additions & 20 deletions Ports/nasm/patches/config.sub.patch
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
--- nasm-2.15.05/autoconf/helpers/original-config.sub 2021-04-13 19:00:40.329393345 +0100
+++ nasm-2.15.05/autoconf/helpers/config.sub 2021-04-13 19:02:01.489645184 +0100
@@ -134,7 +134,7 @@
nto-qnx* | linux-* | uclinux-uclibc* \
| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
- | storm-chaos* | os2-emx* | rtmk-nova*)
+ | storm-chaos* | os2-emx* | rtmk-nova* | serenity)
basic_machine=$field1
basic_os=$maybe_os
;;
@@ -1720,7 +1720,7 @@
| skyos* | haiku* | rdos* | toppers* | drops* | es* \
| onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
| midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
- | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*)
+ | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | serenity*)
;;
# This one is extra strict with allowed versions
sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
diff -Naur nasm-2.15.05/autoconf/helpers/config.sub nasm-2.15.05.serenity/autoconf/helpers/config.sub
--- nasm-2.15.05/autoconf/helpers/config.sub 2020-08-28 18:04:07.000000000 +0200
+++ nasm-2.15.05.serenity/autoconf/helpers/config.sub 2021-04-14 11:44:38.324488456 +0200
@@ -1333,7 +1333,7 @@
# The portable systems comes first.
# Each alternative MUST end in a * to match a version number.
# sysv* is not here because it comes later, after sysvr4.
- gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
+ gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* | serenity* \
| *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
| hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
| sym* | kopensolaris* | plan9* \

0 comments on commit 1942c10

Please sign in to comment.