* [Buildroot] [PATCH/next 2/6] package/termcolor: new package
2022-11-28 12:34 [Buildroot] [PATCH/next 1/6] package/cli11: new package TIAN Yuanhao
@ 2022-11-28 12:34 ` TIAN Yuanhao
2023-02-07 16:04 ` Thomas Petazzoni via buildroot
2022-11-28 12:34 ` [Buildroot] [PATCH/next 3/6] package/tl-expected: " TIAN Yuanhao
` (4 subsequent siblings)
5 siblings, 1 reply; 12+ messages in thread
From: TIAN Yuanhao @ 2022-11-28 12:34 UTC (permalink / raw)
To: buildroot
Required by micromamba.
Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
---
DEVELOPERS | 1 +
package/Config.in | 1 +
package/termcolor/Config.in | 12 ++++++++++++
package/termcolor/termcolor.hash | 3 +++
package/termcolor/termcolor.mk | 14 ++++++++++++++
5 files changed, 31 insertions(+)
create mode 100644 package/termcolor/Config.in
create mode 100644 package/termcolor/termcolor.hash
create mode 100644 package/termcolor/termcolor.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 180793a91b..afab61d97e 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2740,6 +2740,7 @@ F: package/most/
N: TIAN Yuanhao <tianyuanhao3@163.com>
F: package/cli11/
F: package/open-isns/
+F: package/termcolor/
N: Tan En De <ende.tan@starfivetech.com>
F: package/libkcapi/
diff --git a/package/Config.in b/package/Config.in
index a378146ac7..535efd09ea 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2143,6 +2143,7 @@ menu "Text and terminal handling"
source "package/readline/Config.in"
source "package/slang/Config.in"
source "package/tclap/Config.in"
+ source "package/termcolor/Config.in"
source "package/utf8proc/Config.in"
endmenu
diff --git a/package/termcolor/Config.in b/package/termcolor/Config.in
new file mode 100644
index 0000000000..979ad61d81
--- /dev/null
+++ b/package/termcolor/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_TERMCOLOR
+ bool "termcolor"
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
+ help
+ Termcolor is a header-only C++ library for printing colored
+ messages to the terminal.
+
+ https://github.com/ikalnytskyi/termcolor
+
+comment "termcolor needs a toolchain w/ C++, gcc >= 4.8"
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
diff --git a/package/termcolor/termcolor.hash b/package/termcolor/termcolor.hash
new file mode 100644
index 0000000000..dede06c9b0
--- /dev/null
+++ b/package/termcolor/termcolor.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 435994c32557674469404cb1527c283fdcf45746f7df75fd2996bb200d6a759f termcolor-2.1.0.tar.gz
+sha256 bab0f53c36b248df22e2298ddf9eeea14b28783f187fcbff6a38f2c47b3a3a7d LICENSE
diff --git a/package/termcolor/termcolor.mk b/package/termcolor/termcolor.mk
new file mode 100644
index 0000000000..0374ce8b73
--- /dev/null
+++ b/package/termcolor/termcolor.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# termcolor
+#
+################################################################################
+
+TERMCOLOR_VERSION = 2.1.0
+TERMCOLOR_SITE = $(call github,ikalnytskyi,termcolor,v$(TERMCOLOR_VERSION))
+TERMCOLOR_LICENSE = BSD-3-Clause
+TERMCOLOR_LICENSE_FILES = LICENSE
+TERMCOLOR_INSTALL_STAGING = YES
+TERMCOLOR_INSTALL_TARGET = NO
+
+$(eval $(cmake-package))
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [Buildroot] [PATCH/next 2/6] package/termcolor: new package
2022-11-28 12:34 ` [Buildroot] [PATCH/next 2/6] package/termcolor: " TIAN Yuanhao
@ 2023-02-07 16:04 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-02-07 16:04 UTC (permalink / raw)
To: TIAN Yuanhao; +Cc: buildroot
On Mon, 28 Nov 2022 12:34:14 +0000
TIAN Yuanhao <tianyuanhao3@163.com> wrote:
> Required by micromamba.
>
> Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
> ---
> DEVELOPERS | 1 +
> package/Config.in | 1 +
> package/termcolor/Config.in | 12 ++++++++++++
> package/termcolor/termcolor.hash | 3 +++
> package/termcolor/termcolor.mk | 14 ++++++++++++++
> 5 files changed, 31 insertions(+)
> create mode 100644 package/termcolor/Config.in
> create mode 100644 package/termcolor/termcolor.hash
> create mode 100644 package/termcolor/termcolor.mk
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH/next 3/6] package/tl-expected: new package
2022-11-28 12:34 [Buildroot] [PATCH/next 1/6] package/cli11: new package TIAN Yuanhao
2022-11-28 12:34 ` [Buildroot] [PATCH/next 2/6] package/termcolor: " TIAN Yuanhao
@ 2022-11-28 12:34 ` TIAN Yuanhao
2023-02-07 16:04 ` Thomas Petazzoni via buildroot
2022-11-28 12:34 ` [Buildroot] [PATCH/next 4/6] package/libsolv: " TIAN Yuanhao
` (3 subsequent siblings)
5 siblings, 1 reply; 12+ messages in thread
From: TIAN Yuanhao @ 2022-11-28 12:34 UTC (permalink / raw)
To: buildroot
Required by micromamba.
Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
---
DEVELOPERS | 1 +
package/Config.in | 1 +
package/tl-expected/Config.in | 12 ++++++++++++
package/tl-expected/tl-expected.hash | 3 +++
package/tl-expected/tl-expected.mk | 20 ++++++++++++++++++++
5 files changed, 37 insertions(+)
create mode 100644 package/tl-expected/Config.in
create mode 100644 package/tl-expected/tl-expected.hash
create mode 100644 package/tl-expected/tl-expected.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index afab61d97e..2541a64dbf 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2741,6 +2741,7 @@ N: TIAN Yuanhao <tianyuanhao3@163.com>
F: package/cli11/
F: package/open-isns/
F: package/termcolor/
+F: package/tl-expected/
N: Tan En De <ende.tan@starfivetech.com>
F: package/libkcapi/
diff --git a/package/Config.in b/package/Config.in
index 535efd09ea..2e73a6e3fa 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2100,6 +2100,7 @@ endif
source "package/startup-notification/Config.in"
source "package/tbb/Config.in"
source "package/tinycbor/Config.in"
+ source "package/tl-expected/Config.in"
source "package/tz/Config.in"
source "package/tzdata/Config.in"
source "package/uvw/Config.in"
diff --git a/package/tl-expected/Config.in b/package/tl-expected/Config.in
new file mode 100644
index 0000000000..92758ffee5
--- /dev/null
+++ b/package/tl-expected/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_TL_EXPECTED
+ bool "tl-expected"
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
+ help
+ C++11/14/17 std::expected with functional-style extensions and
+ reference support.
+
+ https://github.com/TartanLlama/expected
+
+comment "tl-expected needs a toolchain w/ C++, gcc >= 4.8"
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
diff --git a/package/tl-expected/tl-expected.hash b/package/tl-expected/tl-expected.hash
new file mode 100644
index 0000000000..e5c9cc2a3e
--- /dev/null
+++ b/package/tl-expected/tl-expected.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 2611769546cedcaef233ef587e71420d1f079a794eb7bb19b888dedf991ace7c tl-expected-v1.0.0-br1.tar.gz
+sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 COPYING
diff --git a/package/tl-expected/tl-expected.mk b/package/tl-expected/tl-expected.mk
new file mode 100644
index 0000000000..8d62c75fea
--- /dev/null
+++ b/package/tl-expected/tl-expected.mk
@@ -0,0 +1,20 @@
+################################################################################
+#
+# tl-expected
+#
+################################################################################
+
+TL_EXPECTED_VERSION = v1.0.0
+TL_EXPECTED_SITE = https://github.com/TartanLlama/expected
+TL_EXPECTED_SITE_METHOD = git
+TL_EXPECTED_GIT_SUBMODULES = YES
+TL_EXPECTED_LICENSE = CC0-1.0
+TL_EXPECTED_LICENSE_FILES = COPYING
+TL_EXPECTED_INSTALL_STAGING = YES
+TL_EXPECTED_INSTALL_TARGET = NO
+TL_EXPECTED_CONF_OPTS = \
+ -DCMAKE_MODULE_PATH=$(TL_EXPECTED_DIR)/cmake/tl-cmake \
+ -DEXPECTED_ENABLE_TESTS=OFF \
+ -DFETCHCONTENT_FULLY_DISCONNECTED=ON
+
+$(eval $(cmake-package))
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [Buildroot] [PATCH/next 3/6] package/tl-expected: new package
2022-11-28 12:34 ` [Buildroot] [PATCH/next 3/6] package/tl-expected: " TIAN Yuanhao
@ 2023-02-07 16:04 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-02-07 16:04 UTC (permalink / raw)
To: TIAN Yuanhao; +Cc: buildroot
On Mon, 28 Nov 2022 12:34:15 +0000
TIAN Yuanhao <tianyuanhao3@163.com> wrote:
> Required by micromamba.
>
> Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
> ---
> DEVELOPERS | 1 +
> package/Config.in | 1 +
> package/tl-expected/Config.in | 12 ++++++++++++
> package/tl-expected/tl-expected.hash | 3 +++
> package/tl-expected/tl-expected.mk | 20 ++++++++++++++++++++
> 5 files changed, 37 insertions(+)
> create mode 100644 package/tl-expected/Config.in
> create mode 100644 package/tl-expected/tl-expected.hash
> create mode 100644 package/tl-expected/tl-expected.mk
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH/next 4/6] package/libsolv: new package
2022-11-28 12:34 [Buildroot] [PATCH/next 1/6] package/cli11: new package TIAN Yuanhao
2022-11-28 12:34 ` [Buildroot] [PATCH/next 2/6] package/termcolor: " TIAN Yuanhao
2022-11-28 12:34 ` [Buildroot] [PATCH/next 3/6] package/tl-expected: " TIAN Yuanhao
@ 2022-11-28 12:34 ` TIAN Yuanhao
2023-02-07 16:14 ` Thomas Petazzoni via buildroot
2022-11-28 12:34 ` [Buildroot] [PATCH/next 5/6] package/reproc: " TIAN Yuanhao
` (2 subsequent siblings)
5 siblings, 1 reply; 12+ messages in thread
From: TIAN Yuanhao @ 2022-11-28 12:34 UTC (permalink / raw)
To: buildroot
Required by micromamba.
Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
---
DEVELOPERS | 1 +
package/Config.in | 1 +
package/libsolv/Config.in | 9 +++++++++
package/libsolv/libsolv.hash | 3 +++
package/libsolv/libsolv.mk | 25 +++++++++++++++++++++++++
5 files changed, 39 insertions(+)
create mode 100644 package/libsolv/Config.in
create mode 100644 package/libsolv/libsolv.hash
create mode 100644 package/libsolv/libsolv.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 2541a64dbf..572086d129 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2739,6 +2739,7 @@ F: package/most/
N: TIAN Yuanhao <tianyuanhao3@163.com>
F: package/cli11/
+F: package/libsolv/
F: package/open-isns/
F: package/termcolor/
F: package/tl-expected/
diff --git a/package/Config.in b/package/Config.in
index 2e73a6e3fa..b682fbe0ab 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2054,6 +2054,7 @@ menu "Other"
source "package/libshdata/Config.in"
source "package/libsigc/Config.in"
source "package/libsigsegv/Config.in"
+ source "package/libsolv/Config.in"
source "package/libspatialindex/Config.in"
source "package/libtalloc/Config.in"
source "package/libtasn1/Config.in"
diff --git a/package/libsolv/Config.in b/package/libsolv/Config.in
new file mode 100644
index 0000000000..1415d2bc2b
--- /dev/null
+++ b/package/libsolv/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBSOLV
+ bool "libsolv"
+ depends on BR2_USE_MMU # fork()
+ select BR2_PACKAGE_ZLIB
+ help
+ A free package dependency solver using a satisfiability
+ algorithm.
+
+ https://github.com/openSUSE/libsolv
diff --git a/package/libsolv/libsolv.hash b/package/libsolv/libsolv.hash
new file mode 100644
index 0000000000..162e46e54d
--- /dev/null
+++ b/package/libsolv/libsolv.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 968aef452b5493751fa0168cd58745a77c755e202a43fe8d549d791eb16034d5 libsolv-0.7.22.tar.gz
+sha256 57f15acfb29fbef7749779e096a5885c60b716633e34484a21bb717554c0198f LICENSE.BSD
diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk
new file mode 100644
index 0000000000..49c52e0c74
--- /dev/null
+++ b/package/libsolv/libsolv.mk
@@ -0,0 +1,25 @@
+################################################################################
+#
+# libsolv
+#
+################################################################################
+
+LIBSOLV_VERSION = 0.7.22
+LIBSOLV_SITE = $(call github,openSUSE,libsolv,$(LIBSOLV_VERSION))
+LIBSOLV_LICENSE = BSD-3-Clause
+LIBSOLV_LICENSE_FILES = LICENSE.BSD
+LIBSOLV_INSTALL_STAGING = YES
+LIBSOLV_DEPENDENCIES = zlib
+LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON
+
+ifeq ($(BR2_STATIC_LIBS),y)
+LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=ON
+else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
+LIBSOLV_CONF_OPTS += -DENABLE_STATIC=ON
+endif
+
+ifeq ($(BR2_PACKAGE_MICROMAMBA),y)
+LIBSOLV_CONF_OPTS += -DENABLE_CONDA=ON
+endif
+
+$(eval $(cmake-package))
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [Buildroot] [PATCH/next 4/6] package/libsolv: new package
2022-11-28 12:34 ` [Buildroot] [PATCH/next 4/6] package/libsolv: " TIAN Yuanhao
@ 2023-02-07 16:14 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-02-07 16:14 UTC (permalink / raw)
To: TIAN Yuanhao; +Cc: buildroot
Hello,
On Mon, 28 Nov 2022 12:34:16 +0000
TIAN Yuanhao <tianyuanhao3@163.com> wrote:
> +ifeq ($(BR2_STATIC_LIBS),y)
> +LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=ON
> +else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
> +LIBSOLV_CONF_OPTS += -DENABLE_STATIC=ON
> +endif
Changed to:
ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
LIBSOLV_CONF_OPTS += -DENABLE_STATIC=ON
else
LIBSOLV_CONF_OPTS += -DDISABLE_STATIC=ON
endif
ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
LIBSOLV_CONF_OPTS += -DENABLE_SHARED=ON
else
LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=ON
endif
To explicitly handle all cases.
> +ifeq ($(BR2_PACKAGE_MICROMAMBA),y)
> +LIBSOLV_CONF_OPTS += -DENABLE_CONDA=ON
> +endif
This isn't really nice, as we generally don't want packages to look at
their reverse dependencies to decide which features should be enabled
or not.
So here, I would prefer to have a BR2_PACKAGE_LIBSOLV_CONDA option,
which the micromamba package can select if it needs this feature from
libsolv. For now, I've dropped this part, so if we need it for
micromamba, could you send a patch just adding this new option,
together with the new iteration of the micromamba package?
Best regards,
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH/next 5/6] package/reproc: new package
2022-11-28 12:34 [Buildroot] [PATCH/next 1/6] package/cli11: new package TIAN Yuanhao
` (2 preceding siblings ...)
2022-11-28 12:34 ` [Buildroot] [PATCH/next 4/6] package/libsolv: " TIAN Yuanhao
@ 2022-11-28 12:34 ` TIAN Yuanhao
2023-02-07 16:14 ` Thomas Petazzoni via buildroot
2022-11-28 12:34 ` [Buildroot] [PATCH/next 6/6] package/micromamba: " TIAN Yuanhao
2023-02-07 16:03 ` [Buildroot] [PATCH/next 1/6] package/cli11: " Thomas Petazzoni via buildroot
5 siblings, 1 reply; 12+ messages in thread
From: TIAN Yuanhao @ 2022-11-28 12:34 UTC (permalink / raw)
To: buildroot
Required by micromamba.
Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
---
DEVELOPERS | 1 +
package/Config.in | 1 +
package/reproc/Config.in | 14 ++++++++++++++
package/reproc/reproc.hash | 3 +++
package/reproc/reproc.mk | 17 +++++++++++++++++
5 files changed, 36 insertions(+)
create mode 100644 package/reproc/Config.in
create mode 100644 package/reproc/reproc.hash
create mode 100644 package/reproc/reproc.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 572086d129..462a9511aa 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2741,6 +2741,7 @@ N: TIAN Yuanhao <tianyuanhao3@163.com>
F: package/cli11/
F: package/libsolv/
F: package/open-isns/
+F: package/reproc/
F: package/termcolor/
F: package/tl-expected/
diff --git a/package/Config.in b/package/Config.in
index b682fbe0ab..29153048cf 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2094,6 +2094,7 @@ endif
source "package/protozero/Config.in"
source "package/qhull/Config.in"
source "package/qlibc/Config.in"
+ source "package/reproc/Config.in"
source "package/riemann-c-client/Config.in"
source "package/shapelib/Config.in"
source "package/skalibs/Config.in"
diff --git a/package/reproc/Config.in b/package/reproc/Config.in
new file mode 100644
index 0000000000..a4e9c893b1
--- /dev/null
+++ b/package/reproc/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_REPROC
+ bool "reproc"
+ depends on BR2_USE_MMU # fork()
+ depends on BR2_USE_WCHAR # uses wchar_t
+ depends on BR2_TOOLCHAIN_HAS_THREADS # pthread
+ help
+ reproc is a cross-platform C/C++ library that simplifies
+ starting, stopping and communicating with external programs.
+
+ https://github.com/DaanDeMeyer/reproc
+
+comment "reproc needs a toolchain w/ threads, wchar"
+ depends on BR2_USE_MMU
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/reproc/reproc.hash b/package/reproc/reproc.hash
new file mode 100644
index 0000000000..6da6d0a0bb
--- /dev/null
+++ b/package/reproc/reproc.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 55c780f7faa5c8cabd83ebbb84b68e5e0e09732de70a129f6b3c801e905415dd reproc-14.2.4.tar.gz
+sha256 8f91afbe266bebac2cf1b220e0e67ace4cb9a97d2b21940abef20eb6691cfa91 LICENSE
diff --git a/package/reproc/reproc.mk b/package/reproc/reproc.mk
new file mode 100644
index 0000000000..3167911c4d
--- /dev/null
+++ b/package/reproc/reproc.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# reproc
+#
+################################################################################
+
+REPROC_VERSION = 14.2.4
+REPROC_SITE = $(call github,DaanDeMeyer,reproc,v$(REPROC_VERSION))
+REPROC_LICENSE = MIT
+REPROC_LICENSE_FILES = LICENSE
+REPROC_INSTALL_STAGING = YES
+
+ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_TOOLCHAIN_GCC_AT_LEAST_4_8),yy) # C++11
+REPROC_CONF_OPTS += -DREPROC++=ON
+endif
+
+$(eval $(cmake-package))
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [Buildroot] [PATCH/next 5/6] package/reproc: new package
2022-11-28 12:34 ` [Buildroot] [PATCH/next 5/6] package/reproc: " TIAN Yuanhao
@ 2023-02-07 16:14 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-02-07 16:14 UTC (permalink / raw)
To: TIAN Yuanhao; +Cc: buildroot
On Mon, 28 Nov 2022 12:34:17 +0000
TIAN Yuanhao <tianyuanhao3@163.com> wrote:
> Required by micromamba.
>
> Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
> ---
> DEVELOPERS | 1 +
> package/Config.in | 1 +
> package/reproc/Config.in | 14 ++++++++++++++
> package/reproc/reproc.hash | 3 +++
> package/reproc/reproc.mk | 17 +++++++++++++++++
> 5 files changed, 36 insertions(+)
> create mode 100644 package/reproc/Config.in
> create mode 100644 package/reproc/reproc.hash
> create mode 100644 package/reproc/reproc.mk
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH/next 6/6] package/micromamba: new package
2022-11-28 12:34 [Buildroot] [PATCH/next 1/6] package/cli11: new package TIAN Yuanhao
` (3 preceding siblings ...)
2022-11-28 12:34 ` [Buildroot] [PATCH/next 5/6] package/reproc: " TIAN Yuanhao
@ 2022-11-28 12:34 ` TIAN Yuanhao
2023-02-07 16:26 ` Thomas Petazzoni via buildroot
2023-02-07 16:03 ` [Buildroot] [PATCH/next 1/6] package/cli11: " Thomas Petazzoni via buildroot
5 siblings, 1 reply; 12+ messages in thread
From: TIAN Yuanhao @ 2022-11-28 12:34 UTC (permalink / raw)
To: buildroot
Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
---
DEVELOPERS | 1 +
package/Config.in | 1 +
package/micromamba/Config.in | 43 ++++++++++++++++++++++++++++++
package/micromamba/micromamba.hash | 3 +++
package/micromamba/micromamba.mk | 43 ++++++++++++++++++++++++++++++
5 files changed, 91 insertions(+)
create mode 100644 package/micromamba/Config.in
create mode 100644 package/micromamba/micromamba.hash
create mode 100644 package/micromamba/micromamba.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 462a9511aa..b0250faed5 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2740,6 +2740,7 @@ F: package/most/
N: TIAN Yuanhao <tianyuanhao3@163.com>
F: package/cli11/
F: package/libsolv/
+F: package/micromamba/
F: package/open-isns/
F: package/reproc/
F: package/termcolor/
diff --git a/package/Config.in b/package/Config.in
index 29153048cf..620c9e24d3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2499,6 +2499,7 @@ comment "* "
comment "See the manual: "
comment "http://buildroot.org/manual.html#faq-no-binary-packages"
comment "-------------------------------------------------------"
+ source "package/micromamba/Config.in"
source "package/opkg/Config.in"
source "package/opkg-utils/Config.in"
source "package/rpm/Config.in"
diff --git a/package/micromamba/Config.in b/package/micromamba/Config.in
new file mode 100644
index 0000000000..998809f452
--- /dev/null
+++ b/package/micromamba/Config.in
@@ -0,0 +1,43 @@
+config BR2_PACKAGE_MICROMAMBA_ARCH_SUPPORTS
+ bool
+ # See libmamba/include/mamba/core/context.hpp
+ default y if BR2_arm && (BR2_ARM_CPU_ARMV6 || BR2_ARM_CPU_ARMV7A)
+ default y if BR2_aarch64
+ default y if BR2_i386
+ default y if BR2_powerpc64
+ default y if BR2_powerpc64le
+ default y if BR2_s390x
+ default y if BR2_x86_64
+ depends on BR2_USE_MMU # fork()
+
+config BR2_PACKAGE_MICROMAMBA
+ bool "micromamba"
+ depends on BR2_PACKAGE_MICROMAMBA_ARCH_SUPPORTS
+ depends on BR2_USE_WCHAR # fmt, reproc
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_THREADS # pthread
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 filesystem
+ select BR2_PACKAGE_LIBARCHIVE
+ select BR2_PACKAGE_OPENSSL
+ select BR2_PACKAGE_JSON_FOR_MODERN_CPP
+ select BR2_PACKAGE_YAML_CPP
+ select BR2_PACKAGE_SPDLOG
+ select BR2_PACKAGE_LIBCURL
+ select BR2_PACKAGE_LIBSOLV
+ select BR2_PACKAGE_REPROC
+ select BR2_PACKAGE_TL_EXPECTED
+ select BR2_PACKAGE_CLI11
+ select BR2_PACKAGE_FMT
+ select BR2_PACKAGE_TERMCOLOR
+ help
+ micromamba is a small, pure-C++ reimplementation of
+ mamba/conda. It strives to be a full replacement for mamba and
+ conda.
+
+ https://github.com/mamba-org/mamba
+
+comment "micromamba needs a toolchain w/ wchar, threads, C++, gcc >= 8"
+ depends on BR2_PACKAGE_MICROMAMBA_ARCH_SUPPORTS
+ depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
+ !BR2_TOOLCHAIN_HAS_THREADS || \
+ !BR2_TOOLCHAIN_GCC_AT_LEAST_8
diff --git a/package/micromamba/micromamba.hash b/package/micromamba/micromamba.hash
new file mode 100644
index 0000000000..e584c3bd28
--- /dev/null
+++ b/package/micromamba/micromamba.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 7303d983b49a1a52b302ceae355af1c05afef3a07aa3ad6dd27c36d64c43f991 micromamba-1.0.0.tar.gz
+sha256 41fd98a468e39d319911bd94f4e65d6ad6a7ea66559dd5aa4112f138ff9b629a LICENSE
diff --git a/package/micromamba/micromamba.mk b/package/micromamba/micromamba.mk
new file mode 100644
index 0000000000..188864444c
--- /dev/null
+++ b/package/micromamba/micromamba.mk
@@ -0,0 +1,43 @@
+################################################################################
+#
+# micromamba
+#
+################################################################################
+
+MICROMAMBA_VERSION = 1.0.0
+MICROMAMBA_SITE = $(call github,mamba-org,mamba,micromamba-$(MICROMAMBA_VERSION))
+MICROMAMBA_LICENSE = BSD-3-Clause
+MICROMAMBA_LICENSE_FILES = LICENSE
+MICROMAMBA_DEPENDENCIES = \
+ $(BR2_PYTHON3_HOST_DEPENDENCY) \
+ cli11 \
+ fmt \
+ json-for-modern-cpp \
+ libarchive \
+ libcurl \
+ libsolv \
+ openssl \
+ reproc \
+ spdlog \
+ termcolor \
+ tl-expected \
+ yaml-cpp
+
+MICROMAMBA_CONF_OPTS = -DBUILD_LIBMAMBA=ON -DBUILD_MICROMAMBA=ON
+
+# See libmamba/include/mamba/core/context.hpp
+ifeq ($(BR2_ARM_CPU_ARMV6),y)
+MICROMAMBA_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -D___ARM_ARCH_6__"
+else ifeq ($(BR2_ARM_CPU_ARMV7A),y)
+MICROMAMBA_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -D__ARM_ARCH_7__"
+endif
+
+ifeq ($(BR2_STATIC_LIBS),y)
+MICROMAMBA_CONF_OPTS += -DBUILD_STATIC=ON -DMICROMAMBA_LINKAGE=FULL_STATIC
+else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
+MICROMAMBA_CONF_OPTS += -DBUILD_SHARED=ON -DBUILD_STATIC=ON
+else # BR2_SHARED_LIBS
+MICROMAMBA_CONF_OPTS += -DBUILD_SHARED=ON
+endif
+
+$(eval $(cmake-package))
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [Buildroot] [PATCH/next 6/6] package/micromamba: new package
2022-11-28 12:34 ` [Buildroot] [PATCH/next 6/6] package/micromamba: " TIAN Yuanhao
@ 2023-02-07 16:26 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-02-07 16:26 UTC (permalink / raw)
To: TIAN Yuanhao; +Cc: buildroot
Hello,
On Mon, 28 Nov 2022 12:34:18 +0000
TIAN Yuanhao <tianyuanhao3@163.com> wrote:
> Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
Thanks for this submission. Could you clarify what is the motivation
for this package? Indeed having a package manager on the target feels a
bit strange in the context of Buildroot. Buildroot is normally there
precisely to generate a ready-to-use rootfs, not a rootfs which then
downloads random stuff from the Internet.
Of course, we do have npm or pip, but really their usage is not
recommended.
> diff --git a/package/micromamba/Config.in b/package/micromamba/Config.in
> new file mode 100644
> index 0000000000..998809f452
> --- /dev/null
> +++ b/package/micromamba/Config.in
> @@ -0,0 +1,43 @@
> +config BR2_PACKAGE_MICROMAMBA_ARCH_SUPPORTS
> + bool
> + # See libmamba/include/mamba/core/context.hpp
> + default y if BR2_arm && (BR2_ARM_CPU_ARMV6 || BR2_ARM_CPU_ARMV7A)
> + default y if BR2_aarch64
> + default y if BR2_i386
> + default y if BR2_powerpc64
> + default y if BR2_powerpc64le
> + default y if BR2_s390x
> + default y if BR2_x86_64
> + depends on BR2_USE_MMU # fork()
Always a bit annoying to have architecture-specific things in something
that isn't hardware-related in the first place, but OK.
> +config BR2_PACKAGE_MICROMAMBA
> + bool "micromamba"
> + depends on BR2_PACKAGE_MICROMAMBA_ARCH_SUPPORTS
> + depends on BR2_USE_WCHAR # fmt, reproc
libarchive also needs wchar, spdlog as well (through fmt, admittedly)
> + depends on BR2_INSTALL_LIBSTDCPP
> + depends on BR2_TOOLCHAIN_HAS_THREADS # pthread
> + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 filesystem
> + select BR2_PACKAGE_LIBARCHIVE
> + select BR2_PACKAGE_OPENSSL
> + select BR2_PACKAGE_JSON_FOR_MODERN_CPP
> + select BR2_PACKAGE_YAML_CPP
> + select BR2_PACKAGE_SPDLOG
> + select BR2_PACKAGE_LIBCURL
> + select BR2_PACKAGE_LIBSOLV
> + select BR2_PACKAGE_REPROC
> + select BR2_PACKAGE_TL_EXPECTED
> + select BR2_PACKAGE_CLI11
> + select BR2_PACKAGE_FMT
> + select BR2_PACKAGE_TERMCOLOR
These select should be sorted alphabetically to look a bit nicer.
> + help
> + micromamba is a small, pure-C++ reimplementation of
> + mamba/conda. It strives to be a full replacement for mamba and
> + conda.
> +
> + https://github.com/mamba-org/mamba
> +
> +comment "micromamba needs a toolchain w/ wchar, threads, C++, gcc >= 8"
> + depends on BR2_PACKAGE_MICROMAMBA_ARCH_SUPPORTS
> + depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
> + !BR2_TOOLCHAIN_HAS_THREADS || \
> + !BR2_TOOLCHAIN_GCC_AT_LEAST_8
> diff --git a/package/micromamba/micromamba.hash b/package/micromamba/micromamba.hash
> new file mode 100644
> index 0000000000..e584c3bd28
> --- /dev/null
> +++ b/package/micromamba/micromamba.hash
> @@ -0,0 +1,3 @@
> +# Locally calculated
> +sha256 7303d983b49a1a52b302ceae355af1c05afef3a07aa3ad6dd27c36d64c43f991 micromamba-1.0.0.tar.gz
> +sha256 41fd98a468e39d319911bd94f4e65d6ad6a7ea66559dd5aa4112f138ff9b629a LICENSE
> diff --git a/package/micromamba/micromamba.mk b/package/micromamba/micromamba.mk
> new file mode 100644
> index 0000000000..188864444c
> --- /dev/null
> +++ b/package/micromamba/micromamba.mk
> @@ -0,0 +1,43 @@
> +################################################################################
> +#
> +# micromamba
> +#
> +################################################################################
> +
> +MICROMAMBA_VERSION = 1.0.0
> +MICROMAMBA_SITE = $(call github,mamba-org,mamba,micromamba-$(MICROMAMBA_VERSION))
> +MICROMAMBA_LICENSE = BSD-3-Clause
> +MICROMAMBA_LICENSE_FILES = LICENSE
> +MICROMAMBA_DEPENDENCIES = \
> + $(BR2_PYTHON3_HOST_DEPENDENCY) \
> + cli11 \
> + fmt \
> + json-for-modern-cpp \
> + libarchive \
> + libcurl \
> + libsolv \
> + openssl \
> + reproc \
> + spdlog \
> + termcolor \
> + tl-expected \
> + yaml-cpp
> +
> +MICROMAMBA_CONF_OPTS = -DBUILD_LIBMAMBA=ON -DBUILD_MICROMAMBA=ON
> +
> +# See libmamba/include/mamba/core/context.hpp
> +ifeq ($(BR2_ARM_CPU_ARMV6),y)
> +MICROMAMBA_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -D___ARM_ARCH_6__"
> +else ifeq ($(BR2_ARM_CPU_ARMV7A),y)
> +MICROMAMBA_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -D__ARM_ARCH_7__"
> +endif
This is really a bug in the mamba code, because these defines are
normally provided by the compiler. For example, an ARMv7 compiler
defines:
#define __ARM_ARCH 7
#define __ARM_ARCH_7A__ 1
So mamba could use that instead.
But one could even wonder why it really matters to define a different
MAMBA_PLATFORM name:
#ifdef ___ARM_ARCH_6__
static const char MAMBA_PLATFORM[] = "linux-armv6l";
#elif __ARM_ARCH_7__
static const char MAMBA_PLATFORM[] = "linux-armv7l";
#else
It is really crazy that this is the *only* thing that causes mamba to
have an architecture dependency. Why is that even needed in the first
place?
> +
> +ifeq ($(BR2_STATIC_LIBS),y)
> +MICROMAMBA_CONF_OPTS += -DBUILD_STATIC=ON -DMICROMAMBA_LINKAGE=FULL_STATIC
> +else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
> +MICROMAMBA_CONF_OPTS += -DBUILD_SHARED=ON -DBUILD_STATIC=ON
> +else # BR2_SHARED_LIBS
> +MICROMAMBA_CONF_OPTS += -DBUILD_SHARED=ON
> +endif
Please pass BUILD_STATIC=OFF and BUILD_SHARED=OFF explicitly in the
appropriate cases.
Thanks a lot!
Thomas Petazzoni
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Buildroot] [PATCH/next 1/6] package/cli11: new package
2022-11-28 12:34 [Buildroot] [PATCH/next 1/6] package/cli11: new package TIAN Yuanhao
` (4 preceding siblings ...)
2022-11-28 12:34 ` [Buildroot] [PATCH/next 6/6] package/micromamba: " TIAN Yuanhao
@ 2023-02-07 16:03 ` Thomas Petazzoni via buildroot
5 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-02-07 16:03 UTC (permalink / raw)
To: TIAN Yuanhao; +Cc: buildroot
On Mon, 28 Nov 2022 12:34:13 +0000
TIAN Yuanhao <tianyuanhao3@163.com> wrote:
> Required by micromamba.
>
> Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
> ---
> DEVELOPERS | 1 +
> package/Config.in | 1 +
> package/cli11/Config.in | 13 +++++++++++++
> package/cli11/cli11.hash | 3 +++
> package/cli11/cli11.mk | 15 +++++++++++++++
> 5 files changed, 33 insertions(+)
> create mode 100644 package/cli11/Config.in
> create mode 100644 package/cli11/cli11.hash
> create mode 100644 package/cli11/cli11.mk
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 12+ messages in thread