meta-openembedded: subtree update:7206f7f5bc..98175fd0cc

Adam Miartus (4):
      libcereal: update to newer version
      libcereal: pick up additional licenses of cereal components
      libcereal: add dev package that can be included into toolchain sdk
      cereal: Remove

Alejandro Hernandez Samaniego (2):
      freerdp: Upgrade 2.2.0 -> 2.3.0
      remmina: Upgrade 1.4.10 -> 1.4.11

Anatol Belski (2):
      abseil-cpp: Relax build requirements
      grpc: Upgrade 1.24.3 -> 1.35.0

Andrei Gherzan (1):
      nss: Fix warnings generated by getcwd

Bartosz Golaszewski (1):
      pydbus-manager: new package

Carlos Rafael Giani (2):
      pipewire: Move to meta-multimedia
      pipewire: Rework 0.3 recipe and upgrade to 0.3.22

Christian B. Sørensen (1):
      libgpiod: packageqa problem => static python lib to ${PN}-staticdev

Clément Péron (2):
      grpc: Add PackageConfig to build only required plugins
      grpc: remove gflags dependency

Diego Santa Cruz (1):
      php: split out phpdbg into a separate package

Enrico Jörns (1):
      python3-aiohttp: add missing RDEPENDS on python3-typing-extensions

Gianfranco (1):
      mosquitto: Upgrade 2.0.7 -> 2.0.8

Hongxu Jia (1):
      lvm2/libdevmapper: 2.03.06 -> 2.03.11

Kai Kang (2):
      xfsprogs: 5.9.0 -> 5.10.0
      libinih: install header files without prefix dir inih

Khem Raj (39):
      yelp-xsl: Mark native libxml2 in rdeps
      liburing: Do not build examples on risc/musl
      aom: Disable neon on arm when not present in TUNE_FEATURES
      python3-grpcio: Upgrade to 1.35.0
      python3-grpcio-tools: Upgrade to 1.35.0
      recipes: Update common-licenses references to match new names
      openldap: Refresh patches to remove fuzz
      abseil-cpp: Remove libexecinfo band-aid for musl
      nss: Add powerpc64 little endian support
      luajit: Upgrade to latest on v2.1 release
      influxdb: Generate checksums for term module
      libauthen-sasl-perl,libhtml-tree-perl: allow PERL_USE_UNSAFE_INC
      dvb-apps: Allow insecure inc paths
      glog: Upgrade to 0.4.0
      mpd: Upgrade to 0.22 series
      mbedtls: Fix gcc11 stringop-overflow warning
      v4l-utils: Package systemd fragment for systemd-udevd.service.d
      mpich: Upgrade to 3.4.1
      srt: Backport fix for missing <limits> header
      gerbera: Update to 1.7.0
      nautilus: Drop use of volatile
      vlc: Fix build with gcc 11
      squid: Include <limits> for using std::numeric_limits
      minifi-cpp: include limits header for numeric_limits definition
      opencv: Upgrade to 4.5.1
      mozjs: Drop using JS_VOLATILE_ARM
      opengl-es-cts: Disable -Wuninitialized for external/amber
      grpc: Upgrade to 1.36.1
      mongodb: Include <optional> c++ header
      libyui,libyui-ncurses: Upgrade to 4.0.0
      libyui-ncurses: Disable Werror
      libyui: Adopt to new cmake option to disable Werror
      libyui-ncurses: Pass -DNCURSES_WIDECHAR in CXXFLAGS
      gimp: Add missing dependencies
      gimp: Disable svg icons on arm
      libcamera: Update to latest
      abseil-cpp: Ask for C++14 std explicitly
      opencv: Add packageconfig for building tests
      opencv: Remove duplicate patch

