diff options
| author | Tom Needham <06needhamt@gmail.com> | 2021-04-13 19:34:52 +0100 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-04-13 21:47:11 +0200 |
| commit | 9b75b1be5f6a8d72b846fe951a7378f4f16f25fc (patch) | |
| tree | d2b97deba137d66aaaf7e45eacfdf2738d1bf165 /Ports | |
| parent | a959ccc1d0778b6a6641b16fc766a0cce248c957 (diff) | |
| download | serenity-9b75b1be5f6a8d72b846fe951a7378f4f16f25fc.zip | |
Ports: patch config.sub instead of the configure script in the yasm port
Diffstat (limited to 'Ports')
| -rw-r--r-- | Ports/yasm/patches/config.sub.patch | 29 | ||||
| -rw-r--r-- | Ports/yasm/patches/patch-configure.patch | 30 |
2 files changed, 29 insertions, 30 deletions
diff --git a/Ports/yasm/patches/config.sub.patch b/Ports/yasm/patches/config.sub.patch new file mode 100644 index 0000000000..51f79db2a6 --- /dev/null +++ b/Ports/yasm/patches/config.sub.patch @@ -0,0 +1,29 @@ +--- yasm-1.3.0/config/original-config.sub 2021-04-13 19:32:43.345360128 +0100 ++++ yasm-1.3.0/config/config.sub 2021-04-13 19:33:00.992081544 +0100 +@@ -156,7 +156,7 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis | -knuth | -cray | -microblaze) ++ -apple | -axis | -knuth | -cray | -microblaze | serenity*) + os= + basic_machine=$1 + ;; +@@ -1368,7 +1368,7 @@ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ +- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | serenity*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1505,6 +1505,8 @@ + ;; + -none) + ;; ++ -serenity*) ++ ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` diff --git a/Ports/yasm/patches/patch-configure.patch b/Ports/yasm/patches/patch-configure.patch deleted file mode 100644 index a444ac5e56..0000000000 --- a/Ports/yasm/patches/patch-configure.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/configure b/patched-configure -index d58618be9..ad8678a12 100755 ---- a/configure -+++ b/patched-configure -@@ -6306,25 +6306,6 @@ IFS=$ac_save_IFS - case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 --$as_echo_n "checking host system type... " >&6; } --if ${ac_cv_host+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test "x$host_alias" = x; then -- ac_cv_host=$ac_cv_build --else -- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || -- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 --fi -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 --$as_echo "$ac_cv_host" >&6; } --case $ac_cv_host in --*-*-*) ;; --*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; --esac - host=$ac_cv_host - ac_save_IFS=$IFS; IFS='-' - set x $ac_cv_host |