Skip to content

Commit

Permalink
Ports: Disable uname detection when building git
Browse files Browse the repository at this point in the history
Previously, the git port would fail in various ways because it uses an
uname detection mechanism to update the configurations, and Makefile
would receive incorrect configurations from the host system. This makes
sure the build uses the correct configurations detected by ./configure.

Fixes SerenityOS#9357.
  • Loading branch information
SeekingBlues authored and awesomekling committed Aug 13, 2021
1 parent 2fbeacb commit ff8630c
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
12 changes: 0 additions & 12 deletions Ports/git/patches/have_no_librt.patch

This file was deleted.

11 changes: 0 additions & 11 deletions Ports/git/patches/have_no_sysinfo.patch

This file was deleted.

23 changes: 23 additions & 0 deletions Ports/git/patches/no-uname-detection.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
diff --git a/config.mak.uname b/config.mak.uname
index d204c20..d49e3ba 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -4,12 +4,12 @@
# Microsoft's Safe Exception Handling in libraries (such as zlib).
# Typically required for VS2013+/32-bit compilation on Vista+ versions.

-uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
-uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
-uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
-uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
-uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
-uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')
+# uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+# uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
+# uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
+# uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
+# uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
+# uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')

ifdef MSVC
# avoid the MingW and Cygwin configuration sections

0 comments on commit ff8630c

Please sign in to comment.