summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libpsl
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-08-30 14:49:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-01 22:33:07 +0100
commit779e1ba4088eaddc1c47d910665cd23fa8467095 (patch)
tree61b9777b9374f28fd4e044df704465442778242a /meta/recipes-support/libpsl
parent2100fbe529e3031e4b0f7997acbfe781f25104dd (diff)
downloadpoky-779e1ba4088eaddc1c47d910665cd23fa8467095.tar.gz
libpsl: use python 3 during builds
(From OE-Core rev: 3818536b556afab04f2f7d9b9e1028d498cb3926) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libpsl')
-rw-r--r--meta/recipes-support/libpsl/libpsl/0001-Makefile.am-use-PYTHON-when-invoking-psl-make-dafsa.patch50
-rw-r--r--meta/recipes-support/libpsl/libpsl_0.21.0.bb1
2 files changed, 51 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 @@
1From a0e6f0ec9dc6dd1db1c03f7f273cc16cb3af5561 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Thu, 11 Jul 2019 17:47:11 +0100
4Subject: [PATCH] Makefile.am: use PYTHON when invoking psl-make-dafsa
5
6In an environment where only Python 3 is installed, configure.ac finds and sets
7PYTHON=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
10Fix this by explicitly running $(PYTHON) when using the tool.
11
12Upstream-Status: Backport [https://github.com/rockdaboot/libpsl/commit/b4fec5d0ddb70fc4f5360eb14f2f5c5e91194333]
13Signed-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
19diff --git a/src/Makefile.am b/src/Makefile.am
20index 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
32diff --git a/tests/Makefile.am b/tests/Makefile.am
33index 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--
492.17.1
50
diff --git a/meta/recipes-support/libpsl/libpsl_0.21.0.bb b/meta/recipes-support/libpsl/libpsl_0.21.0.bb
index fc2417fc2f..9831b4b94f 100644
--- a/meta/recipes-support/libpsl/libpsl_0.21.0.bb
+++ b/meta/recipes-support/libpsl/libpsl_0.21.0.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5437030d9e4fbe7267ced058ddb8a7f5 \
6 6
7SRC_URI = "https://github.com/rockdaboot/${BPN}/releases/download/${BP}/${BP}.tar.gz \ 7SRC_URI = "https://github.com/rockdaboot/${BPN}/releases/download/${BP}/${BP}.tar.gz \
8 file://0001-gtk-doc-do-not-include-tree_index.sgml.patch \ 8 file://0001-gtk-doc-do-not-include-tree_index.sgml.patch \
9 file://0001-Makefile.am-use-PYTHON-when-invoking-psl-make-dafsa.patch \
9 " 10 "
10SRC_URI[md5sum] = "171e96d887709e36a57f4ee627bf82d2" 11SRC_URI[md5sum] = "171e96d887709e36a57f4ee627bf82d2"
11SRC_URI[sha256sum] = "41bd1c75a375b85c337b59783f5deb93dbb443fb0a52d257f403df7bd653ee12" 12SRC_URI[sha256sum] = "41bd1c75a375b85c337b59783f5deb93dbb443fb0a52d257f403df7bd653ee12"