Skip to content

Commit

Permalink
Ports: Fix cross-compiling git for serenity
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
BenWiederhake authored and awesomekling committed Mar 14, 2021
1 parent e23fc19 commit 4100aa5
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
12 changes: 12 additions & 0 deletions Ports/git/patches/have_no_librt.patch
Original file line number Diff line number Diff line change
@@ -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
11 changes: 11 additions & 0 deletions Ports/git/patches/have_no_sysinfo.patch
Original file line number Diff line number Diff line change
@@ -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)

0 comments on commit 4100aa5

Please sign in to comment.