diff --git a/ports/pthreads/portfile.cmake b/ports/pthreads/portfile.cmake index 8f2a804fbac9ed..682ffa0993dc2c 100644 --- a/ports/pthreads/portfile.cmake +++ b/ports/pthreads/portfile.cmake @@ -17,8 +17,6 @@ else() list(APPEND PATCH_FILES use-mt.patch) endif() -list(APPEND PATCH_FILES fix-pthread_getname_np.patch fix-install.patch) - vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO pthreads4w @@ -27,6 +25,9 @@ vcpkg_from_sourceforge( PATCHES fix-arm-macro.patch fix-arm64-version_rc.patch # https://sourceforge.net/p/pthreads4w/code/merge-requests/6/ + fix-pthread_getname_np.patch + fix-install.patch + whitespace_in_path.patch ${PATCH_FILES} ) diff --git a/ports/pthreads/vcpkg.json b/ports/pthreads/vcpkg.json index 127ddf938fc9bb..40c9c979314433 100644 --- a/ports/pthreads/vcpkg.json +++ b/ports/pthreads/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pthreads", "version": "3.0.0", - "port-version": 13, + "port-version": 14, "description": "Meta-package that provides PThreads4W on Windows, or assumes presence of system pthreads on POSIX systems.", "homepage": "https://sourceforge.net/projects/pthreads4w/", "license": "Apache-2.0", diff --git a/ports/pthreads/whitespace_in_path.patch b/ports/pthreads/whitespace_in_path.patch new file mode 100644 index 00000000000000..77a24c1cb1877e --- /dev/null +++ b/ports/pthreads/whitespace_in_path.patch @@ -0,0 +1,27 @@ +--- a/Makefile Sat Apr 29 09:21:07 2023 ++++ b/Makefile Sat Apr 29 09:19:07 2023 +@@ -223,15 +223,15 @@ + + # Very basic install. It assumes "realclean" was done just prior to build target. + install: +- if not exist $(DLLDEST) mkdir $(DLLDEST) +- if not exist $(LIBDEST) mkdir $(LIBDEST) +- if not exist $(HDRDEST) mkdir $(HDRDEST) +- if exist pthreadV*.dll copy pthreadV*.dll $(DLLDEST) +- if exist pthreadV*.lib copy pthreadV*.lib $(LIBDEST) +- copy _ptw32.h $(HDRDEST) +- copy pthread.h $(HDRDEST) +- copy sched.h $(HDRDEST) +- copy semaphore.h $(HDRDEST) ++ if not exist "$(DLLDEST)" mkdir "$(DLLDEST)" ++ if not exist "$(LIBDEST)" mkdir "$(LIBDEST)" ++ if not exist "$(HDRDEST)" mkdir "$(HDRDEST)" ++ if exist pthreadV*.dll copy pthreadV*.dll "$(DLLDEST)" ++ if exist pthreadV*.lib copy pthreadV*.lib "$(LIBDEST)" ++ copy _ptw32.h "$(HDRDEST)" ++ copy pthread.h "$(HDRDEST)" ++ copy sched.h "$(HDRDEST)" ++ copy semaphore.h "$(HDRDEST)" + + $(DLLS): $(DLL_OBJS) + $(CC) /LDd /Zi $(DLL_OBJS) /link /implib:$*.lib $(XLIBS) /out:$@ diff --git a/versions/baseline.json b/versions/baseline.json index 4d72f157be6eb0..61118a43e99985 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6362,7 +6362,7 @@ }, "pthreads": { "baseline": "3.0.0", - "port-version": 13 + "port-version": 14 }, "ptyqt": { "baseline": "0.6.5", diff --git a/versions/p-/pthreads.json b/versions/p-/pthreads.json index ba81c8c3fb05e7..044b0af613114b 100644 --- a/versions/p-/pthreads.json +++ b/versions/p-/pthreads.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2e0a6df2800d3677b941dc6504f083965b7886d9", + "version": "3.0.0", + "port-version": 14 + }, { "git-tree": "f4037e12c8075b814cab20c65509b49bd7f59257", "version": "3.0.0",