Skip to content

Commit

Permalink
contrib/fossil: apply sqlite ppc patch
Browse files Browse the repository at this point in the history
  • Loading branch information
z-erica authored and nekopsykose committed Jun 25, 2024
1 parent 9289b47 commit 1d68452
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 1 deletion.
36 changes: 36 additions & 0 deletions contrib/fossil/patches/sqlite-ppc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
The __ppc__ macro is always defined on clang but not gcc, which
results in sqlite mistakenly thinking that ppc64le with clang
is big endian.

Also disable some inline assembly stuff on ppc that is never used
with gcc and probably was never tested with modern machines.

--- a/extsrc/sqlite3.c
+++ b/extsrc/sqlite3.c
@@ -14875,7 +14875,7 @@
# elif defined(i386) || defined(__i386__) || defined(_M_IX86) || \
defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \
defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \
- defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
+ defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || defined(__LITTLE_ENDIAN__)
# define SQLITE_BYTEORDER 1234
# elif defined(sparc) || defined(__ARMEB__) || defined(__AARCH64EB__)
# define SQLITE_BYTEORDER 4321
@@ -35670,7 +35670,7 @@ SQLITE_PRIVATE int sqlite3VListNameToNum(VList *pIn, const char *zName, int nNam
return (sqlite_uint64)hi << 32 | lo;
}

-#elif !defined(__STRICT_ANSI__) && (defined(__GNUC__) && defined(__ppc__))
+#elif 0

__inline__ sqlite_uint64 sqlite3Hwtime(void){
unsigned long long retval;
@@ -207003,7 +207003,7 @@
# elif defined(i386) || defined(__i386__) || defined(_M_IX86) || \
defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \
defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \
- defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
+ defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || defined(__LITTLE_ENDIAN__)
# define SQLITE_BYTEORDER 1234
# elif defined(sparc) || defined(__ARMEB__) || defined(__AARCH64EB__)
# define SQLITE_BYTEORDER 4321
2 changes: 1 addition & 1 deletion contrib/fossil/template.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pkgname = "fossil"
pkgver = "2.24"
pkgrel = 0
pkgrel = 1
build_style = "gnu_configure"
configure_args = [
"--json",
Expand Down

0 comments on commit 1d68452

Please sign in to comment.