Browse Source
* imagemagick: update to 7.0.10.2 * fossil: update to 2.10 Had to disable tests checking for sqlite3 as they try to run cross-compiled tests * automake: update to 1.16.2 * ghostscript: update to 9.52 * cmake: update to 3.17.0 * git: update to 2.26.0 * krb5: update to 1.18 * ldc: update to 1.20.1master
Henrik Grimler
5 years ago
committed by
GitHub
GitHub
19 changed files with 113 additions and 101 deletions
@ -1,8 +1,8 @@ |
|||
TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/automake/ |
|||
TERMUX_PKG_DESCRIPTION="Tool for automatically generating Makefile.in files" |
|||
TERMUX_PKG_LICENSE="GPL-2.0" |
|||
TERMUX_PKG_VERSION=1.16.1 |
|||
TERMUX_PKG_VERSION=1.16.2 |
|||
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/automake/automake-${TERMUX_PKG_VERSION}.tar.xz |
|||
TERMUX_PKG_SHA256=5d05bb38a23fd3312b10aea93840feec685bdf4a41146e78882848165d3ae921 |
|||
TERMUX_PKG_SHA256=ccc459de3d710e066ab9e12d2f119bd164a08c9341ca24ba22c9adaa179eedd0 |
|||
TERMUX_PKG_DEPENDS="autoconf" |
|||
TERMUX_PKG_PLATFORM_INDEPENDENT=true |
|||
|
|||
@ -1,13 +0,0 @@ |
|||
diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
|
|||
index dc208c600..f3ec4da2d 100644
|
|||
--- a/Modules/CMakeDetermineSystem.cmake
|
|||
+++ b/Modules/CMakeDetermineSystem.cmake
|
|||
@@ -43,7 +43,7 @@ if(CMAKE_HOST_UNIX)
|
|||
else() |
|||
exec_program(${CMAKE_UNAME} ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION) |
|||
endif() |
|||
- if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*|Darwin|^GNU$")
|
|||
+ if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*|Darwin|^GNU$|Android")
|
|||
exec_program(${CMAKE_UNAME} ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR |
|||
RETURN_VALUE val) |
|||
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND |
|||
@ -1,19 +0,0 @@ |
|||
diff --git a/Modules/Platform/Android/Determine-Compiler.cmake b/Modules/Platform/Android/Determine-Compiler.cmake
|
|||
index a03ebcc29..34d527741 100644
|
|||
--- a/Modules/Platform/Android/Determine-Compiler.cmake
|
|||
+++ b/Modules/Platform/Android/Determine-Compiler.cmake
|
|||
@@ -31,6 +31,14 @@ elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
|
|||
set(_ANDROID_HOST_EXT "") |
|||
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") |
|||
set(_ANDROID_HOST_EXT ".exe") |
|||
+elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Android")
|
|||
+ macro(__android_determine_compiler lang)
|
|||
+ # Do nothing
|
|||
+ endmacro()
|
|||
+ if(NOT CMAKE_CXX_COMPILER_NAMES)
|
|||
+ set(CMAKE_CXX_COMPILER_NAMES c++)
|
|||
+ endif()
|
|||
+ return()
|
|||
else() |
|||
message(FATAL_ERROR "Android: Builds hosted on '${CMAKE_HOST_SYSTEM_NAME}' not supported.") |
|||
endif() |
|||
@ -1,20 +0,0 @@ |
|||
diff --git a/Source/cmStateSnapshot.cxx b/Source/cmStateSnapshot.cxx
|
|||
index 63bec710b..19286c50e 100644
|
|||
--- a/Source/cmStateSnapshot.cxx
|
|||
+++ b/Source/cmStateSnapshot.cxx
|
|||
@@ -316,11 +316,15 @@ void cmStateSnapshot::SetDefaultDefinitions()
|
|||
this->SetDefinition("UNIX", "1"); |
|||
this->SetDefinition("CMAKE_HOST_UNIX", "1"); |
|||
|
|||
+#if defined(__ANDROID__)
|
|||
+ this->SetDefinition("CMAKE_HOST_SYSTEM_NAME", "Android");
|
|||
+#else
|
|||
struct utsname uts_name; |
|||
if (uname(&uts_name) >= 0) { |
|||
this->SetDefinition("CMAKE_HOST_SYSTEM_NAME", uts_name.sysname); |
|||
} |
|||
#endif |
|||
+#endif
|
|||
#if defined(__CYGWIN__) |
|||
std::string legacy; |
|||
if (cmSystemTools::GetEnv("CMAKE_LEGACY_CYGWIN_WIN32", legacy) && |
|||
@ -1,9 +1,9 @@ |
|||
TERMUX_PKG_HOMEPAGE=https://cmake.org/ |
|||
TERMUX_PKG_DESCRIPTION="Family of tools designed to build, test and package software" |
|||
TERMUX_PKG_LICENSE="BSD 3-Clause" |
|||
TERMUX_PKG_VERSION=3.16.5 |
|||
TERMUX_PKG_VERSION=3.17.0 |
|||
TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz |
|||
TERMUX_PKG_SHA256=5f760b50b8ecc9c0c37135fae5fbf00a2fef617059aa9d61c1bb91653e5a8bfc |
|||
TERMUX_PKG_SHA256=b74c05b55115eacc4fa2b77a814981dbda05cdc95a53e279fe16b7b272f00847 |
|||
TERMUX_PKG_DEPENDS="libarchive, libc++, libcurl, libexpat, jsoncpp, libuv, rhash, make, clang, zlib" |
|||
TERMUX_PKG_FORCE_CMAKE=true |
|||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DKWSYS_LFS_WORKS=ON -DBUILD_CursesDialog=ON" |
|||
|
|||
@ -0,0 +1,60 @@ |
|||
--- ../auto.def.orig 2020-03-24 09:23:19.936110079 +0100
|
|||
+++ ./auto.def 2020-03-24 09:33:04.184974256 +0100
|
|||
@@ -133,51 +133,17 @@
|
|||
# not stmt_isexplain(), then the system SQLite is too old to link against |
|||
# fossil. |
|||
# |
|||
- if {[check-function-in-lib sqlite3_open sqlite3 $extralibs]} {
|
|||
- # Success. Update symbols and return.
|
|||
- #
|
|||
- define USE_SYSTEM_SQLITE 1
|
|||
- define-append LIBS -lsqlite3
|
|||
- define-append LIBS $extralibs
|
|||
- return
|
|||
- }
|
|||
+ # Update symbols and return.
|
|||
+ #
|
|||
+ define USE_SYSTEM_SQLITE 1
|
|||
+ define-append LIBS -lsqlite3
|
|||
+ define-append LIBS $extralibs
|
|||
+ return
|
|||
} |
|||
user-error "system sqlite3 not found" |
|||
} |
|||
|
|||
find_system_sqlite |
|||
-
|
|||
- proc test_system_sqlite {} {
|
|||
- # Check compatibility of the system SQLite library by running the sqlcompttest.c
|
|||
- # program in the source tree
|
|||
- #
|
|||
- set cmdline {}
|
|||
- lappend cmdline {*}[get-define CCACHE]
|
|||
- lappend cmdline {*}[get-define CC] {*}[get-define CFLAGS]
|
|||
- lappend cmdline $::autosetup(dir)/../src/sqlcompattest.c -o conftest__
|
|||
- lappend cmdline {*}[get-define LDFLAGS]
|
|||
- lappend cmdline {*}[get-define LIBS]
|
|||
- set ok 1
|
|||
- set err [catch {exec-with-stderr {*}$cmdline} result errinfo]
|
|||
- if {$err} {
|
|||
- configlog "Failed: [join $cmdline]"
|
|||
- if {[string length $result]>0} {configlog $result}
|
|||
- configlog "============"
|
|||
- set ok 0
|
|||
- } elseif {$::autosetup(debug)} {
|
|||
- configlog "Compiled OK: [join $cmdline]"
|
|||
- configlog "============"
|
|||
- }
|
|||
- if {!$ok} {
|
|||
- user-error "unable to compile SQLite compatibility test program"
|
|||
- }
|
|||
- set err [catch {exec-with-stderr ./conftest__} result errinfo]
|
|||
- if {$err} {
|
|||
- user-error $result
|
|||
- }
|
|||
- file delete ./conftest__
|
|||
- }
|
|||
- test_system_sqlite
|
|||
|
|||
} |
|||
|
|||
@ -1,11 +0,0 @@ |
|||
--- ./configure 2017-03-16 10:12:59.000000000 +0000
|
|||
+++ ./configure 2017-03-18 15:14:30.363309054 +0000
|
|||
@@ -3772,7 +3772,7 @@
|
|||
echo $AUXFLAGS_MAK_LINE06 >> $AUXFLAGS_MAK.in |
|||
echo $AUXFLAGS_MAK_LINE07 >> $AUXFLAGS_MAK.in |
|||
|
|||
- ../$0 CC="$CCAUX" CFLAGS="$CFLAGSAUX" LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX= MAKEFILE=$AUXFLAGS_MAK --host= --build= --without-libtiff --disable-contrib --disable-fontconfig --disable-dbus --disable-freetype --disable-fapi --disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster --without-ijs --without-luratech --without-jbig2dec --without-x --with-drivers=""
|
|||
+ $0 CC="$CCAUX" CFLAGS="$CFLAGSAUX" LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX= MAKEFILE=$AUXFLAGS_MAK --host= --build= --without-libtiff --disable-contrib --disable-fontconfig --disable-dbus --disable-freetype --disable-fapi --disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster --without-ijs --without-luratech --without-jbig2dec --without-x --with-drivers=""
|
|||
status=$? |
|||
cp config.log ../configaux.log |
|||
if test $status -eq 0 ; then |
|||
@ -0,0 +1,11 @@ |
|||
--- ../plugins.c.orig 2020-03-24 12:00:24.214840738 +0000
|
|||
+++ src/util/support/plugins.c 2020-03-24 12:04:04.597776193 +0000
|
|||
@@ -62,7 +62,7 @@
|
|||
* dlopen() with RTLD_NODELETE, we weren't going to unload the plugin objects |
|||
* anyway. |
|||
*/ |
|||
-#ifdef __linux__
|
|||
+#if defined(__linux__) && !defined(__ANDROID__)
|
|||
#include <features.h> |
|||
#if ! __GLIBC_PREREQ(2, 25) |
|||
#define dlclose(x) |
|||
Loading…
Reference in new issue