p96705831
/
z3
forked from openkylin/z3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed debian/source/format to native

This commit is contained in:
Lu zhiping 2022-08-15 16:26:58 +08:00
parent 9ea1869bfb
commit fd95bb3b66
6 changed files with 1 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
debian/patches/00-intrinsics.patch vendored
View File

@ -1,67 +0,0 @@
Description: INTRINSICS are not universally available
Author: Michael Tautschnig <mt@debian.org>
Forwarded: no
Last-Update: 2016-07-08
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/util/hwf.cpp
+++ b/src/util/hwf.cpp
@@ -48,7 +48,7 @@
// clear to the compiler what instructions should be used. E.g., for sqrt(), the Windows compiler selects
// the x87 FPU, even when /arch:SSE2 is on.
// Luckily, these are kind of standardized, at least for Windows/Linux/macOS.
-#if defined(__clang__) || defined(_M_ARM) && defined(_M_ARM64)
+#if defined(__clang__) || (defined(__GNUC__) && !defined(__SSE2__)) || defined(_M_ARM) && defined(_M_ARM64)
#undef USE_INTRINSICS
#endif
--- a/src/util/mpz.cpp
+++ b/src/util/mpz.cpp
@@ -46,39 +46,24 @@
#define LEHMER_GCD
#endif
-
-#if defined(_WINDOWS) && !defined(_M_ARM) && !defined(_M_ARM64)
-// This is needed for _tzcnt_u32 and friends.
-#include <immintrin.h>
-#define _trailing_zeros32(X) _tzcnt_u32(X)
-#endif
-
#if defined(__GNUC__)
#define _trailing_zeros32(X) __builtin_ctz(X)
+#else
+inline uint32_t _trailing_zeros32(uint32_t x) {
+ uint32_t r = 0;
+ for (; 0 == (x & 1) && r < 32; ++r, x >>= 1);
+ return r;
+}
#endif
-#if (defined(__LP64__) || defined(_WIN64)) && !defined(_M_ARM) && !defined(_M_ARM64)
- #if defined(__GNUC__)
- #define _trailing_zeros64(X) __builtin_ctzll(X)
- #else
- #define _trailing_zeros64(X) _tzcnt_u64(X)
- #endif
+#if defined(__LP64__) && !defined(_M_ARM) && !defined(_M_ARM64) && defined(__GNUC__)
+#define _trailing_zeros64(X) __builtin_ctzll(X)
#else
inline uint64_t _trailing_zeros64(uint64_t x) {
uint64_t r = 0;
for (; 0 == (x & 1) && r < 64; ++r, x >>= 1);
return r;
}
-
-#if defined(_WINDOWS) && !defined(_M_ARM) && !defined(_M_ARM64)
-// _trailing_zeros32 already defined using intrinsics
-#else
-inline uint32_t _trailing_zeros32(uint32_t x) {
- uint32_t r = 0;
- for (; 0 == (x & 1) && r < 32; ++r, x >>= 1);
- return r;
-}
-#endif
#endif

16
debian/patches/01-reproducibility.patch vendored
View File

@ -1,16 +0,0 @@
Description: Remove the use of __DATE__ to make the build reproducible
Author: Fabian Wolff <fabi.wolff@arcor.de>
Last-Update: 2019-09-29
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/api/api_log.cpp
+++ b/src/api/api_log.cpp
@@ -54,7 +54,7 @@
res = false;
}
else {
- *g_z3_log << "V \"" << Z3_MAJOR_VERSION << "." << Z3_MINOR_VERSION << "." << Z3_BUILD_NUMBER << "." << Z3_REVISION_NUMBER << " " << __DATE__ << "\"\n";
+ *g_z3_log << "V \"" << Z3_MAJOR_VERSION << "." << Z3_MINOR_VERSION << "." << Z3_BUILD_NUMBER << "." << Z3_REVISION_NUMBER << "\"\n";
g_z3_log->flush();
g_z3_log_enabled = true;
}

37
debian/patches/02-soname.patch vendored
View File

@ -1,37 +0,0 @@
Description: Set the SONAME properly
Author: Fabian Wolff <fabi.wolff@arcor.de>
Last-Update: 2020-01-08
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -119,8 +119,8 @@
# libz3.so.W.X.
# This indicates that no breaking API changes will be made within a single
# minor version.
- VERSION ${Z3_VERSION}
- SOVERSION ${Z3_VERSION_MAJOR}.${Z3_VERSION_MINOR})
+ VERSION 4
+ SOVERSION 4)
if (NOT MSVC)
# On UNIX like platforms if we don't change the OUTPUT_NAME
--- a/src/api/java/CMakeLists.txt
+++ b/src/api/java/CMakeLists.txt
@@ -52,6 +52,7 @@
# This prevents CMake from automatically defining ``z3java_EXPORTS``
set_property(TARGET z3java PROPERTY DEFINE_SYMBOL "")
+set_property(TARGET z3java PROPERTY NO_SONAME ON)
# Rule to generate the ``com.microsoft.z3.enumerations`` package
# FIXME: This list of files is fragile
@@ -223,7 +224,7 @@
)
# FIXME: I don't think this the right installation location
set(Z3_JAVA_JNI_LIB_INSTALLDIR
- "${CMAKE_INSTALL_LIBDIR}"
+ "${CMAKE_INSTALL_LIBDIR}/jni"
CACHE
PATH
"Directory to install Z3 Java JNI bridge library relative to install prefix"

17
debian/patches/03-pthread.patch vendored
View File

@ -1,17 +0,0 @@
Description: Fix build failure on riscv64
Author: Aurelien Jarno <aurelien@aurel32.net>
Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=948109#75
Bug-Debian: https://bugs.debian.org/948109
Last-Update: 2020-01-10
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -314,6 +314,7 @@
################################################################################
# Threading support
################################################################################
+set(THREADS_PREFER_PTHREAD_FLAG TRUE)
find_package(Threads)
list(APPEND Z3_DEPENDENT_LIBS ${CMAKE_THREAD_LIBS_INIT})

4
debian/patches/series vendored
View File

@ -1,4 +0,0 @@
00-intrinsics.patch
01-reproducibility.patch
02-soname.patch
03-pthread.patch

2
debian/source/format vendored
View File

@ -1 +1 @@
3.0 (quilt)
3.0 (native)