Synchronet now requires the libarchive development package (e.g. libarchive-dev on Debian-based Linux distros, libarchive.org for more info) to build successfully.

Commits (1)
......@@ -48,7 +48,7 @@ $(JS_SRC): | $(3RDPSRCDIR)
$(JS_IDIR): | $(3RDPODIR)
$(QUIET)$(IFNOTEXIST) mkdir $(JS_IDIR)
$(JSLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/libmozjs.tgz $(3RDP_ROOT)$(DIRSEP)build/js_src_jsnativestack_cpp.patch $(3RDP_ROOT)$(DIRSEP)build/js-configure.patch $(3RDP_ROOT)$(DIRSEP)build/js-configure.in.patch $(3RDP_ROOT)$(DIRSEP)build/imacro-asm-fix.patch | $(JS_SRC) $(JS_IDIR)
$(JSLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/libmozjs.tgz $(3RDP_ROOT)$(DIRSEP)build/js_src_jsnativestack_cpp.patch $(3RDP_ROOT)$(DIRSEP)build/js-configure.patch $(3RDP_ROOT)$(DIRSEP)build/js-configure.in.patch $(3RDP_ROOT)$(DIRSEP)build/imacro-asm-fix.patch $(3RDP_ROOT)$(DIRSEP)build/js-volatile-outside-functions.patch | $(JS_SRC) $(JS_IDIR)
@echo Creating $@ ...
$(QUIET)-rm -rf $(JS_SRC)/*
$(QUIET)tar -xzC $(JS_SRC) -f $(3RDPDISTDIR)$(DIRSEP)libmozjs.tgz
......@@ -57,6 +57,7 @@ $(JSLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/libmozjs.tgz $(3RDP_ROOT)$(DIRSEP)buil
$(QUIET)patch -b -p0 -d $(JS_SRC) < js-configure.patch
$(QUIET)patch -b -p0 -d $(JS_SRC) < js-configure.in.patch
$(QUIET)patch -b -p0 -d $(JS_SRC) < imacro-asm-fix.patch
$(QUIET)patch -b -p0 -d $(JS_SRC) < js-volatile-outside-functions.patch
-$(QUIET)cd $(JS_SRC)$(DIRSEP)js-1.8.5$(DIRSEP)js$(DIRSEP)src && autoconf-2.13
$(QUIET)cd $(JS_SRC)$(DIRSEP)js-1.8.5$(DIRSEP)js$(DIRSEP)src && env $(JS_CONFIGURE_ENV) ./configure $(JS_CONFIGURE_ARGS)
$(QUIET)$(MAKE) -C $(JS_SRC)$(DIRSEP)js-1.8.5$(DIRSEP)js$(DIRSEP)src
......
diff -ur ../mozjs-pre/js-1.8.5/js/src/methodjit/MethodJIT.cpp ./js-1.8.5/js/src/methodjit/MethodJIT.cpp
--- ../mozjs-pre/js-1.8.5/js/src/methodjit/MethodJIT.cpp 2021-03-13 19:50:35.282449000 -0500
+++ ./js-1.8.5/js/src/methodjit/MethodJIT.cpp 2021-03-13 19:53:09.753422000 -0500
@@ -189,7 +189,7 @@
JS_STATIC_ASSERT(JSVAL_TAG_MASK == 0xFFFF800000000000LL);
JS_STATIC_ASSERT(JSVAL_PAYLOAD_MASK == 0x00007FFFFFFFFFFFLL);
-asm volatile (
+asm (
".text\n"
".globl " SYMBOL_STRING(JaegerTrampoline) "\n"
SYMBOL_STRING(JaegerTrampoline) ":" "\n"
@@ -236,7 +236,7 @@
"jmp *0(%rsp)" "\n"
);
-asm volatile (
+asm (
".text\n"
".globl " SYMBOL_STRING(JaegerTrampolineReturn) "\n"
SYMBOL_STRING(JaegerTrampolineReturn) ":" "\n"
@@ -256,7 +256,7 @@
"ret" "\n"
);
-asm volatile (
+asm (
".text\n"
".globl " SYMBOL_STRING(JaegerThrowpoline) "\n"
SYMBOL_STRING(JaegerThrowpoline) ":" "\n"
@@ -281,7 +281,7 @@
JS_STATIC_ASSERT(offsetof(VMFrame, regs.fp) == 0x38);
-asm volatile (
+asm (
".text\n"
".globl " SYMBOL_STRING(InjectJaegerReturn) "\n"
SYMBOL_STRING(InjectJaegerReturn) ":" "\n"
@@ -309,7 +309,7 @@
JS_STATIC_ASSERT(offsetof(VMFrame, savedEBX) == 0x2c);
JS_STATIC_ASSERT(offsetof(VMFrame, regs.fp) == 0x1C);
-asm volatile (
+asm (
".text\n"
".globl " SYMBOL_STRING(JaegerTrampoline) "\n"
SYMBOL_STRING(JaegerTrampoline) ":" "\n"
@@ -339,7 +339,7 @@
"jmp *16(%ebp)" "\n"
);
-asm volatile (
+asm (
".text\n"
".globl " SYMBOL_STRING(JaegerTrampolineReturn) "\n"
SYMBOL_STRING(JaegerTrampolineReturn) ":" "\n"
@@ -357,7 +357,7 @@
"ret" "\n"
);
-asm volatile (
+asm (
".text\n"
".globl " SYMBOL_STRING(JaegerThrowpoline) "\n"
SYMBOL_STRING(JaegerThrowpoline) ":" "\n"
@@ -388,7 +388,7 @@
JS_STATIC_ASSERT(offsetof(VMFrame, regs.fp) == 0x1C);
-asm volatile (
+asm (
".text\n"
".globl " SYMBOL_STRING(InjectJaegerReturn) "\n"
SYMBOL_STRING(InjectJaegerReturn) ":" "\n"
@@ -423,7 +423,7 @@
#define FUNCTION_HEADER_EXTRA
#endif
-asm volatile (
+asm (
".text\n"
FUNCTION_HEADER_EXTRA
".globl " SYMBOL_STRING(InjectJaegerReturn) "\n"
@@ -436,7 +436,7 @@
"bx lr" "\n"
);
-asm volatile (
+asm (
".text\n"
FUNCTION_HEADER_EXTRA
".globl " SYMBOL_STRING(JaegerTrampoline) "\n"
@@ -495,7 +495,7 @@
" bx r4" "\n"
);
-asm volatile (
+asm (
".text\n"
FUNCTION_HEADER_EXTRA
".globl " SYMBOL_STRING(JaegerTrampolineReturn) "\n"
@@ -515,7 +515,7 @@
" pop {r4-r11,pc}" "\n"
);
-asm volatile (
+asm (
".text\n"
FUNCTION_HEADER_EXTRA
".globl " SYMBOL_STRING(JaegerThrowpoline) "\n"
@@ -540,7 +540,7 @@
" pop {r4-r11,pc}" "\n"
);
-asm volatile (
+asm (
".text\n"
FUNCTION_HEADER_EXTRA
".globl " SYMBOL_STRING(JaegerStubVeneer) "\n"