<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/99b36ee914cecca00b4222044371ed7e2101d0db">https://github.com/macports/macports-ports/commit/99b36ee914cecca00b4222044371ed7e2101d0db</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 99b36ee914c retdec-devel: update to 20221107
</span>99b36ee914c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 99b36ee914cecca00b4222044371ed7e2101d0db
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sun Nov 13 15:18:56 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> retdec-devel: update to 20221107
</span>---
devel/retdec/Portfile | 19 +++++++---
devel/retdec/files/patch-hardcoded-make-devel.diff | 43 ++++++++++++++++++----
2 files changed, 50 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/retdec/Portfile b/devel/retdec/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fe9b5438c22..415e76a7faf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/retdec/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/retdec/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,14 +59,14 @@ if {${name} eq ${subport}} {
</span> subport retdec-devel {
conflicts $name
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup avast retdec aecb4d0857380659af67a0bb9eb133fffa92b87d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20220920
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup avast retdec f76d20031d8106eb69fc56cff9505f7a0f819470
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20221107
</span> revision 0
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 4976a1281b10ed8ef38404fb78c4b14be0432516 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2038e8505773226f0b5eca824c51fcc7afa17242e6e78994eb86f4ba6843c7cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 27189686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 4bd42fd53b80c71e2607fd3888bf180329b5abff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ab2f35f31e795e04f573fe4e2d8bb7f5865564d57106a2db93dca6f02ef07029 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 27192555
</span>
# NOTE: patch-hardcoded-make-devel.diff was merged and reverted
# See: https://github.com/avast/retdec/commit/a1d7a5793d590bec9fce3ee33cd4f0eacb47eda6
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,6 +79,15 @@ subport retdec-devel {
</span> configure.cxxflags-append -nostdinc++ -isystem${prefix}/include/libcxx/v1
configure.ldflags-append -L${prefix}/lib/libcxx
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # retdec depends on yaramod which had hardcoded `python`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # unfortently patching yaramod isn't easy because it's downloaded and upacked by cmake.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The only way is provides python2.7 with correct ENV variables, until the fix is merged.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See: https://github.com/avast/yaramod/pull/225
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PATH=${prefix}/Library/Frameworks/Python.framework/Versions/2.7/bin:$env(PATH)
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/retdec/files/patch-hardcoded-make-devel.diff b/devel/retdec/files/patch-hardcoded-make-devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index cf02cc48578..7259f0cad4d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/retdec/files/patch-hardcoded-make-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/retdec/files/patch-hardcoded-make-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +1,50 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-commit 8d6885f48a2b29050131d6f30728636943b448d1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+commit f6ada093836f7d0031a3fa275398944d16b8de7d
</span> Author: Kirill A. Korinsky <kirill@korins.ky>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri Nov 26 10:04:47 2021 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun Nov 13 15:12:52 2022 +0100
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Migrate hardcoded `make` to `${CMAKE_MAKE_PROGRAM}`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Allow to configure `yara`'s make tool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This is another approach to remove hardocoded call of `make` to build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ `yara`. This approach uses the same `make` by default but introduces
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ `YARA_MAKE_PROGRAM` option which can be used to specify a path to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ `gmake` for example.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Thus, when CMake produces a set of makefile, it reuses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ `CMAKE_MAKE_PROGRAM` to respect a global `-jXXX` option.
</span>
diff --git a/deps/yara/CMakeLists.txt b/deps/yara/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 02749436..6ddba209 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index abcc1e46..d49f34ba 100644
</span> --- a/deps/yara/CMakeLists.txt
+++ b/deps/yara/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,8 +40,8 @@ if(MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,6 +10,12 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(YARA_INCLUDE_DIR ${YARA_DIR}/libyara/include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(YARA_LIBRARY_NAME "libyara")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++option(YARA_MAKE_PROGRAM "A path to make tool which should be used to compile yara" "make")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Use the same make tool when using Unix makefiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(YARA_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(PLATFORM "x64")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,8 +46,8 @@ if(MSVC)
</span> set(YARAC_PATH ${YARA_WIN_DIR}/${MSVC_CONFIG}/${YARAC_NAME})
else()
set(YARA_LIBRARY_DIR ${YARA_DIR}/libyara/.libs)
- set(YARA_CLEAN_COMMAND make clean)
- set(YARA_BUILD_COMMAND make -j${CPUS})
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(YARA_CLEAN_COMMAND ${CMAKE_MAKE_PROGRAM} clean)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(YARA_BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} -j${CPUS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(YARA_CLEAN_COMMAND ${YARA_MAKE_PROGRAM} clean)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(YARA_BUILD_COMMAND ${YARA_MAKE_PROGRAM} -j${CPUS})
</span> set(YARAC_PATH ${YARA_DIR}/yarac)
endif()
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,6 +72,7 @@ set(YARA_CONFIGURE_ARGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-macho
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-shared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-crypto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MAKE=${YARA_MAKE_PROGRAM}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${CMAKE_C_COMPILER}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=${CMAKE_C_FLAGS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=${CMAKE_SHARED_LINKER_FLAGS}
</span></pre><pre style='margin:0'>
</pre>