Leon Anavi (30):
      python3-h5py: Upgrade 2.10.0 -> 3.1.0
      python3-transitions: Upgrade 0.8.6 -> 0.8.7
      python3-tabulate: Upgrade 0.8.7 -> 0.8.9
      python3-pyperclip: Upgrade 1.8.1 -> 1.8.2
      python3-elementpath: Upgrade 2.1.3 -> 2.1.4
      python3-mpmath: Upgrade 1.1.0 -> 1.2.1
      python3-prompt-toolkit: Upgrade 3.0.14 -> 3.0.16
      python3-pkgconfig: Upgrade 1.5.1 -> 1.5.2
      python3-mypy: Upgrade 0.800 -> 0.812
      python3-typeguard: Upgrade 2.11.0 -> 2.11.1
      python3-httplib2: Upgrade 0.18.1 -> 0.19.0
      python3-autobahn: Upgrade 20.12.3 -> 21.2.1
      python3-iso8601: Upgrade 0.1.13 -> 0.1.14
      python3-alembic: Upgrade 1.5.4 -> 1.5.5
      python3-txaio: Upgrade 20.12.1 -> 21.2.1
      python3-watchdog: Upgrade 2.0.0 -> 2.0.2
      python3-rsa: Upgrade 4.7 -> 4.7.1
      python3-pandas: Upgrade 1.2.1 -> 1.2.2
      python3-cffi: Upgrade 1.14.4 -> 1.14.5
      python3-pymisp: Upgrade 2.4.137.3 -> 2.4.138
      python3-pytest-runner: Upgrade 5.2 -> 5.3.0
      python3-markdown: Upgrade 3.3.3 -> 3.3.4
      python3-pulsectl: Upgrade 20.5.1 -> 21.2.0
      python3-cvxopt: Upgrade 1.2.5 -> 1.2.6
      python3-rsa: Upgrade 4.7.1 -> 4.7.2
      python3-pyzmq: Upgrade 22.0.2 -> 22.0.3
      python3-tqdm: Upgrade 4.57.0 -> 4.58.0
      python3-autobahn: Upgrade 21.2.1 -> 21.2.2
      python3-aiohttp: Upgrade 3.7.3 -> 3.7.4
      python3-semantic-version: Add recipe

Matteo Croce (1):
      recipes-kernel: add libbpf

Michael Vetter (1):
      jasper: upgrade 2.0.24 -> 2.0.25

Mingli Yu (3):
      crash: add support for lockless ringbuffer
      gtkmm3: use relative path
      mcelog: Upgrade to 175

Oleksandr Kravchuk (21):
      rfkill: update to 1.0
      python3-idna: update to 3.1
      python3-pika: update to 1.2.0
      python3-protobuf: update to 3.14.0
      python3-pychromecast: update to 8.1.0
      python3-pykickstart: update to 3.32
      python3-watchdog: update to 2.0.0
      wolfssl: updae to 4.7.0
      ncmpc: update to 0.45
      rocksdb: update to 6.15.5
      stm32flash: update to 0.6
      python3-astroid: update to 2.5
      python3-configargparse: update to 1.3
      python3-cryptography-vectors: update to 3.4.6
      python3-periphery: update to 2.3.0
      python3-sentry-sdk: update to 0.20.3
      python3-soupsieve: update to 2.2
      python3-supervisor: update to 4.2.1
      python3-tqdm: update 4.57.0
      python3-typeguard: update to 2.11.0
      python3-xmlschema: update to 1.5.1

Oleksiy Obitotskyy (2):
      wireshark-src: improve reproducibility
      smartmontools: Improve reproducibility

Patrick Williams (2):
      boost-url: update to latest
      catch2: upgrade to 2.13.4

Peter Kjellerstedt (1):
      librcereal: A couple of improvements

Randy MacLeod (2):
      libssh2: remove the recipe since it moved to oe-core
      libgit2: remove the recipe since it moved to oe-core

Ross Burton (1):
      python3-intelhex: add recipe for the intelhex package

Sean Nyekjaer (3):
      nodejs: 12.20.1 -> 12.20.2
      zstd: split bin into separate package
      can-utils: split into more packages

Ulrich ?lmann (1):
      v4l-utils: update to 1.20.0

Wang Mingyu (7):
      stunnel: upgrade 5.57 -> 5.58
      iwd: upgrade 1.11 -> 1.12
      protobuf: upgrade 3.14.0 -> 3.15.2
      redis-plus-plus: upgrade 1.2.1 -> 1.2.2
      tesseract-lang: upgrade 4.0.0 -> 4.1.0
      gphoto2: upgrade 2.5.26 -> 2.5.27
      libgphoto2: upgrade 2.5.26 -> 2.5.27

Yanfei Xu (1):
      lmbench: Install cache command and fix typos in manual page

