* [ptxdist] [PATCH v2 1/7] cpputest: new package: C++ unit test framework
@ 2023-05-24 22:34 Roland Hieber
2023-05-24 22:34 ` [ptxdist] [PATCH v2 2/7] libbson: new package: routines related to BSON documents Roland Hieber
` (6 more replies)
0 siblings, 7 replies; 14+ messages in thread
From: Roland Hieber @ 2023-05-24 22:34 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
PATCH v2:
- add configure options for host package too
PATCH v1: https://lore.ptxdist.org/ptxdist/20230515072054.1997217-1-rhi@pengutronix.de
---
patches/cpputest-3.8/autogen.sh | 1 +
rules/cpputest.in | 7 +++++
rules/cpputest.make | 56 +++++++++++++++++++++++++++++++++
rules/host-cpputest.in | 5 +++
rules/host-cpputest.make | 34 ++++++++++++++++++++
5 files changed, 103 insertions(+)
create mode 120000 patches/cpputest-3.8/autogen.sh
create mode 100644 rules/cpputest.in
create mode 100644 rules/cpputest.make
create mode 100644 rules/host-cpputest.in
create mode 100644 rules/host-cpputest.make
diff --git a/patches/cpputest-3.8/autogen.sh b/patches/cpputest-3.8/autogen.sh
new file mode 120000
index 000000000000..9f8a4cb7ddcb
--- /dev/null
+++ b/patches/cpputest-3.8/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/rules/cpputest.in b/rules/cpputest.in
new file mode 100644
index 000000000000..b2e7292d63e7
--- /dev/null
+++ b/rules/cpputest.in
@@ -0,0 +1,7 @@
+## SECTION=test_suites
+
+config CPPUTEST
+ tristate
+ prompt "cpputest"
+ help
+ CppUTest unit test framework
diff --git a/rules/cpputest.make b/rules/cpputest.make
new file mode 100644
index 000000000000..b900170c3633
--- /dev/null
+++ b/rules/cpputest.make
@@ -0,0 +1,56 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2023 by Roland Hieber <rhi@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_CPPUTEST) += cpputest
+
+#
+# Paths and names
+#
+CPPUTEST_VERSION := 3.8
+CPPUTEST_MD5 := fc34eab33c08e8dcd83698988e9a33c5
+CPPUTEST := cpputest-$(CPPUTEST_VERSION)
+CPPUTEST_SUFFIX := tar.gz
+CPPUTEST_URL := https://github.com/cpputest/cpputest/releases/download/v$(CPPUTEST_VERSION)/$(CPPUTEST).$(CPPUTEST_SUFFIX)
+CPPUTEST_SOURCE := $(SRCDIR)/$(CPPUTEST).$(CPPUTEST_SUFFIX)
+CPPUTEST_DIR := $(BUILDDIR)/$(CPPUTEST)
+CPPUTEST_LICENSE := BSD-3-Clause
+CPPUTEST_LICENSE_FILES := file://COPYING;md5=ce5d5f1fe02bcd1343ced64a06fd4177
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# autoconf
+#
+CPPUTEST_CONF_TOOL := autoconf
+CPPUTEST_CONF_OPT := \
+ $(CROSS_AUTOCONF_USR) \
+ --enable-std-c \
+ --enable-std-cpp \
+ --enable-std-cpp11 \
+ --enable-cpputest-flags \
+ --enable-memory-leak-detection \
+ --enable-extensions \
+ --enable-longlong \
+ --enable-generate-map-file \
+ --enable-coverage
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/cpputest.targetinstall:
+ @$(call targetinfo)
+ @# cpputest is a static library only
+ @$(call touch)
+
+# vim: syntax=make
diff --git a/rules/host-cpputest.in b/rules/host-cpputest.in
new file mode 100644
index 000000000000..7ef582262d20
--- /dev/null
+++ b/rules/host-cpputest.in
@@ -0,0 +1,5 @@
+## SECTION=hosttools_noprompt
+
+config HOST_CPPUTEST
+ tristate
+ default y if ALLYES
diff --git a/rules/host-cpputest.make b/rules/host-cpputest.make
new file mode 100644
index 000000000000..a75dd5449706
--- /dev/null
+++ b/rules/host-cpputest.make
@@ -0,0 +1,34 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2023 by Roland Hieber <rhi@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_CPPUTEST) += host-cpputest
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# autoconf
+#
+HOST_CPPUTEST_CONF_TOOL := autoconf
+CPPUTEST_CONF_OPT := \
+ $(HOST_AUTOCONF_USR) \
+ --enable-std-c \
+ --enable-std-cpp \
+ --enable-std-cpp11 \
+ --enable-cpputest-flags \
+ --enable-memory-leak-detection \
+ --enable-extensions \
+ --enable-longlong \
+ --enable-generate-map-file \
+ --enable-coverage
+
+# vim: syntax=make
--
2.39.2
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH v2 2/7] libbson: new package: routines related to BSON documents
2023-05-24 22:34 [ptxdist] [PATCH v2 1/7] cpputest: new package: C++ unit test framework Roland Hieber
@ 2023-05-24 22:34 ` Roland Hieber
2023-06-02 7:17 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-05-24 22:34 ` [ptxdist] [PATCH v2 3/7] libconfig: correct license and pin down license files Roland Hieber
` (5 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Roland Hieber @ 2023-05-24 22:34 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
PATCH v2:
- add configure options for host package too
- merge fixup patch removing commented LIBBSON_SUBDIR line
PATCH v1: https://lore.ptxdist.org/ptxdist/20230515072054.1997217-2-rhi@pengutronix.de
---
rules/host-libbson.in | 6 +++
rules/host-libbson.make | 54 +++++++++++++++++++++++++
rules/libbson.in | 9 +++++
rules/libbson.make | 89 +++++++++++++++++++++++++++++++++++++++++
4 files changed, 158 insertions(+)
create mode 100644 rules/host-libbson.in
create mode 100644 rules/host-libbson.make
create mode 100644 rules/libbson.in
create mode 100644 rules/libbson.make
diff --git a/rules/host-libbson.in b/rules/host-libbson.in
new file mode 100644
index 000000000000..23eef8540091
--- /dev/null
+++ b/rules/host-libbson.in
@@ -0,0 +1,6 @@
+## SECTION=hosttools_noprompt
+
+config HOST_LIBBSON
+ tristate
+ default y if ALLYES
+ select HOST_CMAKE
diff --git a/rules/host-libbson.make b/rules/host-libbson.make
new file mode 100644
index 000000000000..046495d8dd48
--- /dev/null
+++ b/rules/host-libbson.make
@@ -0,0 +1,54 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2023 by Roland Hieber <rhi@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_LIBBSON) += host-libbson
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# cmake
+#
+HOST_LIBBSON_CONF_TOOL := cmake
+HOST_LIBBSON_CONF_OPT := \
+ $(HOST_CMAKE_OPT) \
+ -DBSON_OUTPUT_BASENAME=bson \
+ -DENABLE_APPLE_FRAMEWORK=OFF \
+ -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=ON \
+ -DENABLE_BSON=ON \
+ -DENABLE_CLIENT_SIDE_ENCRYPTION=OFF \
+ -DENABLE_COVERAGE=OFF \
+ -DENABLE_CRYPTO_SYSTEM_PROFILE=OFF \
+ -DENABLE_DEBUG_ASSERTIONS=OFF \
+ -DENABLE_EXAMPLES=OFF \
+ -DENABLE_EXTRA_ALIGNMENT=ON \
+ -DENABLE_HTML_DOCS=OFF \
+ -DENABLE_ICU=OFF \
+ -DENABLE_MAINTAINER_FLAGS=OFF \
+ -DENABLE_MAN_PAGES=OFF \
+ -DENABLE_MONGOC=OFF \
+ -DENABLE_MONGODB_AWS_AUTH=AUTO \
+ -DENABLE_PIC=ON \
+ -DENABLE_RDTSCP=OFF \
+ -DENABLE_SASL=OFF \
+ -DENABLE_SHM_COUNTERS=ON \
+ -DENABLE_SNAPPY=OFF \
+ -DENABLE_SRV=OFF \
+ -DENABLE_SSL=OFF \
+ -DENABLE_STATIC=OFF \
+ -DENABLE_TESTS=OFF \
+ -DENABLE_TRACING=OFF \
+ -DENABLE_UNINSTALL=ON \
+ -DENABLE_ZLIB=OFF \
+ -DENABLE_ZSTD=OFF
+
+# vim: syntax=make
diff --git a/rules/libbson.in b/rules/libbson.in
new file mode 100644
index 000000000000..58649ec64863
--- /dev/null
+++ b/rules/libbson.in
@@ -0,0 +1,9 @@
+## SECTION=system_libraries
+
+config LIBBSON
+ tristate
+ select HOST_CMAKE
+ select GLIBC_RT
+ prompt "libbson"
+ help
+ Routines related to building, parsing, and iterating BSON documents
diff --git a/rules/libbson.make b/rules/libbson.make
new file mode 100644
index 000000000000..bd1d65596727
--- /dev/null
+++ b/rules/libbson.make
@@ -0,0 +1,89 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2023 by Roland Hieber <rhi@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBBSON) += libbson
+
+#
+# Paths and names
+#
+LIBBSON_VERSION := 1.23.4
+LIBBSON_MD5 := 28f2f253777e8d80839c41239de44188
+LIBBSON := libbson-$(LIBBSON_VERSION)
+LIBBSON_SUFFIX := tar.gz
+LIBBSON_URL := https://github.com/mongodb/mongo-c-driver/releases/download/$(LIBBSON_VERSION)/mongo-c-driver-$(LIBBSON_VERSION).$(LIBBSON_SUFFIX)
+LIBBSON_SOURCE := $(SRCDIR)/$(LIBBSON).$(LIBBSON_SUFFIX)
+LIBBSON_DIR := $(BUILDDIR)/$(LIBBSON)
+LIBBSON_LICENSE := Apache-2.0 AND MIT
+LIBBSON_LICENSE_FILES := \
+ file://src/libbson/src/bson/bson.c;endline=15;md5=24960268974cd1c54441e1999c9b5d38 \
+ file://COPYING;md5=2ee41112a44fe7014dce33e26468ba93 \
+ file://src/libbson/THIRD_PARTY_NOTICES;md5=7c6dab59ecb788b1bfe8a307e54c203a
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# cmake
+#
+LIBBSON_CONF_TOOL := cmake
+LIBBSON_CONF_OPT := \
+ $(CROSS_CMAKE_USR) \
+ -DBSON_OUTPUT_BASENAME=bson \
+ -DENABLE_APPLE_FRAMEWORK=OFF \
+ -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=ON \
+ -DENABLE_BSON=ON \
+ -DENABLE_CLIENT_SIDE_ENCRYPTION=OFF \
+ -DENABLE_COVERAGE=OFF \
+ -DENABLE_CRYPTO_SYSTEM_PROFILE=OFF \
+ -DENABLE_DEBUG_ASSERTIONS=OFF \
+ -DENABLE_EXAMPLES=OFF \
+ -DENABLE_EXTRA_ALIGNMENT=ON \
+ -DENABLE_HTML_DOCS=OFF \
+ -DENABLE_ICU=OFF \
+ -DENABLE_MAINTAINER_FLAGS=OFF \
+ -DENABLE_MAN_PAGES=OFF \
+ -DENABLE_MONGOC=OFF \
+ -DENABLE_MONGODB_AWS_AUTH=AUTO \
+ -DENABLE_PIC=ON \
+ -DENABLE_RDTSCP=OFF \
+ -DENABLE_SASL=OFF \
+ -DENABLE_SHM_COUNTERS=ON \
+ -DENABLE_SNAPPY=OFF \
+ -DENABLE_SRV=OFF \
+ -DENABLE_SSL=OFF \
+ -DENABLE_STATIC=OFF \
+ -DENABLE_TESTS=OFF \
+ -DENABLE_TRACING=OFF \
+ -DENABLE_UNINSTALL=ON \
+ -DENABLE_ZLIB=OFF \
+ -DENABLE_ZSTD=OFF
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/libbson.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, libbson)
+ @$(call install_fixup, libbson,PRIORITY,optional)
+ @$(call install_fixup, libbson,SECTION,base)
+ @$(call install_fixup, libbson,AUTHOR,"Roland Hieber <rhi@pengutronix.de>")
+ @$(call install_fixup, libbson,DESCRIPTION,missing)
+
+ @$(call install_lib, libbson, 0, 0, 0755, libbson-1.0)
+
+ @$(call install_finish, libbson)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.39.2
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH v2 3/7] libconfig: correct license and pin down license files
2023-05-24 22:34 [ptxdist] [PATCH v2 1/7] cpputest: new package: C++ unit test framework Roland Hieber
2023-05-24 22:34 ` [ptxdist] [PATCH v2 2/7] libbson: new package: routines related to BSON documents Roland Hieber
@ 2023-05-24 22:34 ` Roland Hieber
2023-06-02 7:17 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-05-24 22:34 ` [ptxdist] [PATCH v2 4/7] libevent: amend license and pin down license file Roland Hieber
` (4 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Roland Hieber @ 2023-05-24 22:34 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
As specified in the source file header comments, the library is actually
LGPL-2.1-or-later, not -only.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
PATCH v2:
- no changes
PATCH v1: https://lore.ptxdist.org/ptxdist/20230515072054.1997217-3-rhi@pengutronix.de
---
rules/libconfig.make | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/rules/libconfig.make b/rules/libconfig.make
index 6fd5b0304bd7..c9ef51fca75c 100644
--- a/rules/libconfig.make
+++ b/rules/libconfig.make
@@ -21,7 +21,10 @@ LIBCONFIG_SUFFIX := tar.gz
LIBCONFIG_URL := http://hyperrealm.github.io/libconfig/dist/$(LIBCONFIG).$(LIBCONFIG_SUFFIX)
LIBCONFIG_SOURCE := $(SRCDIR)/$(LIBCONFIG).$(LIBCONFIG_SUFFIX)
LIBCONFIG_DIR := $(BUILDDIR)/$(LIBCONFIG)
-LIBCONFIG_LICENSE := LGPL-2.1-only
+LIBCONFIG_LICENSE := LGPL-2.1-or-later
+LIBCONFIG_LICENSE_FILES := \
+ file://lib/libconfig.c;startline=2;endline=15;md5=6b3d8fd63724d3a674cf2857441b1e70 \
+ file://COPYING.LIB;md5=fad9b3332be894bab9bc501572864b29
# ----------------------------------------------------------------------------
# Prepare
--
2.39.2
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH v2 4/7] libevent: amend license and pin down license file
2023-05-24 22:34 [ptxdist] [PATCH v2 1/7] cpputest: new package: C++ unit test framework Roland Hieber
2023-05-24 22:34 ` [ptxdist] [PATCH v2 2/7] libbson: new package: routines related to BSON documents Roland Hieber
2023-05-24 22:34 ` [ptxdist] [PATCH v2 3/7] libconfig: correct license and pin down license files Roland Hieber
@ 2023-05-24 22:34 ` Roland Hieber
2023-06-02 7:17 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-05-24 22:34 ` [ptxdist] [PATCH v2 5/7] htmldoc: new package: HTML-to-PDF/PostScript/EPUB converter Roland Hieber
` (3 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Roland Hieber @ 2023-05-24 22:34 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
PATCH v2:
- no changes
PATCH v1: https://lore.ptxdist.org/ptxdist/20230515072054.1997217-4-rhi@pengutronix.de
---
rules/libevent.make | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/rules/libevent.make b/rules/libevent.make
index 73470c59e9b4..f2860b69c4aa 100644
--- a/rules/libevent.make
+++ b/rules/libevent.make
@@ -22,7 +22,8 @@ LIBEVENT_SUFFIX := tar.gz
LIBEVENT_URL := https://github.com/libevent/libevent/releases/download/release-$(LIBEVENT_VERSION)-stable/$(LIBEVENT).$(LIBEVENT_SUFFIX)
LIBEVENT_SOURCE := $(SRCDIR)/$(LIBEVENT).$(LIBEVENT_SUFFIX)
LIBEVENT_DIR := $(BUILDDIR)/$(LIBEVENT)
-LIBEVENT_LICENSE := BSD-3-Clause AND 0BSD
+LIBEVENT_LICENSE := BSD-3-Clause AND 0BSD AND MIT
+LIBEVENT_LICENSE_FILES := file://LICENSE;md5=17f20574c0b154d12236d5fbe964f549
# ----------------------------------------------------------------------------
# Prepare
--
2.39.2
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH v2 5/7] htmldoc: new package: HTML-to-PDF/PostScript/EPUB converter
2023-05-24 22:34 [ptxdist] [PATCH v2 1/7] cpputest: new package: C++ unit test framework Roland Hieber
` (2 preceding siblings ...)
2023-05-24 22:34 ` [ptxdist] [PATCH v2 4/7] libevent: amend license and pin down license file Roland Hieber
@ 2023-05-24 22:34 ` Roland Hieber
2023-06-02 7:17 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-05-24 22:34 ` [ptxdist] [PATCH v2 6/7] host-libconfig: add host package Roland Hieber
` (2 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Roland Hieber @ 2023-05-24 22:34 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
PATCH v2:
- fix configure options for host and target package (disable debug,
sanitizier, maintainer)
- depend on zlib, which is implicity found by autoconf
PATCH v1: https://lore.ptxdist.org/ptxdist/20230515072054.1997217-5-rhi@pengutronix.de
---
...-build-install-docs-or-desktop-files.patch | 28 ++++++++
patches/htmldoc-1.9.16/series | 4 ++
rules/host-htmldoc.in | 7 ++
rules/host-htmldoc.make | 33 +++++++++
rules/htmldoc.in | 11 +++
rules/htmldoc.make | 69 +++++++++++++++++++
6 files changed, 152 insertions(+)
create mode 100644 patches/htmldoc-1.9.16/0001-Makefile-don-t-build-install-docs-or-desktop-files.patch
create mode 100644 patches/htmldoc-1.9.16/series
create mode 100644 rules/host-htmldoc.in
create mode 100644 rules/host-htmldoc.make
create mode 100644 rules/htmldoc.in
create mode 100644 rules/htmldoc.make
diff --git a/patches/htmldoc-1.9.16/0001-Makefile-don-t-build-install-docs-or-desktop-files.patch b/patches/htmldoc-1.9.16/0001-Makefile-don-t-build-install-docs-or-desktop-files.patch
new file mode 100644
index 000000000000..940a09ceeb1a
--- /dev/null
+++ b/patches/htmldoc-1.9.16/0001-Makefile-don-t-build-install-docs-or-desktop-files.patch
@@ -0,0 +1,28 @@
+From: Roland Hieber <rhi@pengutronix.de>
+Date: Sun, 14 May 2023 23:57:58 +0200
+Subject: [PATCH] Makefile: don't build/install docs or desktop files
+
+htmldoc is configured without GUI, so no desktop data is needed.
+Furthermore it will try to call the built binary to build the docs,
+which will not work in cross builds.
+
+Forwarded: not-needed
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index d846bf7621e5..31211a244b62 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -19,8 +19,8 @@ include Makedefs
+ # Subdirectories...
+ #
+
+-DIRS = htmldoc doc
+-INSTALLDIRS = fonts data desktop doc htmldoc
++DIRS = htmldoc
++INSTALLDIRS = fonts data htmldoc
+
+
+ #
diff --git a/patches/htmldoc-1.9.16/series b/patches/htmldoc-1.9.16/series
new file mode 100644
index 000000000000..e9d04563df1d
--- /dev/null
+++ b/patches/htmldoc-1.9.16/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Makefile-don-t-build-install-docs-or-desktop-files.patch
+# fdcadd964bbc6253264d4d6326477667 - git-ptx-patches magic
diff --git a/rules/host-htmldoc.in b/rules/host-htmldoc.in
new file mode 100644
index 000000000000..fb97aaef2a40
--- /dev/null
+++ b/rules/host-htmldoc.in
@@ -0,0 +1,7 @@
+## SECTION=hosttools_noprompt
+
+config HOST_HTMLDOC
+ tristate
+ default y if ALLYES
+ select HOST_ZLIB
+ select HOST_LIBJPEG
diff --git a/rules/host-htmldoc.make b/rules/host-htmldoc.make
new file mode 100644
index 000000000000..46488b956765
--- /dev/null
+++ b/rules/host-htmldoc.make
@@ -0,0 +1,33 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2023 by Roland Hieber <rhi@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_HTMLDOC) += host-htmldoc
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# autoconf
+#
+HOST_HTMLDOC_CONF_TOOL := autoconf
+HOST_HTMLDOC_CONF_OPT := \
+ $(HOST_AUTOCONF) \
+ --disable-debug \
+ $(GLOBAL_LARGE_FILE_OPTION) \
+ --disable-ssl \
+ --disable-gnutls \
+ --disable-cdsassl \
+ --disable-maintainer \
+ --disable-sanitizer \
+ --without-gui
+
+# vim: syntax=make
diff --git a/rules/htmldoc.in b/rules/htmldoc.in
new file mode 100644
index 000000000000..3ed1869b638f
--- /dev/null
+++ b/rules/htmldoc.in
@@ -0,0 +1,11 @@
+## SECTION=shell_and_console
+
+config HTMLDOC
+ tristate
+ select LIBJPEG
+ select ZLIB
+ prompt "htmldoc"
+ help
+ HTMLDOC is a program that reads HTML and Markdown source files
+ and generates corresponding EPUB, HTML, PostScript, or PDF
+ files with an optional table of contents.
diff --git a/rules/htmldoc.make b/rules/htmldoc.make
new file mode 100644
index 000000000000..d9485c792883
--- /dev/null
+++ b/rules/htmldoc.make
@@ -0,0 +1,69 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2023 by Roland Hieber <rhi@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_HTMLDOC) += htmldoc
+
+#
+# Paths and names
+#
+HTMLDOC_VERSION := 1.9.16
+HTMLDOC_MD5 := 9d82dd05321ca44594d9d1841868b2d5
+HTMLDOC := htmldoc-$(HTMLDOC_VERSION)
+HTMLDOC_SUFFIX := tar.gz
+HTMLDOC_URL := https://github.com/michaelrsweet/htmldoc/releases/download/v$(HTMLDOC_VERSION)/$(HTMLDOC)-source.$(HTMLDOC_SUFFIX)
+HTMLDOC_SOURCE := $(SRCDIR)/$(HTMLDOC).$(HTMLDOC_SUFFIX)
+HTMLDOC_DIR := $(BUILDDIR)/$(HTMLDOC)
+HTMLDOC_LICENSE := GPL-2.0-only
+HTMLDOC_LICENSE_FILES := \
+ file://README.md;startline=123;endline=124;md5=a2aaa1a54649f92a3f27ab9953505863 \
+ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# autoconf
+#
+HTMLDOC_CONF_TOOL := autoconf
+HTMLDOC_CONF_OPT := \
+ $(CROSS_AUTOCONF_USR) \
+ --disable-debug \
+ $(GLOBAL_LARGE_FILE_OPTION) \
+ --disable-ssl \
+ --disable-gnutls \
+ --disable-cdsassl \
+ --disable-maintainer \
+ --disable-sanitizer \
+ --without-gui
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/htmldoc.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, htmldoc)
+ @$(call install_fixup, htmldoc,PRIORITY,optional)
+ @$(call install_fixup, htmldoc,SECTION,base)
+ @$(call install_fixup, htmldoc,AUTHOR,"Roland Hieber <rhi@pengutronix.de>")
+ @$(call install_fixup, htmldoc,DESCRIPTION,missing)
+
+ @$(call install_copy, htmldoc, 0, 0, 0755, -, /usr/bin/htmldoc)
+ @$(call install_tree, htmldoc, 0, 0, -, /usr/share/htmldoc/fonts)
+ @$(call install_tree, htmldoc, 0, 0, -, /usr/share/htmldoc/data)
+
+ @$(call install_finish, htmldoc)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.39.2
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH v2 6/7] host-libconfig: add host package
2023-05-24 22:34 [ptxdist] [PATCH v2 1/7] cpputest: new package: C++ unit test framework Roland Hieber
` (3 preceding siblings ...)
2023-05-24 22:34 ` [ptxdist] [PATCH v2 5/7] htmldoc: new package: HTML-to-PDF/PostScript/EPUB converter Roland Hieber
@ 2023-05-24 22:34 ` Roland Hieber
2023-06-02 7:17 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-05-24 22:34 ` [ptxdist] [PATCH v2 7/7] host-libevent: " Roland Hieber
2023-06-02 7:17 ` [ptxdist] [APPLIED] cpputest: new package: C++ unit test framework Michael Olbrich
6 siblings, 1 reply; 14+ messages in thread
From: Roland Hieber @ 2023-05-24 22:34 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
PATCH v2:
- no changes
PATCH v1: https://lore.ptxdist.org/ptxdist/20230515072054.1997217-7-rhi@pengutronix.de
---
rules/host-libconfig.in | 5 +++++
rules/host-libconfig.make | 23 +++++++++++++++++++++++
2 files changed, 28 insertions(+)
create mode 100644 rules/host-libconfig.in
create mode 100644 rules/host-libconfig.make
diff --git a/rules/host-libconfig.in b/rules/host-libconfig.in
new file mode 100644
index 000000000000..d47d8b2e8f3b
--- /dev/null
+++ b/rules/host-libconfig.in
@@ -0,0 +1,5 @@
+## SECTION=hosttools_noprompt
+
+config HOST_LIBCONFIG
+ tristate
+ default y if ALLYES
diff --git a/rules/host-libconfig.make b/rules/host-libconfig.make
new file mode 100644
index 000000000000..953fe0e902d3
--- /dev/null
+++ b/rules/host-libconfig.make
@@ -0,0 +1,23 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2023 by Roland Hieber <rhi@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_LIBCONFIG) += host-libconfig
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# autoconf
+#
+HOST_LIBCONFIG_CONF_TOOL := autoconf
+
+# vim: syntax=make
--
2.39.2
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH v2 7/7] host-libevent: add host package
2023-05-24 22:34 [ptxdist] [PATCH v2 1/7] cpputest: new package: C++ unit test framework Roland Hieber
` (4 preceding siblings ...)
2023-05-24 22:34 ` [ptxdist] [PATCH v2 6/7] host-libconfig: add host package Roland Hieber
@ 2023-05-24 22:34 ` Roland Hieber
2023-06-02 7:17 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-06-02 7:17 ` [ptxdist] [APPLIED] cpputest: new package: C++ unit test framework Michael Olbrich
6 siblings, 1 reply; 14+ messages in thread
From: Roland Hieber @ 2023-05-24 22:34 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
PATCH v2:
- no changes
PATCH v1: https://lore.ptxdist.org/ptxdist/20230515072054.1997217-8-rhi@pengutronix.de
---
rules/host-libevent.in | 5 +++++
rules/host-libevent.make | 23 +++++++++++++++++++++++
2 files changed, 28 insertions(+)
create mode 100644 rules/host-libevent.in
create mode 100644 rules/host-libevent.make
diff --git a/rules/host-libevent.in b/rules/host-libevent.in
new file mode 100644
index 000000000000..d5c97d234c43
--- /dev/null
+++ b/rules/host-libevent.in
@@ -0,0 +1,5 @@
+## SECTION=hosttools_noprompt
+
+config HOST_LIBEVENT
+ tristate
+ default y if ALLYES
diff --git a/rules/host-libevent.make b/rules/host-libevent.make
new file mode 100644
index 000000000000..eaba83d42613
--- /dev/null
+++ b/rules/host-libevent.make
@@ -0,0 +1,23 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2023 by Roland Hieber <rhi@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_LIBEVENT) += host-libevent
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# autoconf
+#
+HOST_LIBEVENT_CONF_TOOL := autoconf
+
+# vim: syntax=make
--
2.39.2
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [APPLIED] cpputest: new package: C++ unit test framework
2023-05-24 22:34 [ptxdist] [PATCH v2 1/7] cpputest: new package: C++ unit test framework Roland Hieber
` (5 preceding siblings ...)
2023-05-24 22:34 ` [ptxdist] [PATCH v2 7/7] host-libevent: " Roland Hieber
@ 2023-06-02 7:17 ` Michael Olbrich
6 siblings, 0 replies; 14+ messages in thread
From: Michael Olbrich @ 2023-06-02 7:17 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as 67951746da0af80e6e51e155fc9a1aa121ee5799.
Michael
[sent from post-receive hook]
On Fri, 02 Jun 2023 09:17:39 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20230524223413.1079888-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/cpputest-3.8/autogen.sh b/patches/cpputest-3.8/autogen.sh
> new file mode 120000
> index 000000000000..9f8a4cb7ddcb
> --- /dev/null
> +++ b/patches/cpputest-3.8/autogen.sh
> @@ -0,0 +1 @@
> +../autogen.sh
> \ No newline at end of file
> diff --git a/rules/cpputest.in b/rules/cpputest.in
> new file mode 100644
> index 000000000000..b2e7292d63e7
> --- /dev/null
> +++ b/rules/cpputest.in
> @@ -0,0 +1,7 @@
> +## SECTION=test_suites
> +
> +config CPPUTEST
> + tristate
> + prompt "cpputest"
> + help
> + CppUTest unit test framework
> diff --git a/rules/cpputest.make b/rules/cpputest.make
> new file mode 100644
> index 000000000000..b900170c3633
> --- /dev/null
> +++ b/rules/cpputest.make
> @@ -0,0 +1,56 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2023 by Roland Hieber <rhi@pengutronix.de>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_CPPUTEST) += cpputest
> +
> +#
> +# Paths and names
> +#
> +CPPUTEST_VERSION := 3.8
> +CPPUTEST_MD5 := fc34eab33c08e8dcd83698988e9a33c5
> +CPPUTEST := cpputest-$(CPPUTEST_VERSION)
> +CPPUTEST_SUFFIX := tar.gz
> +CPPUTEST_URL := https://github.com/cpputest/cpputest/releases/download/v$(CPPUTEST_VERSION)/$(CPPUTEST).$(CPPUTEST_SUFFIX)
> +CPPUTEST_SOURCE := $(SRCDIR)/$(CPPUTEST).$(CPPUTEST_SUFFIX)
> +CPPUTEST_DIR := $(BUILDDIR)/$(CPPUTEST)
> +CPPUTEST_LICENSE := BSD-3-Clause
> +CPPUTEST_LICENSE_FILES := file://COPYING;md5=ce5d5f1fe02bcd1343ced64a06fd4177
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# autoconf
> +#
> +CPPUTEST_CONF_TOOL := autoconf
> +CPPUTEST_CONF_OPT := \
> + $(CROSS_AUTOCONF_USR) \
> + --enable-std-c \
> + --enable-std-cpp \
> + --enable-std-cpp11 \
> + --enable-cpputest-flags \
> + --enable-memory-leak-detection \
> + --enable-extensions \
> + --enable-longlong \
> + --enable-generate-map-file \
> + --enable-coverage
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/cpputest.targetinstall:
> + @$(call targetinfo)
> + @# cpputest is a static library only
> + @$(call touch)
> +
> +# vim: syntax=make
> diff --git a/rules/host-cpputest.in b/rules/host-cpputest.in
> new file mode 100644
> index 000000000000..7ef582262d20
> --- /dev/null
> +++ b/rules/host-cpputest.in
> @@ -0,0 +1,5 @@
> +## SECTION=hosttools_noprompt
> +
> +config HOST_CPPUTEST
> + tristate
> + default y if ALLYES
> diff --git a/rules/host-cpputest.make b/rules/host-cpputest.make
> new file mode 100644
> index 000000000000..a75dd5449706
> --- /dev/null
> +++ b/rules/host-cpputest.make
> @@ -0,0 +1,34 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2023 by Roland Hieber <rhi@pengutronix.de>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +HOST_PACKAGES-$(PTXCONF_HOST_CPPUTEST) += host-cpputest
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# autoconf
> +#
> +HOST_CPPUTEST_CONF_TOOL := autoconf
> +CPPUTEST_CONF_OPT := \
> + $(HOST_AUTOCONF_USR) \
> + --enable-std-c \
> + --enable-std-cpp \
> + --enable-std-cpp11 \
> + --enable-cpputest-flags \
> + --enable-memory-leak-detection \
> + --enable-extensions \
> + --enable-longlong \
> + --enable-generate-map-file \
> + --enable-coverage
> +
> +# vim: syntax=make
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [APPLIED] libbson: new package: routines related to BSON documents
2023-05-24 22:34 ` [ptxdist] [PATCH v2 2/7] libbson: new package: routines related to BSON documents Roland Hieber
@ 2023-06-02 7:17 ` Michael Olbrich
0 siblings, 0 replies; 14+ messages in thread
From: Michael Olbrich @ 2023-06-02 7:17 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as 7ee545d3d27634740c87bd665b264b5aac8ae798.
Michael
[sent from post-receive hook]
On Fri, 02 Jun 2023 09:17:40 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20230524223413.1079888-2-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/host-libbson.in b/rules/host-libbson.in
> new file mode 100644
> index 000000000000..23eef8540091
> --- /dev/null
> +++ b/rules/host-libbson.in
> @@ -0,0 +1,6 @@
> +## SECTION=hosttools_noprompt
> +
> +config HOST_LIBBSON
> + tristate
> + default y if ALLYES
> + select HOST_CMAKE
> diff --git a/rules/host-libbson.make b/rules/host-libbson.make
> new file mode 100644
> index 000000000000..046495d8dd48
> --- /dev/null
> +++ b/rules/host-libbson.make
> @@ -0,0 +1,54 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2023 by Roland Hieber <rhi@pengutronix.de>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +HOST_PACKAGES-$(PTXCONF_HOST_LIBBSON) += host-libbson
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# cmake
> +#
> +HOST_LIBBSON_CONF_TOOL := cmake
> +HOST_LIBBSON_CONF_OPT := \
> + $(HOST_CMAKE_OPT) \
> + -DBSON_OUTPUT_BASENAME=bson \
> + -DENABLE_APPLE_FRAMEWORK=OFF \
> + -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=ON \
> + -DENABLE_BSON=ON \
> + -DENABLE_CLIENT_SIDE_ENCRYPTION=OFF \
> + -DENABLE_COVERAGE=OFF \
> + -DENABLE_CRYPTO_SYSTEM_PROFILE=OFF \
> + -DENABLE_DEBUG_ASSERTIONS=OFF \
> + -DENABLE_EXAMPLES=OFF \
> + -DENABLE_EXTRA_ALIGNMENT=ON \
> + -DENABLE_HTML_DOCS=OFF \
> + -DENABLE_ICU=OFF \
> + -DENABLE_MAINTAINER_FLAGS=OFF \
> + -DENABLE_MAN_PAGES=OFF \
> + -DENABLE_MONGOC=OFF \
> + -DENABLE_MONGODB_AWS_AUTH=AUTO \
> + -DENABLE_PIC=ON \
> + -DENABLE_RDTSCP=OFF \
> + -DENABLE_SASL=OFF \
> + -DENABLE_SHM_COUNTERS=ON \
> + -DENABLE_SNAPPY=OFF \
> + -DENABLE_SRV=OFF \
> + -DENABLE_SSL=OFF \
> + -DENABLE_STATIC=OFF \
> + -DENABLE_TESTS=OFF \
> + -DENABLE_TRACING=OFF \
> + -DENABLE_UNINSTALL=ON \
> + -DENABLE_ZLIB=OFF \
> + -DENABLE_ZSTD=OFF
> +
> +# vim: syntax=make
> diff --git a/rules/libbson.in b/rules/libbson.in
> new file mode 100644
> index 000000000000..58649ec64863
> --- /dev/null
> +++ b/rules/libbson.in
> @@ -0,0 +1,9 @@
> +## SECTION=system_libraries
> +
> +config LIBBSON
> + tristate
> + select HOST_CMAKE
> + select GLIBC_RT
> + prompt "libbson"
> + help
> + Routines related to building, parsing, and iterating BSON documents
> diff --git a/rules/libbson.make b/rules/libbson.make
> new file mode 100644
> index 000000000000..bd1d65596727
> --- /dev/null
> +++ b/rules/libbson.make
> @@ -0,0 +1,89 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2023 by Roland Hieber <rhi@pengutronix.de>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_LIBBSON) += libbson
> +
> +#
> +# Paths and names
> +#
> +LIBBSON_VERSION := 1.23.4
> +LIBBSON_MD5 := 28f2f253777e8d80839c41239de44188
> +LIBBSON := libbson-$(LIBBSON_VERSION)
> +LIBBSON_SUFFIX := tar.gz
> +LIBBSON_URL := https://github.com/mongodb/mongo-c-driver/releases/download/$(LIBBSON_VERSION)/mongo-c-driver-$(LIBBSON_VERSION).$(LIBBSON_SUFFIX)
> +LIBBSON_SOURCE := $(SRCDIR)/$(LIBBSON).$(LIBBSON_SUFFIX)
> +LIBBSON_DIR := $(BUILDDIR)/$(LIBBSON)
> +LIBBSON_LICENSE := Apache-2.0 AND MIT
> +LIBBSON_LICENSE_FILES := \
> + file://src/libbson/src/bson/bson.c;endline=15;md5=24960268974cd1c54441e1999c9b5d38 \
> + file://COPYING;md5=2ee41112a44fe7014dce33e26468ba93 \
> + file://src/libbson/THIRD_PARTY_NOTICES;md5=7c6dab59ecb788b1bfe8a307e54c203a
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# cmake
> +#
> +LIBBSON_CONF_TOOL := cmake
> +LIBBSON_CONF_OPT := \
> + $(CROSS_CMAKE_USR) \
> + -DBSON_OUTPUT_BASENAME=bson \
> + -DENABLE_APPLE_FRAMEWORK=OFF \
> + -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=ON \
> + -DENABLE_BSON=ON \
> + -DENABLE_CLIENT_SIDE_ENCRYPTION=OFF \
> + -DENABLE_COVERAGE=OFF \
> + -DENABLE_CRYPTO_SYSTEM_PROFILE=OFF \
> + -DENABLE_DEBUG_ASSERTIONS=OFF \
> + -DENABLE_EXAMPLES=OFF \
> + -DENABLE_EXTRA_ALIGNMENT=ON \
> + -DENABLE_HTML_DOCS=OFF \
> + -DENABLE_ICU=OFF \
> + -DENABLE_MAINTAINER_FLAGS=OFF \
> + -DENABLE_MAN_PAGES=OFF \
> + -DENABLE_MONGOC=OFF \
> + -DENABLE_MONGODB_AWS_AUTH=AUTO \
> + -DENABLE_PIC=ON \
> + -DENABLE_RDTSCP=OFF \
> + -DENABLE_SASL=OFF \
> + -DENABLE_SHM_COUNTERS=ON \
> + -DENABLE_SNAPPY=OFF \
> + -DENABLE_SRV=OFF \
> + -DENABLE_SSL=OFF \
> + -DENABLE_STATIC=OFF \
> + -DENABLE_TESTS=OFF \
> + -DENABLE_TRACING=OFF \
> + -DENABLE_UNINSTALL=ON \
> + -DENABLE_ZLIB=OFF \
> + -DENABLE_ZSTD=OFF
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/libbson.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, libbson)
> + @$(call install_fixup, libbson,PRIORITY,optional)
> + @$(call install_fixup, libbson,SECTION,base)
> + @$(call install_fixup, libbson,AUTHOR,"Roland Hieber <rhi@pengutronix.de>")
> + @$(call install_fixup, libbson,DESCRIPTION,missing)
> +
> + @$(call install_lib, libbson, 0, 0, 0755, libbson-1.0)
> +
> + @$(call install_finish, libbson)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [APPLIED] libconfig: correct license and pin down license files
2023-05-24 22:34 ` [ptxdist] [PATCH v2 3/7] libconfig: correct license and pin down license files Roland Hieber
@ 2023-06-02 7:17 ` Michael Olbrich
0 siblings, 0 replies; 14+ messages in thread
From: Michael Olbrich @ 2023-06-02 7:17 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as af9724c6cdfb5007bf86da2c49bf7e9df120ebd5.
Michael
[sent from post-receive hook]
On Fri, 02 Jun 2023 09:17:40 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> As specified in the source file header comments, the library is actually
> LGPL-2.1-or-later, not -only.
>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20230524223413.1079888-3-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/libconfig.make b/rules/libconfig.make
> index 6fd5b0304bd7..c9ef51fca75c 100644
> --- a/rules/libconfig.make
> +++ b/rules/libconfig.make
> @@ -21,7 +21,10 @@ LIBCONFIG_SUFFIX := tar.gz
> LIBCONFIG_URL := http://hyperrealm.github.io/libconfig/dist/$(LIBCONFIG).$(LIBCONFIG_SUFFIX)
> LIBCONFIG_SOURCE := $(SRCDIR)/$(LIBCONFIG).$(LIBCONFIG_SUFFIX)
> LIBCONFIG_DIR := $(BUILDDIR)/$(LIBCONFIG)
> -LIBCONFIG_LICENSE := LGPL-2.1-only
> +LIBCONFIG_LICENSE := LGPL-2.1-or-later
> +LIBCONFIG_LICENSE_FILES := \
> + file://lib/libconfig.c;startline=2;endline=15;md5=6b3d8fd63724d3a674cf2857441b1e70 \
> + file://COPYING.LIB;md5=fad9b3332be894bab9bc501572864b29
>
> # ----------------------------------------------------------------------------
> # Prepare
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [APPLIED] libevent: amend license and pin down license file
2023-05-24 22:34 ` [ptxdist] [PATCH v2 4/7] libevent: amend license and pin down license file Roland Hieber
@ 2023-06-02 7:17 ` Michael Olbrich
0 siblings, 0 replies; 14+ messages in thread
From: Michael Olbrich @ 2023-06-02 7:17 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as e455c98d83121a0a225f26b2b0fc5b836dcaaaae.
Michael
[sent from post-receive hook]
On Fri, 02 Jun 2023 09:17:41 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20230524223413.1079888-4-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/libevent.make b/rules/libevent.make
> index 73470c59e9b4..f2860b69c4aa 100644
> --- a/rules/libevent.make
> +++ b/rules/libevent.make
> @@ -22,7 +22,8 @@ LIBEVENT_SUFFIX := tar.gz
> LIBEVENT_URL := https://github.com/libevent/libevent/releases/download/release-$(LIBEVENT_VERSION)-stable/$(LIBEVENT).$(LIBEVENT_SUFFIX)
> LIBEVENT_SOURCE := $(SRCDIR)/$(LIBEVENT).$(LIBEVENT_SUFFIX)
> LIBEVENT_DIR := $(BUILDDIR)/$(LIBEVENT)
> -LIBEVENT_LICENSE := BSD-3-Clause AND 0BSD
> +LIBEVENT_LICENSE := BSD-3-Clause AND 0BSD AND MIT
> +LIBEVENT_LICENSE_FILES := file://LICENSE;md5=17f20574c0b154d12236d5fbe964f549
>
> # ----------------------------------------------------------------------------
> # Prepare
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [APPLIED] htmldoc: new package: HTML-to-PDF/PostScript/EPUB converter
2023-05-24 22:34 ` [ptxdist] [PATCH v2 5/7] htmldoc: new package: HTML-to-PDF/PostScript/EPUB converter Roland Hieber
@ 2023-06-02 7:17 ` Michael Olbrich
0 siblings, 0 replies; 14+ messages in thread
From: Michael Olbrich @ 2023-06-02 7:17 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as 2ab25133291b88653dcd26c96f301dac7870d6f0.
Michael
[sent from post-receive hook]
On Fri, 02 Jun 2023 09:17:42 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20230524223413.1079888-5-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/htmldoc-1.9.16/0001-Makefile-don-t-build-install-docs-or-desktop-files.patch b/patches/htmldoc-1.9.16/0001-Makefile-don-t-build-install-docs-or-desktop-files.patch
> new file mode 100644
> index 000000000000..940a09ceeb1a
> --- /dev/null
> +++ b/patches/htmldoc-1.9.16/0001-Makefile-don-t-build-install-docs-or-desktop-files.patch
> @@ -0,0 +1,28 @@
> +From: Roland Hieber <rhi@pengutronix.de>
> +Date: Sun, 14 May 2023 23:57:58 +0200
> +Subject: [PATCH] Makefile: don't build/install docs or desktop files
> +
> +htmldoc is configured without GUI, so no desktop data is needed.
> +Furthermore it will try to call the built binary to build the docs,
> +which will not work in cross builds.
> +
> +Forwarded: not-needed
> +---
> + Makefile.in | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/Makefile.in b/Makefile.in
> +index d846bf7621e5..31211a244b62 100644
> +--- a/Makefile.in
> ++++ b/Makefile.in
> +@@ -19,8 +19,8 @@ include Makedefs
> + # Subdirectories...
> + #
> +
> +-DIRS = htmldoc doc
> +-INSTALLDIRS = fonts data desktop doc htmldoc
> ++DIRS = htmldoc
> ++INSTALLDIRS = fonts data htmldoc
> +
> +
> + #
> diff --git a/patches/htmldoc-1.9.16/series b/patches/htmldoc-1.9.16/series
> new file mode 100644
> index 000000000000..e9d04563df1d
> --- /dev/null
> +++ b/patches/htmldoc-1.9.16/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-Makefile-don-t-build-install-docs-or-desktop-files.patch
> +# fdcadd964bbc6253264d4d6326477667 - git-ptx-patches magic
> diff --git a/rules/host-htmldoc.in b/rules/host-htmldoc.in
> new file mode 100644
> index 000000000000..fb97aaef2a40
> --- /dev/null
> +++ b/rules/host-htmldoc.in
> @@ -0,0 +1,7 @@
> +## SECTION=hosttools_noprompt
> +
> +config HOST_HTMLDOC
> + tristate
> + default y if ALLYES
> + select HOST_ZLIB
> + select HOST_LIBJPEG
> diff --git a/rules/host-htmldoc.make b/rules/host-htmldoc.make
> new file mode 100644
> index 000000000000..46488b956765
> --- /dev/null
> +++ b/rules/host-htmldoc.make
> @@ -0,0 +1,33 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2023 by Roland Hieber <rhi@pengutronix.de>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +HOST_PACKAGES-$(PTXCONF_HOST_HTMLDOC) += host-htmldoc
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# autoconf
> +#
> +HOST_HTMLDOC_CONF_TOOL := autoconf
> +HOST_HTMLDOC_CONF_OPT := \
> + $(HOST_AUTOCONF) \
> + --disable-debug \
> + $(GLOBAL_LARGE_FILE_OPTION) \
> + --disable-ssl \
> + --disable-gnutls \
> + --disable-cdsassl \
> + --disable-maintainer \
> + --disable-sanitizer \
> + --without-gui
> +
> +# vim: syntax=make
> diff --git a/rules/htmldoc.in b/rules/htmldoc.in
> new file mode 100644
> index 000000000000..3ed1869b638f
> --- /dev/null
> +++ b/rules/htmldoc.in
> @@ -0,0 +1,11 @@
> +## SECTION=shell_and_console
> +
> +config HTMLDOC
> + tristate
> + select LIBJPEG
> + select ZLIB
> + prompt "htmldoc"
> + help
> + HTMLDOC is a program that reads HTML and Markdown source files
> + and generates corresponding EPUB, HTML, PostScript, or PDF
> + files with an optional table of contents.
> diff --git a/rules/htmldoc.make b/rules/htmldoc.make
> new file mode 100644
> index 000000000000..d9485c792883
> --- /dev/null
> +++ b/rules/htmldoc.make
> @@ -0,0 +1,69 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2023 by Roland Hieber <rhi@pengutronix.de>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_HTMLDOC) += htmldoc
> +
> +#
> +# Paths and names
> +#
> +HTMLDOC_VERSION := 1.9.16
> +HTMLDOC_MD5 := 9d82dd05321ca44594d9d1841868b2d5
> +HTMLDOC := htmldoc-$(HTMLDOC_VERSION)
> +HTMLDOC_SUFFIX := tar.gz
> +HTMLDOC_URL := https://github.com/michaelrsweet/htmldoc/releases/download/v$(HTMLDOC_VERSION)/$(HTMLDOC)-source.$(HTMLDOC_SUFFIX)
> +HTMLDOC_SOURCE := $(SRCDIR)/$(HTMLDOC).$(HTMLDOC_SUFFIX)
> +HTMLDOC_DIR := $(BUILDDIR)/$(HTMLDOC)
> +HTMLDOC_LICENSE := GPL-2.0-only
> +HTMLDOC_LICENSE_FILES := \
> + file://README.md;startline=123;endline=124;md5=a2aaa1a54649f92a3f27ab9953505863 \
> + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# autoconf
> +#
> +HTMLDOC_CONF_TOOL := autoconf
> +HTMLDOC_CONF_OPT := \
> + $(CROSS_AUTOCONF_USR) \
> + --disable-debug \
> + $(GLOBAL_LARGE_FILE_OPTION) \
> + --disable-ssl \
> + --disable-gnutls \
> + --disable-cdsassl \
> + --disable-maintainer \
> + --disable-sanitizer \
> + --without-gui
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/htmldoc.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, htmldoc)
> + @$(call install_fixup, htmldoc,PRIORITY,optional)
> + @$(call install_fixup, htmldoc,SECTION,base)
> + @$(call install_fixup, htmldoc,AUTHOR,"Roland Hieber <rhi@pengutronix.de>")
> + @$(call install_fixup, htmldoc,DESCRIPTION,missing)
> +
> + @$(call install_copy, htmldoc, 0, 0, 0755, -, /usr/bin/htmldoc)
> + @$(call install_tree, htmldoc, 0, 0, -, /usr/share/htmldoc/fonts)
> + @$(call install_tree, htmldoc, 0, 0, -, /usr/share/htmldoc/data)
> +
> + @$(call install_finish, htmldoc)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [APPLIED] host-libconfig: add host package
2023-05-24 22:34 ` [ptxdist] [PATCH v2 6/7] host-libconfig: add host package Roland Hieber
@ 2023-06-02 7:17 ` Michael Olbrich
0 siblings, 0 replies; 14+ messages in thread
From: Michael Olbrich @ 2023-06-02 7:17 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as e0262bf3bbf9a68ec95f63603b49e5144f50cfe1.
Michael
[sent from post-receive hook]
On Fri, 02 Jun 2023 09:17:43 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20230524223413.1079888-6-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/host-libconfig.in b/rules/host-libconfig.in
> new file mode 100644
> index 000000000000..d47d8b2e8f3b
> --- /dev/null
> +++ b/rules/host-libconfig.in
> @@ -0,0 +1,5 @@
> +## SECTION=hosttools_noprompt
> +
> +config HOST_LIBCONFIG
> + tristate
> + default y if ALLYES
> diff --git a/rules/host-libconfig.make b/rules/host-libconfig.make
> new file mode 100644
> index 000000000000..953fe0e902d3
> --- /dev/null
> +++ b/rules/host-libconfig.make
> @@ -0,0 +1,23 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2023 by Roland Hieber <rhi@pengutronix.de>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +HOST_PACKAGES-$(PTXCONF_HOST_LIBCONFIG) += host-libconfig
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# autoconf
> +#
> +HOST_LIBCONFIG_CONF_TOOL := autoconf
> +
> +# vim: syntax=make
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [APPLIED] host-libevent: add host package
2023-05-24 22:34 ` [ptxdist] [PATCH v2 7/7] host-libevent: " Roland Hieber
@ 2023-06-02 7:17 ` Michael Olbrich
0 siblings, 0 replies; 14+ messages in thread
From: Michael Olbrich @ 2023-06-02 7:17 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as d480864a06ea4734c7e1cb0a3b8d9154c6643eb3.
Michael
[sent from post-receive hook]
On Fri, 02 Jun 2023 09:17:43 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20230524223413.1079888-7-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/host-libevent.in b/rules/host-libevent.in
> new file mode 100644
> index 000000000000..d5c97d234c43
> --- /dev/null
> +++ b/rules/host-libevent.in
> @@ -0,0 +1,5 @@
> +## SECTION=hosttools_noprompt
> +
> +config HOST_LIBEVENT
> + tristate
> + default y if ALLYES
> diff --git a/rules/host-libevent.make b/rules/host-libevent.make
> new file mode 100644
> index 000000000000..eaba83d42613
> --- /dev/null
> +++ b/rules/host-libevent.make
> @@ -0,0 +1,23 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2023 by Roland Hieber <rhi@pengutronix.de>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +HOST_PACKAGES-$(PTXCONF_HOST_LIBEVENT) += host-libevent
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# autoconf
> +#
> +HOST_LIBEVENT_CONF_TOOL := autoconf
> +
> +# vim: syntax=make
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2023-06-02 7:18 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-24 22:34 [ptxdist] [PATCH v2 1/7] cpputest: new package: C++ unit test framework Roland Hieber
2023-05-24 22:34 ` [ptxdist] [PATCH v2 2/7] libbson: new package: routines related to BSON documents Roland Hieber
2023-06-02 7:17 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-05-24 22:34 ` [ptxdist] [PATCH v2 3/7] libconfig: correct license and pin down license files Roland Hieber
2023-06-02 7:17 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-05-24 22:34 ` [ptxdist] [PATCH v2 4/7] libevent: amend license and pin down license file Roland Hieber
2023-06-02 7:17 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-05-24 22:34 ` [ptxdist] [PATCH v2 5/7] htmldoc: new package: HTML-to-PDF/PostScript/EPUB converter Roland Hieber
2023-06-02 7:17 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-05-24 22:34 ` [ptxdist] [PATCH v2 6/7] host-libconfig: add host package Roland Hieber
2023-06-02 7:17 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-05-24 22:34 ` [ptxdist] [PATCH v2 7/7] host-libevent: " Roland Hieber
2023-06-02 7:17 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-06-02 7:17 ` [ptxdist] [APPLIED] cpputest: new package: C++ unit test framework Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox