Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (7b4288b25800cda007743c4b493a704faa63d18f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (7b4288b25800cda007743c4b493a704faa63d18f)
  • Date: Tue, 20 Aug 2019 06:10:34 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

crypto/libressl/HISTORY | 4 ++++
crypto/libressl/PRE_BUILD | 6 ++++++
crypto/libressl/patches/001-non_glibc.patch | 28
++++++++++++++++++++++++++++
3 files changed, 38 insertions(+)

New commits:
commit 7b4288b25800cda007743c4b493a704faa63d18f
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

crypto/libressl: fixed building stable branch on non-glibc systems

diff --git a/crypto/libressl/HISTORY b/crypto/libressl/HISTORY
index b13fe8d..93cb418 100644
--- a/crypto/libressl/HISTORY
+++ b/crypto/libressl/HISTORY
@@ -1,3 +1,7 @@
+2019-08-20 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD, patches/001-non_glibc.patch: fixed building stable branch
+ on non-glibc systems
+
2019-08-05 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: added devel 3.0.0, shifted 2.9.2 to stable, 2.8.3 to old,
2.7.5 is deprecated
diff --git a/crypto/libressl/PRE_BUILD b/crypto/libressl/PRE_BUILD
new file mode 100755
index 0000000..d3b7c52
--- /dev/null
+++ b/crypto/libressl/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+if [[ "${LIBRESSL_BRANCH}" == "stable" ]]; then
+ apply_patch_dir patches
+fi
diff --git a/crypto/libressl/patches/001-non_glibc.patch
b/crypto/libressl/patches/001-non_glibc.patch
new file mode 100644
index 0000000..4067b68
--- /dev/null
+++ b/crypto/libressl/patches/001-non_glibc.patch
@@ -0,0 +1,28 @@
+diff -rup a/crypto/compat/getprogname_linux.c
b/crypto/compat/getprogname_linux.c
+--- a/crypto/compat/getprogname_linux.c 2019-05-07 07:05:51.000000000
+0000
++++ b/crypto/compat/getprogname_linux.c 2019-05-22 07:06:20.780029886
+0000
+@@ -12,23 +12,14 @@ getprogname(void)
+ * Since Android is using portions of OpenBSD libc, it should have
+ * a symbol called __progname [1].
+ *
+- * Regarding program_invocation_short_name, it is a GNU libc ext [2]
and
+- * so make it conditional to __GLIBC__ [3].
+- *
+ * .. [0]
https://github.com/aosp-mirror/platform_bionic/blob/1eb6d3/libc/include/stdlib.h#L160
+ *
+ * .. [1] https://github.com/aosp-mirror/platform_bionic/commit/692207
+- *
+- * .. [2] https://linux.die.net/man/3/program_invocation_short_name
+- *
+- * .. [3]
https://android.googlesource.com/platform/system/core/+/2819c0/base/logging.cpp#65
+ */
+ #if defined(__ANDROID_API__) && __ANDROID_API__ < 21
+ extern const char *__progname;
+ return __progname;
+-#elif defined(__GLIBC__)
+- return program_invocation_short_name;
+ #else
+-#error "Cannot emulate getprogname"
++ return program_invocation_short_name;
+ #endif
+ }



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (7b4288b25800cda007743c4b493a704faa63d18f), Pavel Vinogradov, 08/20/2019

Archive powered by MHonArc 2.6.24.

Top of Page