mirror of
https://git.yoctoproject.org/poky
synced 2026-05-07 16:59:22 +00:00
libpsl: update 0.21.0 -> 0.21.1.
(From OE-Core rev: f89396ccea48688c1ccc6ed29f3a119052fbcce5) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
a395840f3a
commit
742c773a93
-50
@@ -1,50 +0,0 @@
|
||||
From a0e6f0ec9dc6dd1db1c03f7f273cc16cb3af5561 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
Date: Thu, 11 Jul 2019 17:47:11 +0100
|
||||
Subject: [PATCH] Makefile.am: use PYTHON when invoking psl-make-dafsa
|
||||
|
||||
In an environment where only Python 3 is installed, configure.ac finds and sets
|
||||
PYTHON=python3 correctly but src/psl-make-dafsa is called directly, so the hashbang of
|
||||
`#!/usr/bin/env python` is used which doesn't exist.
|
||||
|
||||
Fix this by explicitly running $(PYTHON) when using the tool.
|
||||
|
||||
Upstream-Status: Backport [https://github.com/rockdaboot/libpsl/commit/b4fec5d0ddb70fc4f5360eb14f2f5c5e91194333]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
src/Makefile.am | 2 +-
|
||||
tests/Makefile.am | 4 ++--
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index f9c0a3d..a05ea05 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -19,7 +19,7 @@ libpsl_la_LDFLAGS = -no-undefined -version-info $(LIBPSL_SO_VERSION)
|
||||
# Build rule for suffix_dafsa.c
|
||||
# PSL_FILE can be set by ./configure --with-psl-file=[PATH]
|
||||
suffixes_dafsa.h: $(PSL_FILE) $(srcdir)/psl-make-dafsa
|
||||
- $(srcdir)/psl-make-dafsa --output-format=cxx+ "$(PSL_FILE)" suffixes_dafsa.h
|
||||
+ $(PYTHON) $(srcdir)/psl-make-dafsa --output-format=cxx+ "$(PSL_FILE)" suffixes_dafsa.h
|
||||
|
||||
EXTRA_DIST = psl-make-dafsa LICENSE.chromium
|
||||
|
||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index 8b29b61..28a9a0b 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -34,9 +34,9 @@ TESTS = $(PSL_TESTS)
|
||||
# check-local target works in parallel to the tests, so the test suite will likely fail
|
||||
BUILT_SOURCES = psl.dafsa psl_ascii.dafsa
|
||||
psl.dafsa: $(top_srcdir)/list/public_suffix_list.dat
|
||||
- $(top_srcdir)/src/psl-make-dafsa --output-format=binary "$(PSL_FILE)" psl.dafsa
|
||||
+ $(PYTHON) $(top_srcdir)/src/psl-make-dafsa --output-format=binary "$(PSL_FILE)" psl.dafsa
|
||||
psl_ascii.dafsa: $(top_srcdir)/list/public_suffix_list.dat
|
||||
- $(top_srcdir)/src/psl-make-dafsa --output-format=binary --encoding=ascii "$(PSL_FILE)" psl_ascii.dafsa
|
||||
+ $(PYTHON) $(top_srcdir)/src/psl-make-dafsa --output-format=binary --encoding=ascii "$(PSL_FILE)" psl_ascii.dafsa
|
||||
|
||||
clean-local:
|
||||
rm -f psl.dafsa psl_ascii.dafsa
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
From 8691105e1808ec9b031b6c25f70204a0908ae9c1 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Sat, 1 Jun 2019 13:09:41 +0200
|
||||
Subject: [PATCH] gtk-doc: do not include tree_index.sgml
|
||||
|
||||
gtk-doc 1.30 no longer generates the file if the object tree is empty
|
||||
|
||||
Upstream-Status: Backport [87d1add318b5e5d09977f7f374e923577b6ff3be]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
docs/libpsl/libpsl-docs.sgml | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/docs/libpsl/libpsl-docs.sgml b/docs/libpsl/libpsl-docs.sgml
|
||||
index 1eca9a2..1c38dbc 100644
|
||||
--- a/docs/libpsl/libpsl-docs.sgml
|
||||
+++ b/docs/libpsl/libpsl-docs.sgml
|
||||
@@ -22,10 +22,6 @@
|
||||
</para>
|
||||
<xi:include href="xml/libpsl.xml"/>
|
||||
</chapter>
|
||||
- <chapter id="object-tree">
|
||||
- <title>Object Hierarchy</title>
|
||||
- <xi:include href="xml/tree_index.sgml"/>
|
||||
- </chapter>
|
||||
<index id="api-index-full">
|
||||
<title>API Index</title>
|
||||
<xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
|
||||
+2
-5
@@ -4,12 +4,9 @@ LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=5437030d9e4fbe7267ced058ddb8a7f5 \
|
||||
file://COPYING;md5=f41d10997a12da5ee3c24ceeb0148d18"
|
||||
|
||||
SRC_URI = "https://github.com/rockdaboot/${BPN}/releases/download/${BP}/${BP}.tar.gz \
|
||||
file://0001-gtk-doc-do-not-include-tree_index.sgml.patch \
|
||||
file://0001-Makefile.am-use-PYTHON-when-invoking-psl-make-dafsa.patch \
|
||||
SRC_URI = "https://github.com/rockdaboot/${BPN}/releases/download/${PV}/${BP}.tar.gz \
|
||||
"
|
||||
SRC_URI[md5sum] = "171e96d887709e36a57f4ee627bf82d2"
|
||||
SRC_URI[sha256sum] = "41bd1c75a375b85c337b59783f5deb93dbb443fb0a52d257f403df7bd653ee12"
|
||||
SRC_URI[sha256sum] = "ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://github.com/rockdaboot/libpsl/releases"
|
||||
|
||||
Reference in New Issue
Block a user