beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-26 09:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Ports: Disable uname detection when building git

Browse source 
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 #9357.
This commit is contained in:
TheFightingCatfish 2021-08-13 06:52:59 +08:00 committed by Andreas Kling
parent 2fbeacb9e7
commit ff8630c66f
Notes: sideshowbarker 2024-07-18 07:01:56 +09:00 
Author: https://github.com/SeekingBlues
Commit: https://github.com/SerenityOS/serenity/commit/ff8630c66fc
Pull-request: https://github.com/SerenityOS/serenity/pull/9377
Issue: https://github.com/SerenityOS/serenity/issues/9357
3 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Ports/git/patches/have_no_librt.patch
View file

@ -1,12 +0,0 @@
--- git-2.26.0/config.mak.uname.orig 2021-03-13 13:30:24.439217597 +0100
+++ git-2.26.0/config.mak.uname 2021-03-13 13:30:32.747203874 +0100
@@ -52,7 +52,8 @@
HAVE_CLOCK_GETTIME = YesPlease
HAVE_CLOCK_MONOTONIC = YesPlease
# -lrt is needed for clock_gettime on glibc <= 2.16
- NEEDS_LIBRT = YesPlease
+ # But not when cross-compiling for Serenity.
+ # NEEDS_LIBRT = YesPlease
HAVE_GETDELIM = YesPlease
SANE_TEXT_GREP=-a
FREAD_READS_DIRECTORIES = UnfortunatelyYes

11
Ports/git/patches/have_no_sysinfo.patch
View file

@ -1,11 +0,0 @@
--- git-2.26.0/config.mak.uname.orig 2021-03-13 13:30:24.439217597 +0100
+++ git-2.26.0/config.mak.uname 2021-03-13 13:30:32.747203874 +0100
@@ -57,7 +57,7 @@
HAVE_GETDELIM = YesPlease
SANE_TEXT_GREP=-a
FREAD_READS_DIRECTORIES = UnfortunatelyYes
- BASIC_CFLAGS += -DHAVE_SYSINFO
+ # BASIC_CFLAGS += -DHAVE_SYSINFO
PROCFS_EXECUTABLE_PATH = /proc/self/exe
endif
ifeq ($(uname_S),GNU/kFreeBSD)

23
Ports/git/patches/no-uname-detection.patch Normal file
View file

@ -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