Skip to content
Permalink
Browse files

poedit: fix race condition in build

  • Loading branch information
l2dy committed May 14, 2020
1 parent 3c1bf5f commit 848975a46dc674d9b043eb0e599983c365a8f4b4
Showing with 52 additions and 0 deletions.
  1. +2 −0 editors/poedit/Portfile
  2. +50 −0 editors/poedit/files/patch-fix-race-in-build.diff
@@ -5,6 +5,7 @@ PortGroup github 1.0
PortGroup xcode 1.0

github.setup vslavik poedit 2.3.1 v -oss
revision 1

This comment has been minimized.

Copy link
@ryandesign

ryandesign May 14, 2020

Contributor

Thanks, but for future reference, this didn't warrant increasing the revision. Only increase the revision if the files that the port installs will change, or if the library or runtime dependencies change.

This comment has been minimized.

Copy link
@l2dy

l2dy May 14, 2020

Author Member

Thanks, but for future reference, this didn't warrant increasing the revision. Only increase the revision if the files that the port installs will change, or if the library or runtime dependencies change.

Yes, but BuildBot would skip the build if I didn't change the revison, and I wouldn't be able to test it.

This comment has been minimized.

Copy link
@ryandesign

ryandesign May 14, 2020

Contributor

BuildBot would skip the build if I didn't change the revison

No it wouldn't. It will only skip a build if the build has already been done.

categories editors
platforms darwin
license MIT
@@ -32,6 +33,7 @@ post-fetch {
}

patchfiles patch-deps-tool-path.diff \
patch-fix-race-in-build.diff \
patch-remove-sparkle.diff

if {${configure.sdkroot} eq ""} {
@@ -0,0 +1,50 @@
diff --git deps/build.ninja deps/build.ninja
index 517d9b74b..6b4752fe8 100644
--- deps/build.ninja
+++ deps/build.ninja
@@ -123,13 +123,13 @@ rule gettext_build
'note: ⋯ $
touch `find $
. -name $
- configure`' $
+ aclocal.m4`' $
&& $
tmp=`mktemp` $
&& touch $
`find . $
-name $
- configure` $
+ aclocal.m4` $
>$$tmp 2>&1 $
|| (cat $
$$tmp ; $
@@ -139,13 +139,13 @@ rule gettext_build
'note: ⋯ $
touch `find $
. -name $
- aclocal.m4`' $
+ configure`' $
&& $
tmp=`mktemp` $
&& touch $
`find . $
-name $
- aclocal.m4` $
+ configure` $
>$$tmp 2>&1 $
|| (cat $
$$tmp ; $
diff --git deps/generate_build_ninja.py deps/generate_build_ninja.py
index 1e5632aa8..f36041a8c 100755
--- deps/generate_build_ninja.py
+++ deps/generate_build_ninja.py
@@ -145,8 +145,8 @@ with open('build.ninja', 'w') as buildfile:
],
build_commands=[
# Prevent automake regeneration:
- 'touch `find . -name configure`',
'touch `find . -name aclocal.m4`',
+ 'touch `find . -name configure`',
'touch `find . -name config.h.in`',
'touch `find . -name Makefile.in`',
'touch `find . -name *.1`',

0 comments on commit 848975a

Please sign in to comment.
You can’t perform that action at this time.