dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

po, po-plug-ins: (workaround) fixing the distcheck job in CI. 

Now the distcheck job fails with the following error:

> ERROR: files left in build directory after distclean:
> ./po/.intltool-merge-cache.lock
> ./po-plug-ins/.intltool-merge-cache.lock
> make[1]: *** [Makefile:1155: distcleancheck] Error 1

There is definitely some change which happened on Debian packages,
either on intltool-merge itself, or something around, because these are
behavior breakage. We never set such `.intltool-merge-cache.lock` lock
files ourselves, so obviously we should not be the ones to clean these.
This is only a workaround which should be removed once upstream fixed
the issue.
This commit is contained in:
Jehan 2020-12-12 16:19:24 +01:00
parent 08c387805f
commit 9e4aa586f7
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
po-plug-ins/Makefile.in.in
View File

@ -218,3 +218,9 @@ stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
# Tell versions [3.59,3.63) of GNU make not to export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
# Around December of 2020, a possible change on intltool-merge or some
# other dependency in Debian testing broke the CI distcheck job, leaving
# some lock files. This CLEANFILES rule should be removed once this is
# fixed upstream.
CLEANFILES += .intltool-merge-cache.lock

6
po/Makefile.in.in
View File

@ -227,3 +227,9 @@ stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
# Tell versions [3.59,3.63) of GNU make not to export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
# Around December of 2020, a possible change on intltool-merge or some
# other dependency in Debian testing broke the CI distcheck job, leaving
# some lock files. This CLEANFILES rule should be removed once this is
# fixed upstream.
CLEANFILES += .intltool-merge-cache.lock