LibTomMath: upgrade to release 1.2.0
* external/libtommath/clang-cl.patch: removed "typedef unsigned __int128 mp_word" from tommmath.h * external/libtommath/libtommath-msvc.patch: fixed upstream Change-Id: I38fe730ff0e9649c6a0ad8d64b723a27e3434012 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153871 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
This commit is contained in:
parent
b13a7112d8
commit
13bc0489d9
5 changed files with 3 additions and 33 deletions
|
@ -329,8 +329,8 @@ LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.11.tar.xz
|
|||
# three static lines
|
||||
# so that git cherry-pick
|
||||
# will not run into conflicts
|
||||
LIBTOMMATH_SHA256SUM := 083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
|
||||
LIBTOMMATH_TARBALL := ltm-1.0.zip
|
||||
LIBTOMMATH_SHA256SUM := b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1
|
||||
LIBTOMMATH_TARBALL := ltm-1.2.0.tar.xz
|
||||
# three static lines
|
||||
# so that git cherry-pick
|
||||
# will not run into conflicts
|
||||
|
|
2
external/libtommath/README
vendored
2
external/libtommath/README
vendored
|
@ -3,4 +3,4 @@ integer library written entirely in C.
|
|||
|
||||
Used by embedded firebird (external/firebird).
|
||||
|
||||
https://www.libtom.net/LibTomMath/
|
||||
From [https://www.libtom.net/LibTomMath/].
|
||||
|
|
|
@ -14,8 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libtommath,$(LIBTOMMATH_TARBALL)))
|
|||
$(eval $(call gb_UnpackedTarball_set_patchlevel,libtommath,0))
|
||||
|
||||
$(eval $(call gb_UnpackedTarball_add_patches,libtommath,\
|
||||
external/libtommath/libtommath-msvc.patch \
|
||||
external/libtommath/clang-cl.patch \
|
||||
))
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
||||
|
|
16
external/libtommath/clang-cl.patch
vendored
16
external/libtommath/clang-cl.patch
vendored
|
@ -1,16 +0,0 @@
|
|||
--- tommath.h
|
||||
+++ tommath.h
|
||||
@@ -15,6 +15,13 @@
|
||||
#ifndef BN_H_
|
||||
#define BN_H_
|
||||
|
||||
+// Work around clang-cl issue when mp_word is a typedef for unsigned __int128, see
|
||||
+// <https://bugs.llvm.org/show_bug.cgi?id=25305> "Clang-cl generates a call to an undefined symbol
|
||||
+// _udivti3":
|
||||
+#if defined _WIN32 && defined __clang__
|
||||
+#define MP_8BIT
|
||||
+#endif
|
||||
+
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdint.h>
|
12
external/libtommath/libtommath-msvc.patch
vendored
12
external/libtommath/libtommath-msvc.patch
vendored
|
@ -1,12 +0,0 @@
|
|||
--- makefile.msvc 2016-02-05 23:25:32.000000000 +0100
|
||||
+++ makefile.msvc 2016-07-21 11:34:20.618390100 +0200
|
||||
@@ -38,3 +38,9 @@
|
||||
|
||||
library: $(OBJECTS)
|
||||
lib /out:tommath.lib $(OBJECTS)
|
||||
+
|
||||
+.cc.obj:
|
||||
+ $(CC) /nologo $(CFLAGS) /c $<
|
||||
+
|
||||
+.c.obj:
|
||||
+ $(CC) /nologo $(CFLAGS) /c $<
|
Loading…
Reference in a new issue