diff options
Diffstat (limited to 'meta/recipes-support/libpsl/libpsl/0001-Makefile.am-use-PYTHON-when-invoking-psl-make-dafsa.patch')
-rw-r--r-- | meta/recipes-support/libpsl/libpsl/0001-Makefile.am-use-PYTHON-when-invoking-psl-make-dafsa.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-support/libpsl/libpsl/0001-Makefile.am-use-PYTHON-when-invoking-psl-make-dafsa.patch b/meta/recipes-support/libpsl/libpsl/0001-Makefile.am-use-PYTHON-when-invoking-psl-make-dafsa.patch new file mode 100644 index 0000000000..6d6ccf4d25 --- /dev/null +++ b/meta/recipes-support/libpsl/libpsl/0001-Makefile.am-use-PYTHON-when-invoking-psl-make-dafsa.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | From a0e6f0ec9dc6dd1db1c03f7f273cc16cb3af5561 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@intel.com> | ||
3 | Date: Thu, 11 Jul 2019 17:47:11 +0100 | ||
4 | Subject: [PATCH] Makefile.am: use PYTHON when invoking psl-make-dafsa | ||
5 | |||
6 | In an environment where only Python 3 is installed, configure.ac finds and sets | ||
7 | PYTHON=python3 correctly but src/psl-make-dafsa is called directly, so the hashbang of | ||
8 | `#!/usr/bin/env python` is used which doesn't exist. | ||
9 | |||
10 | Fix this by explicitly running $(PYTHON) when using the tool. | ||
11 | |||
12 | Upstream-Status: Backport [https://github.com/rockdaboot/libpsl/commit/b4fec5d0ddb70fc4f5360eb14f2f5c5e91194333] | ||
13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
14 | --- | ||
15 | src/Makefile.am | 2 +- | ||
16 | tests/Makefile.am | 4 ++-- | ||
17 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
18 | |||
19 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
20 | index f9c0a3d..a05ea05 100644 | ||
21 | --- a/src/Makefile.am | ||
22 | +++ b/src/Makefile.am | ||
23 | @@ -19,7 +19,7 @@ libpsl_la_LDFLAGS = -no-undefined -version-info $(LIBPSL_SO_VERSION) | ||
24 | # Build rule for suffix_dafsa.c | ||
25 | # PSL_FILE can be set by ./configure --with-psl-file=[PATH] | ||
26 | suffixes_dafsa.h: $(PSL_FILE) $(srcdir)/psl-make-dafsa | ||
27 | - $(srcdir)/psl-make-dafsa --output-format=cxx+ "$(PSL_FILE)" suffixes_dafsa.h | ||
28 | + $(PYTHON) $(srcdir)/psl-make-dafsa --output-format=cxx+ "$(PSL_FILE)" suffixes_dafsa.h | ||
29 | |||
30 | EXTRA_DIST = psl-make-dafsa LICENSE.chromium | ||
31 | |||
32 | diff --git a/tests/Makefile.am b/tests/Makefile.am | ||
33 | index 8b29b61..28a9a0b 100644 | ||
34 | --- a/tests/Makefile.am | ||
35 | +++ b/tests/Makefile.am | ||
36 | @@ -34,9 +34,9 @@ TESTS = $(PSL_TESTS) | ||
37 | # check-local target works in parallel to the tests, so the test suite will likely fail | ||
38 | BUILT_SOURCES = psl.dafsa psl_ascii.dafsa | ||
39 | psl.dafsa: $(top_srcdir)/list/public_suffix_list.dat | ||
40 | - $(top_srcdir)/src/psl-make-dafsa --output-format=binary "$(PSL_FILE)" psl.dafsa | ||
41 | + $(PYTHON) $(top_srcdir)/src/psl-make-dafsa --output-format=binary "$(PSL_FILE)" psl.dafsa | ||
42 | psl_ascii.dafsa: $(top_srcdir)/list/public_suffix_list.dat | ||
43 | - $(top_srcdir)/src/psl-make-dafsa --output-format=binary --encoding=ascii "$(PSL_FILE)" psl_ascii.dafsa | ||
44 | + $(PYTHON) $(top_srcdir)/src/psl-make-dafsa --output-format=binary --encoding=ascii "$(PSL_FILE)" psl_ascii.dafsa | ||
45 | |||
46 | clean-local: | ||
47 | rm -f psl.dafsa psl_ascii.dafsa | ||
48 | -- | ||
49 | 2.17.1 | ||
50 | |||