nsis: Do not define __BIG_ENDIAN__

This commit is contained in:
Tee KOBAYASHI 2022-03-27 08:01:43 +09:00 committed by xtkoba
parent be2d6f733a
commit 718ac8edb5
5 changed files with 55 additions and 1 deletions

View File

@ -0,0 +1,21 @@
--- a/SCons/Config/gnu
+++ b/SCons/Config/gnu
@@ -116,8 +116,6 @@
makensis_env.Append(CPPPATH = ['#$BUILD_CONFIG'])
-if not defenv['DEBUG']:
- makensis_env.Append(CCFLAGS = ['-O2']) # optimize
makensis_env.Append(CFLAGS = ['-Wall']) # all warnings
makensis_env.Append(CXXFLAGS = ['-Wno-non-virtual-dtor']) # ignore virtual dtor warnings
makensis_env.Append(CXXFLAGS = ['-Wall']) # all warnings
@@ -352,9 +350,6 @@
return result
conf = defenv.Configure(custom_tests = { 'CheckBigEndian' : check_big_endian })
-if conf.CheckBigEndian():
- makensis_env.Append(CPPDEFINES = ['__BIG_ENDIAN__'])
- test_env.Append(CPPDEFINES = ['__BIG_ENDIAN__'])
conf.Finish()
if makensis_env['PLATFORM'] == 'hpux':

View File

@ -0,0 +1,11 @@
--- a/Source/ResourceEditor.cpp
+++ b/Source/ResourceEditor.cpp
@@ -913,7 +913,7 @@
}
FILEVIEW &map = *(FILEVIEW*) &X.Map;
- size_t datasize;
+ size_t datasize = 0;
char *filedata = create_file_view_readonly(File, map), *data = 0, *dataalloc = 0;
if (filedata) {
if (resproto) {

View File

@ -0,0 +1,11 @@
--- a/Source/util.cpp
+++ b/Source/util.cpp
@@ -736,7 +736,7 @@
if (cch && cch < COUNTOF(buftmpdir) && GetTempFileName(buftmpdir, _T("nst"), 0, buf))
tfpath = _tcsdup(buf);
#else //! _WIN32
- char narrowpath[] = ("/tmp/makensisXXXXXX");
+ char narrowpath[] = ("@TERMUX_PREFIX@/tmp/makensisXXXXXX");
const mode_t org_umask = umask(0077);
int fd = mkstemp(narrowpath);
umask(org_umask);

View File

@ -0,0 +1,11 @@
--- a/Source/util.h
+++ b/Source/util.h
@@ -131,7 +131,7 @@
friend int fseek(S_t*s, long int offset, int origin)
{
if ((unsigned long) offset != (size_t) offset) return 1; // long int will usually fit in our size_t
- size_t newpos, invalid = 0;
+ size_t newpos = 0, invalid = 0;
switch(origin)
{
case SEEK_SET: newpos = (size_t) offset, invalid = offset < 0; break;

View File

@ -5,7 +5,7 @@ TERMUX_PKG_LICENSE="custom"
TERMUX_PKG_LICENSE_FILE="COPYING" TERMUX_PKG_LICENSE_FILE="COPYING"
TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=3.08 TERMUX_PKG_VERSION=3.08
TERMUX_PKG_REVISION=1 TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://prdownloads.sourceforge.net/nsis/nsis-${TERMUX_PKG_VERSION}-src.tar.bz2 TERMUX_PKG_SRCURL=https://prdownloads.sourceforge.net/nsis/nsis-${TERMUX_PKG_VERSION}-src.tar.bz2
TERMUX_PKG_SHA256=a85270ad5386182abecb2470e3d7e9bec9fe4efd95210b13551cb386830d1e87 TERMUX_PKG_SHA256=a85270ad5386182abecb2470e3d7e9bec9fe4efd95210b13551cb386830d1e87
TERMUX_PKG_DEPENDS="libandroid-support, libc++, libiconv, zlib" TERMUX_PKG_DEPENDS="libandroid-support, libc++, libiconv, zlib"