Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pthreads] Fixed whitespaces in path issue #31179

Merged
merged 3 commits into from
May 4, 2023
Merged

[pthreads] Fixed whitespaces in path issue #31179

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
527ce22
quotes
bold84 Apr 29, 2023
92a22a5
Updated version
bold84 Apr 29, 2023
be02378
move static patch filenames to vcpkg_from_sourceforge()
bold84 May 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/pthreads/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ else()
list(APPEND PATCH_FILES use-mt.patch)
endif()

list(APPEND PATCH_FILES fix-pthread_getname_np.patch fix-install.patch)
list(APPEND PATCH_FILES fix-pthread_getname_np.patch fix-install.patch whitespace_in_path.patch)
bold84 marked this conversation as resolved.
Show resolved Hide resolved

vcpkg_from_sourceforge(
OUT_SOURCE_PATH SOURCE_PATH
Expand Down
2 changes: 1 addition & 1 deletion ports/pthreads/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
27 changes: 27 additions & 0 deletions ports/pthreads/whitespace_in_path.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:$@
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6362,7 +6362,7 @@
},
"pthreads": {
"baseline": "3.0.0",
"port-version": 13
"port-version": 14
},
"ptyqt": {
"baseline": "0.6.5",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/pthreads.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "76af05f14370011a9d1b0815d0d0c715cfd8ac21",
"version": "3.0.0",
"port-version": 14
},
{
"git-tree": "f4037e12c8075b814cab20c65509b49bd7f59257",
"version": "3.0.0",
Expand Down