diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2018-05-25 23:29:36 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2018-06-01 00:36:01 +0200 |
| commit | 39366733c3fe943363566756e2e152c45a1b3cb2 (patch) | |
| tree | 228b0735896af90ca78151c9a69aa3efd12c8cae /patches/source/intltool/no-guess-builddir.diff | |
| parent | d31c50870d0bee042ce660e445c9294a59a3a65b (diff) | |
| download | current-14.2.tar.gz current-14.2.tar.xz | |
Fri May 25 23:29:36 UTC 201814.2
patches/packages/glibc-zoneinfo-2018e-noarch-2_slack14.2.txz: Rebuilt.
Handle removal of US/Pacific-New timezone. If we see that the machine is
using this, it will be automatically switched to US/Pacific.
Diffstat (limited to 'patches/source/intltool/no-guess-builddir.diff')
| -rw-r--r-- | patches/source/intltool/no-guess-builddir.diff | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/patches/source/intltool/no-guess-builddir.diff b/patches/source/intltool/no-guess-builddir.diff new file mode 100644 index 000000000..3670ee523 --- /dev/null +++ b/patches/source/intltool/no-guess-builddir.diff @@ -0,0 +1,31 @@ +=== modified file 'intltool-update.in' +--- intltool-update.in 2014-05-14 02:15:53 +0000 ++++ intltool-update.in 2015-02-03 15:05:59 +0000 +@@ -620,6 +620,14 @@ + + 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 @@ + $srcdir =~ s#^../##; + $dummy =~ s#^$srcdir/../##; + $dummy =~ s#^$srcdir/##; +- $dummy =~ s#_build/##; ++ if ($relpath) ++ { ++ $dummy =~ s#^$relpath/##; ++ } + if (!exists($in2{$dummy})) + { + push @result, $dummy + |