Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (17dc99de51b126657104c4e1cb0c6363616ab193)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (17dc99de51b126657104c4e1cb0c6363616ab193)
  • Date: Sat, 9 Jan 2021 02:00:25 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

crypto/secp256k1/BUILD | 2
crypto/secp256k1/HISTORY | 1
database/leveldb/DETAILS | 1
database/leveldb/HISTORY | 2
database/leveldb/PRE_BUILD | 3 +
database/leveldb/patches/0001-install-memenv.patch | 44
+++++++++++++++++++++
6 files changed, 52 insertions(+), 1 deletion(-)

New commits:
commit 17dc99de51b126657104c4e1cb0c6363616ab193
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

secp256k1: enable module_recovery

commit 597a2243c3ce9278fddc9d76acd7c5a36bff9cb3
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

leveldb: Install memenv static library and header

diff --git a/crypto/secp256k1/BUILD b/crypto/secp256k1/BUILD
index 448e746..b699658 100755
--- a/crypto/secp256k1/BUILD
+++ b/crypto/secp256k1/BUILD
@@ -1,2 +1,2 @@
-OPTS+=' --disable-static' &&
+OPTS+=' --disable-static --enable-module_recovery' &&
default_build
diff --git a/crypto/secp256k1/HISTORY b/crypto/secp256k1/HISTORY
index b58f5f2..cbef560 100644
--- a/crypto/secp256k1/HISTORY
+++ b/crypto/secp256k1/HISTORY
@@ -1,2 +1,3 @@
2021-01-08 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, PRE_BUILD: spell created
+ * BUILD: enabled module_recovery
diff --git a/database/leveldb/DETAILS b/database/leveldb/DETAILS
index 918682d..3b0d84f 100755
--- a/database/leveldb/DETAILS
+++ b/database/leveldb/DETAILS
@@ -11,6 +11,7 @@
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${LEVELDB_BRANCH}
SOURCE_IGNORE=volatile
else
VERSION=1.22
+ PATCHLEVEL=1
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=https://github.com/google/$SPELL/archive/$VERSION.tar.gz

SOURCE_HASH=sha512:f9bbf5f466e7f707b94e19261762319ea9f65d41911690e84f59098551e2e69beccf756a414d705ade74ee96fd979bdb8b94c171c6f2cc83873cbd4a9380dbab
diff --git a/database/leveldb/HISTORY b/database/leveldb/HISTORY
index a4fb63a..e6d71bb 100644
--- a/database/leveldb/HISTORY
+++ b/database/leveldb/HISTORY
@@ -1,6 +1,8 @@
2021-01-08 Ismael Luceno <ismael AT sourcemage.org>
* CONFIGURE, DEPENDS, DETAILS: updated spell to 1.22; now uses cmake
* BUILD, INSTALL: removed, no longer needed
+ * PRE_BUILD, patches/0001-install-memenv.patch: Patched to install
memenv
+ * DETAILS: PATCHLEVEL++

2014-09-15 Jeremy Blosser <jblosser AT sourcemage.org>
* PREPARE, BUILD, DEPENDS, DETAILS, INSTALL: spell created
diff --git a/database/leveldb/PRE_BUILD b/database/leveldb/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/database/leveldb/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git a/database/leveldb/patches/0001-install-memenv.patch
b/database/leveldb/patches/0001-install-memenv.patch
new file mode 100644
index 0000000..f640982
--- /dev/null
+++ b/database/leveldb/patches/0001-install-memenv.patch
@@ -0,0 +1,44 @@
+Build and install the memenv static library and header.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -208,6 +208,16 @@ target_sources(leveldb
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+ )
+
++add_library(memenv STATIC
++ "${PROJECT_SOURCE_DIR}/helpers/memenv/memenv.cc"
++ "${PROJECT_SOURCE_DIR}/helpers/memenv/memenv.h"
++)
++target_include_directories(memenv
++ PUBLIC
++ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
++ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
++)
++
+ set_target_properties(leveldb
+ PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}d)
+
+@@ -231,6 +249,12 @@ if (NOT HAVE_CXX17_HAS_INCLUDE)
+ )
+ endif(NOT HAVE_CXX17_HAS_INCLUDE)
+
++target_compile_definitions(memenv
++ PRIVATE
++ LEVELDB_COMPILE_LIBRARY
++ ${LEVELDB_PLATFORM_NAME}=1
++)
++
+ if(BUILD_SHARED_LIBS)
+ target_compile_definitions(leveldb
+ PUBLIC
+@@ -448,4 +476,9 @@ if(LEVELDB_INSTALL)
+ "${PROJECT_BINARY_DIR}/leveldbConfigVersion.cmake"
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/leveldb"
+ )
++ install(
++ FILES "${PROJECT_SOURCE_DIR}/helpers/memenv/memenv.h"
++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/leveldb/helpers
++ )
++ install(TARGETS memenv ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif(LEVELDB_INSTALL)



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (17dc99de51b126657104c4e1cb0c6363616ab193), Ismael Luceno, 01/08/2021

Archive powered by MHonArc 2.6.24.

Top of Page