diff options
| author | Britney Fransen <brfransen@gmail.com> | 2019-03-19 20:11:10 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2019-03-19 20:11:10 (GMT) |
| commit | 73cfb83a5baecfe0529fda59ca57233d8843f783 (patch) | |
| tree | 2dba2103a6f6e43912fc645ca8b48a85ab500ad2 /abs/core/intltool/intltool_distcheck-fix.patch | |
| parent | 7b41a9288f5d1332c8136df798bb8ca2465bc21c (diff) | |
| parent | 448cb8d0708224d78c24ce3615dc7eef44d4689b (diff) | |
| download | linhes_pkgbuild-73cfb83a5baecfe0529fda59ca57233d8843f783.zip linhes_pkgbuild-73cfb83a5baecfe0529fda59ca57233d8843f783.tar.gz linhes_pkgbuild-73cfb83a5baecfe0529fda59ca57233d8843f783.tar.bz2 | |
Merge branch 'testing'
Diffstat (limited to 'abs/core/intltool/intltool_distcheck-fix.patch')
| -rw-r--r-- | abs/core/intltool/intltool_distcheck-fix.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/abs/core/intltool/intltool_distcheck-fix.patch b/abs/core/intltool/intltool_distcheck-fix.patch new file mode 100644 index 0000000..6e7f198 --- /dev/null +++ b/abs/core/intltool/intltool_distcheck-fix.patch @@ -0,0 +1,30 @@ +diff -upr intltool-0.51.0-orig/intltool-update.in intltool-0.51.0/intltool-update.in +--- intltool-0.51.0-orig/intltool-update.in 2016-07-29 14:08:06.276987000 +0200 ++++ intltool-0.51.0/intltool-update.in 2016-07-29 14:11:09.562126918 +0200 +@@ -620,6 +620,14 @@ sub FindLeftoutFiles + + my @result; + ++ # If the builddir is a subdir of srcdir, the list of files found will be prefixed with ++ # an additional prefix (e.g. "_build/sub" for automake 1.15 make distcheck). Try to ++ # handle that, by removing those matches as well. ++ my $absbuilddir = Cwd::abs_path("..\/"); ++ my $abssrcdir = Cwd::abs_path("$SRCDIR/.."); ++ # Check if builddir is a subdir of srcdir ++ my ($abspath,$relpath) = split /\s*$abssrcdir\/\s*/, $absbuilddir, 2; ++ + foreach (@buf_allfiles_sorted) + { + my $dummy = $_; +@@ -628,7 +636,10 @@ sub FindLeftoutFiles + $srcdir =~ s#^../##; + $dummy =~ s#^$srcdir/../##; + $dummy =~ s#^$srcdir/##; +- $dummy =~ s#_build/##; ++ if ($relpath) ++ { ++ $dummy =~ s#^$relpath/##; ++ } + if (!exists($in2{$dummy})) + { + push @result, $dummy |