Package: meson
Version: 0.45.0-1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
Control: affects -1 + src:libplacebo

Running debcrossgen when pkg-config is not installed results in:

| Traceback (most recent call last):
|   File "/usr/share/meson/debcrossgen", line 81, in <module>
|     run(options)
|   File "/usr/share/meson/debcrossgen", line 71, in run
|     ofile.write("pkgconfig = '%s'\n" % locate_path("%s-pkg-config" % 
host_arch))
|   File "/usr/share/meson/debcrossgen", line 43, in locate_path
|     raise ValueError("%s not found on $PATH" % program)
| ValueError: arm-linux-gnueabi-pkg-config not found on $PATH

This happens to break the cross build of libplacebo. Please consider
applying the attached patch.

Alternatively, have meson Depends: pkg-config.

Helmut
diff --minimal -Nru meson-0.45.0/debian/changelog meson-0.45.0/debian/changelog
--- meson-0.45.0/debian/changelog       2018-03-04 19:27:57.000000000 +0100
+++ meson-0.45.0/debian/changelog       2018-03-19 14:13:32.000000000 +0100
@@ -1,3 +1,10 @@
+meson (0.45.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Make debcrossgen work without pkg-config. Closes: #-1.
+
+ -- Helmut Grohne <hel...@subdivi.de>  Mon, 19 Mar 2018 14:13:32 +0100
+
 meson (0.45.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --minimal -Nru meson-0.45.0/debian/debcrossgen 
meson-0.45.0/debian/debcrossgen
--- meson-0.45.0/debian/debcrossgen     2017-09-17 12:07:51.000000000 +0200
+++ meson-0.45.0/debian/debcrossgen     2018-03-19 14:13:30.000000000 +0100
@@ -68,7 +68,10 @@
         ofile.write("cpp = '%s'\n" % locate_path(cpp))
         ofile.write("ar = '%s'\n" % locate_path("%s-ar" % host_arch))
         ofile.write("strip = '%s'\n" % locate_path("%s-strip" % host_arch))
-        ofile.write("pkgconfig = '%s'\n" % locate_path("%s-pkg-config" % 
host_arch))
+        try:
+            ofile.write("pkgconfig = '%s'\n" % locate_path("%s-pkg-config" % 
host_arch))
+        except ValueError:
+            pass # pkg-config is optional
         ofile.write('\n[properties]\n')
         ofile.write('\n[host_machine]\n')
         ofile.write("system = '%s'\n" % host_os)

Reply via email to