diff --git a/ports/flint/CONTROL b/ports/flint/CONTROL index ce4646883a0..90797aa2906 100644 --- a/ports/flint/CONTROL +++ b/ports/flint/CONTROL @@ -1,4 +1,4 @@ Source: flint -Version: 2.5.2-1 +Version: 2.5.2-2 Description: Fast Library for Number Theory Build-Depends: mpir, mpfr, pthreads, gettimeofday diff --git a/ports/flint/dll_flint.patch b/ports/flint/dll_flint.patch index 29e1fa77a31..15a6660b2a1 100644 --- a/ports/flint/dll_flint.patch +++ b/ports/flint/dll_flint.patch @@ -1,76 +1,76 @@ -diff --git a/build.vc14/dll_flint/dll_flint.vcxproj b/build.vc14/dll_flint/dll_flint.vcxproj -index 3c8edd3c..947b4e38 100644 ---- a/build.vc14/dll_flint/dll_flint.vcxproj -+++ b/build.vc14/dll_flint/dll_flint.vcxproj -@@ -81,7 +81,7 @@ - - Full - true -- ..\;..\..\;..\..\..\mpir\dll\$(IntDir);..\..\..\mpfr\dll\$(IntDir);..\..\..\pthreads\dll\$(IntDir); -+ ..\;..\..\;@NATIVE_INSTALLED_DIR@\include - NDEBUG;WIN32;HAVE_CONFIG_H;MSC_BUILD_DLL;PTW32_BUILD;FLINT_REENTRANT=0;HAVE_TLS=1;%(PreprocessorDefinitions) - MultiThreadedDLL - $(TargetDir)$(TargetName).pdb -@@ -90,7 +90,7 @@ - - true - true -- ..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies) -+ @NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadsVC2.lib;%(AdditionalDependencies) - - - postbuild $(IntDir) DLL -@@ -105,7 +105,7 @@ - - Disabled - true -- ..\;..\..\;..\..\..\mpir\dll\$(IntDir);..\..\..\mpfr\dll\$(IntDir);..\..\..\pthreads\dll\$(IntDir); -+ ..\;..\..\;@NATIVE_INSTALLED_DIR@\include - _DEBUG;WIN32;HAVE_CONFIG_H;MSC_BUILD_DLL;PTW32_BUILD;FLINT_REENTRANT=0;HAVE_TLS=1;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - $(TargetDir)$(TargetName).pdb -@@ -114,7 +114,7 @@ - - true - true -- ..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies) -+ @NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadsVC2.lib;%(AdditionalDependencies) - - - postbuild $(IntDir) DLL -@@ -129,7 +129,7 @@ - - Full - true -- ..\;..\..\;..\..\..\mpir\dll\$(IntDir);..\..\..\mpfr\dll\$(IntDir);..\..\..\pthreads\dll\$(IntDir); -+ ..\;..\..\;@NATIVE_INSTALLED_DIR@\include - NDEBUG;WIN32;HAVE_CONFIG_H;MSC_BUILD_DLL;PTW32_BUILD;FLINT_REENTRANT=0;HAVE_TLS=1;_WIN64;%(PreprocessorDefinitions) - MultiThreadedDLL - $(TargetDir)$(TargetName).pdb -@@ -138,7 +138,7 @@ - - true - true -- ..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies) -+ @NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadsVC2.lib;%(AdditionalDependencies) - - - postbuild $(IntDir) DLL -@@ -153,7 +153,7 @@ - - Disabled - true -- ..\;..\..\;..\..\..\mpir\dll\$(IntDir);..\..\..\mpfr\dll\$(IntDir);..\..\..\pthreads\dll\$(IntDir); -+ ..\;..\..\;@NATIVE_INSTALLED_DIR@\include - _DEBUG;WIN32;HAVE_CONFIG_H;MSC_BUILD_DLL;PTW32_BUILD;FLINT_REENTRANT=0;HAVE_TLS=1;_WIN64;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - $(TargetDir)$(TargetName).pdb -@@ -162,7 +162,7 @@ - - true - true -- ..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies) -+ @NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadsVC2.lib;%(AdditionalDependencies) - - - postbuild $(IntDir) DLL +diff --git a/build.vc14/dll_flint/dll_flint.vcxproj b/build.vc14/dll_flint/dll_flint.vcxproj +index 3c8edd3..5c861d2 100644 +--- a/build.vc14/dll_flint/dll_flint.vcxproj ++++ b/build.vc14/dll_flint/dll_flint.vcxproj +@@ -81,7 +81,7 @@ + + Full + true +- ..\;..\..\;..\..\..\mpir\dll\$(IntDir);..\..\..\mpfr\dll\$(IntDir);..\..\..\pthreads\dll\$(IntDir); ++ ..\;..\..\;@NATIVE_INSTALLED_DIR@\include + NDEBUG;WIN32;HAVE_CONFIG_H;MSC_BUILD_DLL;PTW32_BUILD;FLINT_REENTRANT=0;HAVE_TLS=1;%(PreprocessorDefinitions) + MultiThreadedDLL + $(TargetDir)$(TargetName).pdb +@@ -90,7 +90,7 @@ + + true + true +- ..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies) ++ @NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC2.lib;%(AdditionalDependencies) + + + postbuild $(IntDir) DLL +@@ -105,7 +105,7 @@ + + Disabled + true +- ..\;..\..\;..\..\..\mpir\dll\$(IntDir);..\..\..\mpfr\dll\$(IntDir);..\..\..\pthreads\dll\$(IntDir); ++ ..\;..\..\;@NATIVE_INSTALLED_DIR@\include + _DEBUG;WIN32;HAVE_CONFIG_H;MSC_BUILD_DLL;PTW32_BUILD;FLINT_REENTRANT=0;HAVE_TLS=1;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + $(TargetDir)$(TargetName).pdb +@@ -114,7 +114,7 @@ + + true + true +- ..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies) ++ @NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC2.lib;%(AdditionalDependencies) + + + postbuild $(IntDir) DLL +@@ -129,7 +129,7 @@ + + Full + true +- ..\;..\..\;..\..\..\mpir\dll\$(IntDir);..\..\..\mpfr\dll\$(IntDir);..\..\..\pthreads\dll\$(IntDir); ++ ..\;..\..\;@NATIVE_INSTALLED_DIR@\include + NDEBUG;WIN32;HAVE_CONFIG_H;MSC_BUILD_DLL;PTW32_BUILD;FLINT_REENTRANT=0;HAVE_TLS=1;_WIN64;%(PreprocessorDefinitions) + MultiThreadedDLL + $(TargetDir)$(TargetName).pdb +@@ -138,7 +138,7 @@ + + true + true +- ..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies) ++ @NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC2.lib;%(AdditionalDependencies) + + + postbuild $(IntDir) DLL +@@ -153,7 +153,7 @@ + + Disabled + true +- ..\;..\..\;..\..\..\mpir\dll\$(IntDir);..\..\..\mpfr\dll\$(IntDir);..\..\..\pthreads\dll\$(IntDir); ++ ..\;..\..\;@NATIVE_INSTALLED_DIR@\include + _DEBUG;WIN32;HAVE_CONFIG_H;MSC_BUILD_DLL;PTW32_BUILD;FLINT_REENTRANT=0;HAVE_TLS=1;_WIN64;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + $(TargetDir)$(TargetName).pdb +@@ -162,7 +162,7 @@ + + true + true +- ..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies) ++ @NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC2.lib;%(AdditionalDependencies) + + + postbuild $(IntDir) DLL diff --git a/ports/mosquitto/CONTROL b/ports/mosquitto/CONTROL index 97b464e41c3..8d4d2de0cd7 100644 --- a/ports/mosquitto/CONTROL +++ b/ports/mosquitto/CONTROL @@ -1,5 +1,5 @@ Source: mosquitto -Version: 1.5.0 +Version: 1.5.0-1 Build-Depends: c-ares, libwebsockets, openssl, pthreads Description: Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1. MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. This makes it diff --git a/ports/mosquitto/fix-dependence-pthreads.patch b/ports/mosquitto/fix-dependence-pthreads.patch new file mode 100644 index 00000000000..d21786646f6 --- /dev/null +++ b/ports/mosquitto/fix-dependence-pthreads.patch @@ -0,0 +1,13 @@ +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 6355eaa..490df32 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -6,7 +6,7 @@ option(WITH_THREADING "Include client library threading support?" ON) + if (${WITH_THREADING} STREQUAL ON) + add_definitions("-DWITH_THREADING") + if (WIN32) +- find_library(PTHREAD_LIBRARIES NAMES pthreadsVC2) ++ find_library(PTHREAD_LIBRARIES NAMES pthreadVC2) + find_path(PTHREAD_INCLUDE_DIR pthread.h) + else (WIN32) + find_library(LIBPTHREAD pthread) diff --git a/ports/mosquitto/portfile.cmake b/ports/mosquitto/portfile.cmake index 99fe483694b..25ba0e5983f 100644 --- a/ports/mosquitto/portfile.cmake +++ b/ports/mosquitto/portfile.cmake @@ -22,6 +22,7 @@ vcpkg_apply_patches( PATCHES "${CMAKE_CURRENT_LIST_DIR}/win64-cmake.patch" "${CMAKE_CURRENT_LIST_DIR}/output_folders-cmake.patch" + "${CMAKE_CURRENT_LIST_DIR}/fix-dependence-pthreads.patch" ) vcpkg_configure_cmake( diff --git a/ports/pthreads/CMakeLists.txt b/ports/pthreads/CMakeLists.txt index 70317b460ed..b40c1403733 100644 --- a/ports/pthreads/CMakeLists.txt +++ b/ports/pthreads/CMakeLists.txt @@ -195,7 +195,7 @@ set(PTHREADS_COMPATIBILITY_VERSION 2) set(CMAKE_DEBUG_POSTFIX d) set(PTHREADS_COMPILER V) -set(PTHREADS_LIBRARY "pthreads${PTHREADS_COMPILER}${PTHREADS_EXCEPTION_SCHEME}${PTHREADS_COMPATIBILITY_VERSION}") +set(PTHREADS_LIBRARY "pthread${PTHREADS_COMPILER}${PTHREADS_EXCEPTION_SCHEME}${PTHREADS_COMPATIBILITY_VERSION}") include_directories(.) diff --git a/ports/pthreads/CONTROL b/ports/pthreads/CONTROL index 53b710f2ace..9abc926f9d9 100644 --- a/ports/pthreads/CONTROL +++ b/ports/pthreads/CONTROL @@ -1,3 +1,3 @@ Source: pthreads -Version: 2.9.1-3 +Version: 2.9.1-4 Description: pthreads for windows diff --git a/ports/pthreads/portfile.cmake b/ports/pthreads/portfile.cmake index 3fb715aec67..18627aba17b 100644 --- a/ports/pthreads/portfile.cmake +++ b/ports/pthreads/portfile.cmake @@ -41,12 +41,12 @@ endforeach() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthreads RENAME copyright) file(INSTALL - ${CURRENT_PACKAGES_DIR}/lib/pthreadsVC2.lib + ${CURRENT_PACKAGES_DIR}/lib/pthreadVC2.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link - RENAME pthreads.lib + RENAME pthread.lib ) file(INSTALL - ${CURRENT_PACKAGES_DIR}/debug/lib/pthreadsVC2d.lib + ${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVC2d.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link - RENAME pthreads.lib + RENAME pthread.lib ) diff --git a/ports/usbmuxd/CONTROL b/ports/usbmuxd/CONTROL index 6d7978bad4f..38e2b4b5b05 100644 --- a/ports/usbmuxd/CONTROL +++ b/ports/usbmuxd/CONTROL @@ -1,4 +1,4 @@ Source: usbmuxd -Version: 1.1.1.133-1 +Version: 1.1.1.133-2 Description: A socket daemon to multiplex connections from and to iOS devices Build-Depends: libimobiledevice, libusb, libusb-win32, pthreads \ No newline at end of file diff --git a/ports/usbmuxd/fix-dependence-pthreads.patch b/ports/usbmuxd/fix-dependence-pthreads.patch new file mode 100644 index 00000000000..9a6187148b3 --- /dev/null +++ b/ports/usbmuxd/fix-dependence-pthreads.patch @@ -0,0 +1,40 @@ +diff --git a/usbmuxd.vcxproj b/usbmuxd.vcxproj +index d1d8a4d..086e8a4 100644 +--- a/usbmuxd.vcxproj ++++ b/usbmuxd.vcxproj +@@ -135,7 +135,7 @@ + + Console + true +- ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2d.lib;%(AdditionalDependencies) ++ ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC2d.lib;%(AdditionalDependencies) + + + +@@ -149,7 +149,7 @@ + + Console + true +- ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2d.lib;%(AdditionalDependencies) ++ ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC2d.lib;%(AdditionalDependencies) + + + +@@ -168,7 +168,7 @@ + true + true + true +- ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2.lib;%(AdditionalDependencies) ++ ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC2.lib;%(AdditionalDependencies) + + + +@@ -186,7 +186,7 @@ + true + true + true +- ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2.lib;%(AdditionalDependencies) ++ ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC2.lib;%(AdditionalDependencies) + + + diff --git a/ports/usbmuxd/portfile.cmake b/ports/usbmuxd/portfile.cmake index 34768cf88c0..2ea2d568fae 100644 --- a/ports/usbmuxd/portfile.cmake +++ b/ports/usbmuxd/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF 1.1.1.133 SHA512 1a5f9abc239deeb15e2aab419ba9e88ef41ffa80396546fb65bc06b0f419cbabc80cdf95995caf71d5628d1537fb0329a73d923202e91ea43fcc7c32b840d047 HEAD_REF master-msvc + PATCHES + fix-dependence-pthreads.patch ) vcpkg_install_msbuild(