about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorptitSeb <sebastien.chev@gmail.com>2024-07-10 16:37:46 +0200
committerptitSeb <sebastien.chev@gmail.com>2024-07-10 16:37:46 +0200
commitd10a0784737a0f8c68dae736028a64924733c2d5 (patch)
treea3a7697f420213f0ab8ad21727cf9d62630b83a9
parent8d9fd7cb0e0c29529f620981b658b7f6bace6e28 (diff)
downloadbox64-d10a0784737a0f8c68dae736028a64924733c2d5.tar.gz
box64-d10a0784737a0f8c68dae736028a64924733c2d5.zip
[STATICBUILD] removed Android staticbuild
-rw-r--r--.github/workflows/release.yml8
-rw-r--r--src/libtools/static_libc.h1
-rw-r--r--src/wrapped/wrappedldlinux_private.h3
3 files changed, 10 insertions, 2 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 90e18048..046545fc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -37,9 +37,15 @@ jobs:
           - platform: TEGRAX1
             type: Trace
             os: ubuntu-20.04
+        exclude:
           - platform: TEGRAX1
             type: StaticBuild
-            os: ubuntu-20.04
+          - platform: ANDROID
+            type: StaticBuild
+          - platform: TERMUX
+            type: StaticBuild
+          - platform: X64
+            type: StaticBuild  
 
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/src/libtools/static_libc.h b/src/libtools/static_libc.h
index 3b237dd2..cfc599a0 100644
--- a/src/libtools/static_libc.h
+++ b/src/libtools/static_libc.h
@@ -129,6 +129,7 @@ extern char* __getcwd_chk(char*, size_t, size_t);
 extern int __getgroups_chk(int, __gid_t*, size_t);
 extern void* __getmntent_r(void*, void*, void*, int);
 //extern int getnetname(char *);
+extern int __getpagesize();
 extern int __getpid(void);
 //extern int getpublickey (const char *, char *);
 extern int __getrlimit(int, void*);
diff --git a/src/wrapped/wrappedldlinux_private.h b/src/wrapped/wrappedldlinux_private.h
index 4bde24e1..bbfe723c 100644
--- a/src/wrapped/wrappedldlinux_private.h
+++ b/src/wrapped/wrappedldlinux_private.h
@@ -15,12 +15,13 @@
 // _dl_tls_setup
 DATA(__libc_enable_secure, sizeof(void*))
 DATAM(__libc_stack_end, sizeof(void*))
-DATAB(_r_debug, 40)
 #ifdef STATICBUILD
+//DATAB(_r_debug, 40)
 //DATA(__pointer_chk_guard, sizeof(void*))
 //DATA(_rtld_global, sizeof(void*))
 //DATA(_rtld_global_ro, sizeof(void*))
 #else
+DATAB(_r_debug, 40)
 DATA(__pointer_chk_guard, sizeof(void*))
 DATA(_rtld_global, sizeof(void*))
 DATA(_rtld_global_ro, sizeof(void*))