Attachment 225733 Details for Bug 256509 – Final staged git diff.

[patch] Final staged git diff.

finance-chiapos.diff (text/plain), 8.05 KB, created by risner on 2021-06-11 12:57:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: risner

Created: 2021-06-11 12:57:15 UTC

Size: 8.05 KB

patch

obsolete

>diff --git a/finance/chiapos/Makefile b/finance/chiapos/Makefile
>new file mode 100644
>index 0000000..6be6b7c
>--- /dev/null
>+++ b/finance/chiapos/Makefile
>@@ -0,0 +1,33 @@
>+# $FreeBSD$
>+
>+PORTNAME=	chiapos
>+DISTVERSION=	1.0.3
>+CATEGORIES=	finance python
>+MASTER_SITES=	CHEESESHOP
>+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
>+
>+MAINTAINER=	risner@stdio.com
>+COMMENT=	Chia proof of space plotting, proving, and verifying (cmake part)
>+
>+LICENSE=	APACHE20
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+
>+USES=		cmake:noninja
>+USE_GITHUB=	nodefault
>+GH_TUPLE=	jarro2783:cxxopts:302302b30839505703d37fb82f536c53cf9172fa:c/src-ext/cxxopts \
>+		gulrak:filesystem:4e21ab305794f5309a1454b4ae82ab9a0f5e0d25:g/src-ext/gulrak
>+CMAKE_ARGS+=	-DCOMPILER_CXXFLAGS="${CXXFLAGS}" \
>+		-DCOMPILER_FLAGS="${CFLAGS}"
>+
>+post-extract:
>+# This example is experimental, currently broken (upstream) and unnecessary.
>+# The placeholder Makefile is for when/if they release a future fixed version.
>+	@${CP} ${FILESDIR}/Hellman-Makefile ${WRKSRC}/hellman_example/Makefile
>+# Remove extraneous unused files to prevent confusion
>+	@${RM} ${WRKSRC}/lib/FiniteStateEntropy/fetch-content-CMakeLists.txt
>+	@${RM} ${WRKSRC}/pyproject.toml
>+
>+do-test: stage
>+	${WRKDIR}/.build/RunTests
>+
>+.include <bsd.port.mk>
>diff --git a/finance/chiapos/distinfo b/finance/chiapos/distinfo
>new file mode 100644
>index 0000000..004b2ba
>--- /dev/null
>+++ b/finance/chiapos/distinfo
>@@ -0,0 +1,7 @@
>+TIMESTAMP = 1623067298
>+SHA256 (chiapos-1.0.3.tar.gz) = d987b481a3acbff1e0d77eb713af8d99ecec2bd11c2c465528a5078a433686bd
>+SIZE (chiapos-1.0.3.tar.gz) = 1291513
>+SHA256 (jarro2783-cxxopts-302302b30839505703d37fb82f536c53cf9172fa_GH0.tar.gz) = 74e21646f3278243c9466665794d45410e63453ab7f3652acdae1d62efc4b21d
>+SIZE (jarro2783-cxxopts-302302b30839505703d37fb82f536c53cf9172fa_GH0.tar.gz) = 89640
>+SHA256 (gulrak-filesystem-4e21ab305794f5309a1454b4ae82ab9a0f5e0d25_GH0.tar.gz) = fef3e809d584b77fd3ec677bd0d40cbe6737bbb3dbb1570fe1b2025262ea82c2
>+SIZE (gulrak-filesystem-4e21ab305794f5309a1454b4ae82ab9a0f5e0d25_GH0.tar.gz) = 175696
>diff --git a/finance/chiapos/files/Hellman-Makefile b/finance/chiapos/files/Hellman-Makefile
>new file mode 100644
>index 0000000..e44416f
>--- /dev/null
>+++ b/finance/chiapos/files/Hellman-Makefile
>@@ -0,0 +1,14 @@
>+all: HellmanAttacks
>+
>+OBJ = aes.o bits.o calculate_bucket.o cxxopts.o encoding.o hellman.o picosha2.o plotter_disk.o pos_constants.o prover_disk.o sort_on_disk.o util.o verifier.o
>+
>+.SUFFIXES:.hpp .o
>+
>+.hpp.o:
>+	$(CC) -c $(CXXFLAGS) $(DFLAGS) $(INCLUDES) $< -o $@
>+
>+HellmanAttacks: ${OBJ}
>+	${CC} -o HellmanAttacks ${OBJ}
>+
>+clean:
>+	rm -f HellmanAttacks ${OBJ}
>diff --git a/finance/chiapos/files/patch-CMakeLists.txt b/finance/chiapos/files/patch-CMakeLists.txt
>new file mode 100644
>index 0000000..a81293d
>--- /dev/null
>+++ b/finance/chiapos/files/patch-CMakeLists.txt
>@@ -0,0 +1,89 @@
>+--- CMakeLists.txt.orig	2021-05-28 02:40:44 UTC
>++++ CMakeLists.txt
>+@@ -14,29 +14,7 @@ endif()
>+ project(chiapos C CXX ASM)
>+ 
>+ # CMake 3.14+
>+-include(FetchContent)
>+ 
>+-FetchContent_Declare(
>+-  pybind11-src
>+-  GIT_REPOSITORY https://github.com/pybind/pybind11.git
>+-  GIT_TAG        v2.6.2
>+-)
>+-FetchContent_MakeAvailable(pybind11-src)
>+-
>+-FetchContent_Declare(
>+-  cxxopts
>+-  GIT_REPOSITORY https://github.com/jarro2783/cxxopts.git
>+-  GIT_TAG        v2.2.1
>+-)
>+-FetchContent_MakeAvailable(cxxopts)
>+-
>+-FetchContent_Declare(
>+-  gulrak
>+-  GIT_REPOSITORY https://github.com/gulrak/filesystem.git
>+-  GIT_TAG        v1.5.6
>+-)
>+-FetchContent_MakeAvailable(gulrak)
>+-
>+ set(FSE_LIB ${CMAKE_CURRENT_SOURCE_DIR}/lib/FiniteStateEntropy/lib)
>+ set(FSE_FILES
>+     ${FSE_LIB}/fse_compress.c
>+@@ -48,8 +26,8 @@ set(FSE_FILES
>+ include_directories(
>+   ${INCLUDE_DIRECTORIES}
>+   ${CMAKE_CURRENT_SOURCE_DIR}/../lib/include
>+-  ${cxxopts_SOURCE_DIR}/include
>+-  ${gulrak_SOURCE_DIR}/include/ghc
>++  ${CMAKE_CURRENT_SOURCE_DIR}/src-ext/cxxopts/include
>++  ${CMAKE_CURRENT_SOURCE_DIR}/src-ext/gulrak/include/ghc
>+   ${CMAKE_CURRENT_SOURCE_DIR}/../lib/FiniteStateEntropy/lib
>+   ${CMAKE_CURRENT_SOURCE_DIR}/src
>+   ${CMAKE_CURRENT_SOURCE_DIR}/test
>+@@ -130,8 +108,6 @@ set(BLAKE3_SRC
>+ )
>+ ENDIF()
>+ 
>+-pybind11_add_module(chiapos ${CMAKE_CURRENT_SOURCE_DIR}/python-bindings/chiapos.cpp src/chacha8.c ${BLAKE3_SRC})
>+-
>+ add_executable(ProofOfSpace
>+     src/cli.cpp
>+     src/chacha8.c
>+@@ -145,33 +121,30 @@ add_executable(RunTests
>+     ${BLAKE3_SRC}
>+ )
>+ 
>++install(TARGETS ProofOfSpace DESTINATION bin)
>++install(TARGETS RunTests DESTINATION bin)
>++
>+ find_package(Threads REQUIRED)
>+ 
>+ add_library(uint128 STATIC uint128_t/uint128_t.cpp)
>+ target_include_directories(uint128 PUBLIC uint128_t)
>+ 
>+ target_compile_features(fse PUBLIC cxx_std_17)
>+-target_compile_features(chiapos PUBLIC cxx_std_17)
>+ target_compile_features(RunTests PUBLIC cxx_std_17)
>+ 
>+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
>+-  target_link_libraries(chiapos PRIVATE fse Threads::Threads)
>+   target_link_libraries(ProofOfSpace fse Threads::Threads)
>+   target_link_libraries(RunTests fse Threads::Threads)
>+ elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
>+-  target_link_libraries(chiapos PRIVATE fse Threads::Threads)
>+   target_link_libraries(ProofOfSpace fse Threads::Threads)
>+   target_link_libraries(RunTests fse Threads::Threads)
>+ elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
>+-  target_link_libraries(chiapos PRIVATE fse Threads::Threads)
>+   target_link_libraries(ProofOfSpace fse Threads::Threads)
>+   target_link_libraries(RunTests fse Threads::Threads)
>+ elseif (MSVC)
>+-  target_link_libraries(chiapos PRIVATE fse Threads::Threads uint128)
>+   target_link_libraries(ProofOfSpace fse Threads::Threads uint128)
>+   target_link_libraries(RunTests fse Threads::Threads uint128)
>+ else()
>+-  target_link_libraries(chiapos PRIVATE fse stdc++fs Threads::Threads)
>+   target_link_libraries(ProofOfSpace fse stdc++fs Threads::Threads)
>+   target_link_libraries(RunTests fse stdc++fs Threads::Threads)
>+ endif()
>diff --git a/finance/chiapos/files/patch-setup.py b/finance/chiapos/files/patch-setup.py
>new file mode 100644
>index 0000000..317aa9d
>--- /dev/null
>+++ b/finance/chiapos/files/patch-setup.py
>@@ -0,0 +1,34 @@
>+--- setup.py.orig	2021-05-28 02:40:44 UTC
>++++ setup.py
>+@@ -9,13 +9,6 @@ from setuptools import setup, setuptools, Extension
>+ from setuptools.command.build_ext import build_ext
>+ from distutils.version import LooseVersion
>+ 
>+-
>+-class CMakeExtension(Extension):
>+-    def __init__(self, name, sourcedir=""):
>+-        Extension.__init__(self, name, sources=["./"])
>+-        self.sourcedir = os.path.abspath(sourcedir)
>+-
>+-
>+ class CMakeBuild(build_ext):
>+     def run(self):
>+         try:
>+@@ -202,6 +195,7 @@ if platform.system() == "Windows":
>+ else:
>+     setup(
>+         name="chiapos",
>++        version="1.0.3",
>+         author="Mariano Sorgente",
>+         author_email="mariano@chia.net",
>+         description="Chia proof of space plotting, proving, and verifying (wraps C++)",
>+@@ -209,8 +203,7 @@ else:
>+         python_requires=">=3.7",
>+         long_description=open("README.md").read(),
>+         long_description_content_type="text/markdown",
>+-        url="https://github.com/Chia-Network/chiavdf",
>+-        ext_modules=[CMakeExtension("chiapos", ".")],
>++        url="https://github.com/Chia-Network/chiapos",
>+         cmdclass=dict(build_ext=CMakeBuild),
>+         zip_safe=False,
>+     )
>diff --git a/finance/chiapos/pkg-descr b/finance/chiapos/pkg-descr
>new file mode 100644
>index 0000000..18bb540
>--- /dev/null
>+++ b/finance/chiapos/pkg-descr
>@@ -0,0 +1,11 @@
>+Chia's proof of space is written in C++. Includes a plotter, prover, and
>+verifier. It exclusively runs on 64 bit architectures. Read the Proof of
>+Space document to learn about what proof of space is and how it works.
>+
>+Notes:
>+Any ghc references are not Haskell related, rather a developer initials.
>+The HellmanAttacks example is experimental and incomplete upstream.
>+
>+This port is for the cmake build (binaries).
>+
>+WWW: https://github.com/Chia-Network/chiapos
>diff --git a/finance/chiapos/pkg-plist b/finance/chiapos/pkg-plist
>new file mode 100644
>index 0000000..c319778
>--- /dev/null
>+++ b/finance/chiapos/pkg-plist
>@@ -0,0 +1,2 @@
>+bin/ProofOfSpace
>+bin/RunTests

Actions: View | Diff

Attachments on bug 256509: 225668 | 225683 | 225731 | 225733 | 225736 | 225780 | 225781