diff options
| author | Ben Wiederhake <BenWiederhake.GitHub@gmx.de> | 2021-03-13 13:57:32 +0100 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-03-14 11:30:38 +0100 |
| commit | 4100aa52d9f2cd40884bd9829501b2e00ecf277e (patch) | |
| tree | 3692dd845d8c539d75601e17953821dc8e9aa5aa /Ports/git/patches | |
| parent | e23fc195e7d0b885a0a698aac89081e5bd190f15 (diff) | |
| download | serenity-4100aa52d9f2cd40884bd9829501b2e00ecf277e.zip | |
Ports: Fix cross-compiling git for serenity
No idea how this is supposed to work, because git's buildscripts execute
'uname -S' to determine which functions are available - and that's not how
cross-compilation works.
Diffstat (limited to 'Ports/git/patches')
| -rw-r--r-- | Ports/git/patches/have_no_librt.patch | 12 | ||||
| -rw-r--r-- | Ports/git/patches/have_no_sysinfo.patch | 11 |
2 files changed, 23 insertions, 0 deletions
diff --git a/Ports/git/patches/have_no_librt.patch b/Ports/git/patches/have_no_librt.patch new file mode 100644 index 0000000000..a23611438a --- /dev/null +++ b/Ports/git/patches/have_no_librt.patch @@ -0,0 +1,12 @@ +--- 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 diff --git a/Ports/git/patches/have_no_sysinfo.patch b/Ports/git/patches/have_no_sysinfo.patch new file mode 100644 index 0000000000..4bbb6a0040 --- /dev/null +++ b/Ports/git/patches/have_no_sysinfo.patch @@ -0,0 +1,11 @@ +--- 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) |