[debhelper-devel] [debhelper] 01/01: qmake.pm: Ensure that the cross config filename is absolute

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit da662cacffedc778e4ed73d810b2a9fa1277ad77
Author: Niels Thykier <niels at thykier.net>
Date:   Tue Nov 14 22:29:11 2017 +0000

    qmake.pm: Ensure that the cross config filename is absolute
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 lib/Debian/Debhelper/Buildsystem/qmake.pm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/Debian/Debhelper/Buildsystem/qmake.pm b/lib/Debian/Debhelper/Buildsystem/qmake.pm
index aaa7b11..06180c3 100644
--- a/lib/Debian/Debhelper/Buildsystem/qmake.pm
+++ b/lib/Debian/Debhelper/Buildsystem/qmake.pm
@@ -74,6 +74,12 @@ sub configure {
 		$fh->print("HostData=lib/" . dpkg_architecture_value("DEB_HOST_MULTIARCH") . "/qt5\n");
 		$fh->print("Headers=include/" . dpkg_architecture_value("DEB_HOST_MULTIARCH") . "/qt5\n");
 		close($fh) or error("close($filename) failed: $!");
+		if ($filename !~ m{^/}) {
+			# Make the file name absolute (just in case qmake cares).
+			require Cwd;
+			$filename =~ s{^\./}{};
+			$filename = Cwd::cwd() . "/${filename}";
+		}
 		push @options, ("-qtconf", $filename);
 	}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git