Yi Fan Yu (4):
      rsyslog: upgrade 8.2006.0->8.2012.0
      tcpdump: update 4.9.3 -> 4.99.0
      rsyslog: Add imhttp to packageconfig
      rsyslog: Update 8.2012.0 -> 8.2102.0

Yi Zhao (1):
      vsftpd: allow newfstatat and pselect6 syscalls in the seccomp sandbox

akuster (1):
      softhsm: update to 2.6.1 and align

zangrc (11):
      fuse3: upgrade 3.10.1 -> 3.10.2
      enca: upgrade 1.9 -> 1.19
      gensio: upgrade 2.2.3 -> 2.2.4
      lcms: upgrade 2.11 -> 2.12
      libburn: upgrade 1.5.2 -> 1.5.4
      opensaf: upgrade 5.20.11 -> 5.21.03
      openvpn: upgrade 2.5.0 -> 2.5.1
      strongswan: upgrade 5.9.1 -> 5.9.2
      wireguard-tools: upgrade 1.0.20200827 -> 1.0.20210223
      hwdata: upgrade 0.343 -> 0.345
      mailcap: upgrade 2.1.49 -> 2.1.52

zhengruoqin (7):
      libjcat: upgrade 0.1.4 -> 0.1.6
      postgresql: upgrade 13.1 -> 13.2
      ser2net: upgrade 4.3.0 -> 4.3.3
      Fix do_package error when enable multilib.
      nano: upgrade 5.5 -> 5.6
      qpdf: upgrade 10.0.4 -> 10.2.0
      sigrok-cli: upgrade 0.7.1 -> 0.7.2

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Ibbbafaa846b1dcc3c03ac585e7d5075826e4ee37
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch
deleted file mode 100644
index 920fc11..0000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 04e28fdda03b545a0f7b446a784ec2fa7249cbb8 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 29 Apr 2020 15:37:40 -0700
-Subject: [PATCH] Fix build on riscv32
-
-Define __NR_mmap in terms of __NR_mmap2 and __NR_futex interms of
-__NR_futex_time64 for rv32, since there calls dont exist for rv32
-
-Also recognise rv32 as a new 32bit platform
-
-Upstream-Status: Submitted [https://github.com/abseil/abseil-cpp/pull/675]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- absl/base/internal/direct_mmap.h        | 5 +++++
- absl/base/internal/spinlock_linux.inc   | 4 ++++
- absl/synchronization/internal/waiter.cc | 4 ++++
- 3 files changed, 13 insertions(+)
-
---- a/third_party/abseil-cpp/absl/base/internal/direct_mmap.h
-+++ b/third_party/abseil-cpp/absl/base/internal/direct_mmap.h
-@@ -26,6 +26,10 @@
- 
- #ifdef __linux__
- 
-+#if !defined(__NR_mmap) && defined(__riscv) && __riscv_xlen == 32
-+# define __NR_mmap __NR_mmap2
-+#endif
-+
- #include <sys/types.h>
- #ifdef __BIONIC__
- #include <sys/syscall.h>
-@@ -72,6 +76,7 @@ inline void* DirectMmap(void* start, siz
- #if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \
-     (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
-     (defined(__PPC__) && !defined(__PPC64__)) ||                             \
-+    (defined(__riscv) && __riscv_xlen == 32)  ||                             \
-     (defined(__s390__) && !defined(__s390x__))
-   // On these architectures, implement mmap with mmap2.
-   static int pagesize = 0;
---- a/third_party/abseil-cpp/absl/base/internal/spinlock_linux.inc
-+++ b/third_party/abseil-cpp/absl/base/internal/spinlock_linux.inc
-@@ -14,6 +14,10 @@
- //
- // This file is a Linux-specific part of spinlock_wait.cc
- 
-+#if !defined(__NR_futex) && defined(__riscv) && __riscv_xlen == 32
-+# define __NR_futex __NR_futex_time64
-+#endif
-+
- #include <linux/futex.h>
- #include <sys/syscall.h>
- #include <unistd.h>
---- a/third_party/abseil-cpp/absl/synchronization/internal/waiter.cc
-+++ b/third_party/abseil-cpp/absl/synchronization/internal/waiter.cc
-@@ -24,6 +24,10 @@
- #include <unistd.h>
- #endif
- 
-+#if !defined(__NR_futex) && defined(__riscv) && __riscv_xlen == 32
-+# define __NR_futex __NR_futex_time64
-+#endif
-+
- #ifdef __linux__
- #include <linux/futex.h>
- #include <sys/syscall.h>
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch
index bff50a0..3736694 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch
@@ -1,26 +1,18 @@
-From 2ef8a85933f3ac36b289979ff9edd49dd12d0d16 Mon Sep 17 00:00:00 2001
+From de10fbc2386dcac3ab810c49b6977b2ee01bf426 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 4 Aug 2017 09:04:07 -0700
+Date: Wed, 17 Feb 2021 13:30:23 -0800
 Subject: [PATCH] setup.py: Do not mix C and C++ compiler options
 
 EXTRA_ENV_COMPILE_ARGS is used both with CC and CXX
 so using -std=c++11 or -std=gnu99 together will cause
 build time errors espcially with clang
 
-error: invalid argument '-std=gnu99' not allowed with 'C++'
-
-gcc7 ( defaults are -std=gnu11 and -std=gnu++14 )
- as well clang default to these standards mode or newer
-anyway
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-1. Keep '-std=c++11' and '-std=gnu99' to fix native build error
+Keep '-std=c++11' to fix native build error
 with old gcc (such as gcc 5.4.0 on ubuntu 16.04), for clang
 we will remove them through GRPC_PYTHON_CFLAGS at do_compile
 in bb recipe.
 
-2. While export CC="gcc ", cc_args is None, it will
+While export CC="gcc ", cc_args is None, it will
 cause subprocess.Popen always return 1. On centos 8, if you don't
 install package libatomic, there will be a native build error
 `cannot find /usr/lib64/libatomic.so.1.2.0'.
@@ -28,47 +20,57 @@
 Add no harm '-g' to cc_args if cc_args is empty.
 
 Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 ---
- setup.py                      | 6 +++++-
+ setup.py                      | 9 ++++++---
  src/python/grpcio/commands.py | 5 ++++-
- 2 files changed, 9 insertions(+), 2 deletions(-)
+ 2 files changed, 10 insertions(+), 4 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index e950057..1b68221 100644
+index 4b8c9d4..271b7b1 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -144,9 +144,13 @@ ENABLE_DOCUMENTATION_BUILD = os.environ.get(
- 
- def check_linker_need_libatomic():
-   """Test if linker on system needs libatomic."""
-+  compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc'
-+  if not cc_args:
-+      cc_args = "-g"
+@@ -172,8 +172,11 @@ def check_linker_need_libatomic():
+     """Test if linker on system needs libatomic."""
+     code_test = (b'#include <atomic>\n' +
+                  b'int main() { return std::atomic<int64_t>{}; }')
+-    cxx = os.environ.get('CXX', 'c++')
+-    cpp_test = subprocess.Popen([cxx, '-x', 'c++', '-std=c++11', '-'],
++    cxx, cxx_args = os.environ.get('CXX').split(' ', 1) or 'c++'
++    if not cxx_args:
++      cxx_args = "-g"
 +
-   code_test = (b'#include <atomic>\n' +
-                b'int main() { return std::atomic<int64_t>{}; }')
--  cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'],
-+  cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c++', '-std=c++11', '-'],
-                              stdin=PIPE,
-                              stdout=PIPE,
-                              stderr=PIPE)
++    cpp_test = subprocess.Popen([cxx, cxx_args, '-x', 'c++', '-std=c++11', '-'],
+                                 stdin=PIPE,
+                                 stdout=PIPE,
+                                 stderr=PIPE)
+@@ -183,7 +186,7 @@ def check_linker_need_libatomic():
+     # Double-check to see if -latomic actually can solve the problem.
+     # https://github.com/grpc/grpc/issues/22491
+     cpp_test = subprocess.Popen(
+-        [cxx, '-x', 'c++', '-std=c++11', '-latomic', '-'],
++        [cxx, cxx_args, '-x', 'c++', '-std=c++11', '-latomic', '-'],
+         stdin=PIPE,
+         stdout=PIPE,
+         stderr=PIPE)
 diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py
-index 064dda9..a75d8b9 100644
+index a8b2ff5..b928201 100644
 --- a/src/python/grpcio/commands.py
 +++ b/src/python/grpcio/commands.py
-@@ -216,7 +216,10 @@ class BuildExt(build_ext.build_ext):
-             when invoked in C mode. GCC is okay with this, while clang is not.
+@@ -219,7 +219,10 @@ class BuildExt(build_ext.build_ext):
              """
-             # TODO(lidiz) Remove the generated a.out for success tests.
--            cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++11', '-'],
-+            compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc'
-+            if not cc_args:
-+                cc_args = "-g"
-+            cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c', '-std=c++11', '-'],
-                                        stdin=subprocess.PIPE,
-                                        stdout=subprocess.PIPE,
-                                        stderr=subprocess.PIPE)
+             try:
+                 # TODO(lidiz) Remove the generated a.out for success tests.
+-                cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++11', '-'],
++                cc_test, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc'
++                if not cc_args:
++                    cc_args = "-g"
++                cc_test = subprocess.Popen([cc_test, cc_args, '-x', 'c', '-std=c++11', '-'],
+                                            stdin=subprocess.PIPE,
+                                            stdout=subprocess.PIPE,
+                                            stderr=subprocess.PIPE)
 -- 
-2.7.4
+2.30.1
 
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch
new file mode 100644
index 0000000..65db4a6
--- /dev/null
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch
@@ -0,0 +1,36 @@
+Do not poke at the build machine to determine target platform or architecture
+pass it from environment instead for cross compiling to work
+
+Upstream-Status: Inappropriate [OE-Specific]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/setup.py
++++ b/setup.py
+@@ -109,6 +109,8 @@ CLASSIFIERS = [
+ BUILD_WITH_BORING_SSL_ASM = os.environ.get('GRPC_BUILD_WITH_BORING_SSL_ASM',
+                                            True)
+ 
++BORING_SSL_PLATFORM = os.environ.get('GRPC_BORING_SSL_PLATFORM',
++                                           True)
+ # Environment variable to determine whether or not the Cython extension should
+ # *use* Cython or use the generated C files. Note that this requires the C files
+ # to have been generated by building first *with* Cython support. Even if this
+@@ -306,15 +308,15 @@ asm_key = ''
+ if BUILD_WITH_BORING_SSL_ASM and not BUILD_WITH_SYSTEM_OPENSSL:
+     LINUX_X86_64 = 'linux-x86_64'
+     LINUX_ARM = 'linux-arm'
+-    if LINUX_X86_64 == util.get_platform():
++    if LINUX_X86_64 == BORING_SSL_PLATFORM:
+         asm_key = 'crypto_linux_x86_64'
+-    elif LINUX_ARM == util.get_platform():
++    elif LINUX_ARM == BORING_SSL_PLATFORM:
+         asm_key = 'crypto_linux_arm'
+-    elif "mac" in util.get_platform() and "x86_64" in util.get_platform():
++    elif "mac" in BORING_SSL_PLATFORM and "x86_64" in BORING_SSL_PLATFORM:
+         asm_key = 'crypto_mac_x86_64'
+     else:
+         print("ASM Builds for BoringSSL currently not supported on:",
+-              util.get_platform())
++              BORING_SSL_PLATFORM)
+ if asm_key:
+     asm_files = grpc_core_dependencies.ASM_SOURCE_FILES[asm_key]
+ else:
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch
index 8ac2aef..dadd3da 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch
@@ -3,8 +3,8 @@
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
---- a/third_party/boringssl/include/openssl/base.h
-+++ b/third_party/boringssl/include/openssl/base.h
+--- a/third_party/boringssl-with-bazel/src/include/openssl/base.h
++++ b/third_party/boringssl-with-bazel/src/include/openssl/base.h
 @@ -99,6 +99,9 @@ extern "C" {
  #elif (defined(__PPC64__) || defined(__powerpc64__)) && defined(_LITTLE_ENDIAN)
  #define OPENSSL_64_BIT
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch
index 8c9ffa2..7e071ae 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch
@@ -2,8 +2,8 @@
 
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/third_party/boringssl/include/openssl/base.h
-+++ b/third_party/boringssl/include/openssl/base.h
+--- a/third_party/boringssl-with-bazel/src/include/openssl/base.h
++++ b/third_party/boringssl-with-bazel/src/include/openssl/base.h
 @@ -108,6 +108,14 @@ extern "C" {
  #elif defined(__mips__) && defined(__LP64__)
  #define OPENSSL_64_BIT