You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by "lordgamez (via GitHub)" <gi...@apache.org> on 2024/05/23 12:35:53 UTC

[PR] MINIFICPP-2386 Add Jom support for building OpenSSL in parallel [nifi-minifi-cpp]

lordgamez opened a new pull request, #1799:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1799

   https://issues.apache.org/jira/browse/MINIFICPP-2386
   
   ----------
   Thank you for submitting a contribution to Apache NiFi - MiNiFi C++.
   
   In order to streamline the review of the contribution we ask you
   to ensure the following steps have been taken:
   
   ### For all changes:
   - [ ] Is there a JIRA ticket associated with this PR? Is it referenced
        in the commit message?
   
   - [ ] Does your PR title start with MINIFICPP-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
   
   - [ ] Has your PR been rebased against the latest commit within the target branch (typically main)?
   
   - [ ] Is your initial contribution a single, squashed commit?
   
   ### For code changes:
   - [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
   - [ ] If applicable, have you updated the LICENSE file?
   - [ ] If applicable, have you updated the NOTICE file?
   
   ### For documentation related changes:
   - [ ] Have you ensured that format looks appropriate for the output in which it is rendered?
   
   ### Note:
   Please ensure that once the PR is submitted, you check GitHub Actions CI results for build issues and submit an update to your PR as soon as possible.
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] MINIFICPP-2386 Add Jom support for building OpenSSL in parallel [nifi-minifi-cpp]

Posted by "szaszm (via GitHub)" <gi...@apache.org>.
szaszm commented on code in PR #1799:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1799#discussion_r1611729611


##########
cmake/BundledOpenSSL.cmake:
##########
@@ -71,17 +71,37 @@ function(use_openssl SOURCE_DIR BINARY_DIR)
 
     # Note: when upgrading to a later release than 3.1.1 the --no-apps could be used instead of --no-tests to minimize the build size
     if (WIN32)
+        if(MINIFI_USE_JOM_FOR_OPENSSL_BUILD)
+            find_program(JOM_EXECUTABLE_PATH
+                NAMES jom.exe
+                PATHS ENV PATH
+                NO_DEFAULT_PATH)
+            if (NOT JOM_EXECUTABLE_PATH)
+                message(FATAL_ERROR "jom.exe not found. Please install jom and add it to the PATH or turn MINIFI_USE_JOM_FOR_OPENSSL_BUILD option off.")
+            endif()
+            message("Using jom for OpenSSL build: ${JOM_EXECUTABLE_PATH}")
+            include(ProcessorCount)
+            processorcount(jobs)
+            set(OPENSSL_BUILD_COMMAND ${JOM_EXECUTABLE_PATH} -j${jobs})
+            set(OPENSSL_INSTALL_COMMAND ${JOM_EXECUTABLE_PATH} install)
+            set(OPENSSL_WINDOWS_COMPILE_FLAGS /FS)
+        else()
+            message("Using nmake for OpenSSL build")
+            set(OPENSSL_BUILD_COMMAND nmake)
+            set(OPENSSL_INSTALL_COMMAND nmake install)
+            set(OPENSSL_WINDOWS_COMPILE_FLAGS "")
+        endif()

Review Comment:
   I would just use jom whenever it's installed, and fall back to nmake when it's not.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] MINIFICPP-2386 Add Jom support for building OpenSSL in parallel [nifi-minifi-cpp]

Posted by "szaszm (via GitHub)" <gi...@apache.org>.
szaszm closed pull request #1799: MINIFICPP-2386 Add Jom support for building OpenSSL in parallel
URL: https://github.com/apache/nifi-minifi-cpp/pull/1799


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] MINIFICPP-2386 Add Jom support for building OpenSSL in parallel [nifi-minifi-cpp]

Posted by "lordgamez (via GitHub)" <gi...@apache.org>.
lordgamez commented on code in PR #1799:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1799#discussion_r1616692166


##########
cmake/BundledOpenSSL.cmake:
##########
@@ -71,17 +71,37 @@ function(use_openssl SOURCE_DIR BINARY_DIR)
 
     # Note: when upgrading to a later release than 3.1.1 the --no-apps could be used instead of --no-tests to minimize the build size
     if (WIN32)
+        if(MINIFI_USE_JOM_FOR_OPENSSL_BUILD)
+            find_program(JOM_EXECUTABLE_PATH
+                NAMES jom.exe
+                PATHS ENV PATH
+                NO_DEFAULT_PATH)
+            if (NOT JOM_EXECUTABLE_PATH)
+                message(FATAL_ERROR "jom.exe not found. Please install jom and add it to the PATH or turn MINIFI_USE_JOM_FOR_OPENSSL_BUILD option off.")
+            endif()
+            message("Using jom for OpenSSL build: ${JOM_EXECUTABLE_PATH}")
+            include(ProcessorCount)
+            processorcount(jobs)
+            set(OPENSSL_BUILD_COMMAND ${JOM_EXECUTABLE_PATH} -j${jobs})
+            set(OPENSSL_INSTALL_COMMAND ${JOM_EXECUTABLE_PATH} install)
+            set(OPENSSL_WINDOWS_COMPILE_FLAGS /FS)
+        else()
+            message("Using nmake for OpenSSL build")
+            set(OPENSSL_BUILD_COMMAND nmake)
+            set(OPENSSL_INSTALL_COMMAND nmake install)
+            set(OPENSSL_WINDOWS_COMPILE_FLAGS "")
+        endif()

Review Comment:
   Updated in 36f6133cbd3c5c280d20c3738a7610d45735e11d



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org