* [Buildroot] [PATCH 1/2] package/libminiupnpc: disable sample and tests
@ 2022-03-16 20:39 Fabrice Fontaine
2022-03-16 20:39 ` [Buildroot] [PATCH 2/2] package/libminiupnpc: drop dependencies Fabrice Fontaine
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Fabrice Fontaine @ 2022-03-16 20:39 UTC (permalink / raw)
To: buildroot; +Cc: Bernd Kuhls, Fabrice Fontaine
Disable sample and tests (which are built by default since version 2.1:
https://github.com/miniupnp/miniupnp/commit/530b2723500c4a708546815f5593b5c819ab5f76)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/libminiupnpc/libminiupnpc.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk
index 551a6767cf..0633ccd234 100644
--- a/package/libminiupnpc/libminiupnpc.mk
+++ b/package/libminiupnpc/libminiupnpc.mk
@@ -16,5 +16,6 @@ LIBMINIUPNPC_CPE_ID_VENDOR = miniupnp_project
LIBMINIUPNPC_CPE_ID_PRODUCT = miniupnpc
LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR)
LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR)
+LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF
$(eval $(cmake-package))
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Buildroot] [PATCH 2/2] package/libminiupnpc: drop dependencies
2022-03-16 20:39 [Buildroot] [PATCH 1/2] package/libminiupnpc: disable sample and tests Fabrice Fontaine
@ 2022-03-16 20:39 ` Fabrice Fontaine
2022-03-16 22:20 ` Yann E. MORIN
2022-03-16 22:19 ` [Buildroot] [PATCH 1/2] package/libminiupnpc: disable sample and tests Yann E. MORIN
2022-03-21 7:54 ` Peter Korsgaard
2 siblings, 1 reply; 5+ messages in thread
From: Fabrice Fontaine @ 2022-03-16 20:39 UTC (permalink / raw)
To: buildroot; +Cc: Bernd Kuhls, Fabrice Fontaine
libminiupnpc can be statically built with or without binfmt flat since
version 1.7 and
https://github.com/miniupnp/miniupnp/commit/c183a72c46cae9e37ddf635318dfb0bdcd56ed9d
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/libminiupnpc/Config.in | 6 ------
package/libminiupnpc/libminiupnpc.mk | 8 ++++++++
package/transmission/Config.in | 4 ++--
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/package/libminiupnpc/Config.in b/package/libminiupnpc/Config.in
index a3410a0225..51f4b43bbb 100644
--- a/package/libminiupnpc/Config.in
+++ b/package/libminiupnpc/Config.in
@@ -1,7 +1,5 @@
config BR2_PACKAGE_LIBMINIUPNPC
bool "libminiupnpc"
- depends on !BR2_BINFMT_FLAT
- depends on !BR2_STATIC_LIBS
help
The UPnP protocol is supported by most home adsl/cable routers
and Microsoft Windows 2K/XP. The aim of the MiniUPnP project
@@ -14,7 +12,3 @@ config BR2_PACKAGE_LIBMINIUPNPC
ANSI C.
http://miniupnp.free.fr
-
-comment "libminiupnpc needs a toolchain w/ dynamic library"
- depends on BR2_STATIC_LIBS
- depends on !BR2_BINFMT_FLAT
diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk
index 0633ccd234..52fe9849f2 100644
--- a/package/libminiupnpc/libminiupnpc.mk
+++ b/package/libminiupnpc/libminiupnpc.mk
@@ -18,4 +18,12 @@ LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR)
LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR)
LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF
+ifeq ($(BR2_STATIC_LIBS),y)
+LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=OFF -DUPNPC_BUILD_STATIC=ON
+else ifeq ($(BR2_SHARED_LIBS),y)
+LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=ON -DUPNPC_BUILD_STATIC=OFF
+else
+LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=ON -DUPNPC_BUILD_STATIC=ON
+endif
+
$(eval $(cmake-package))
diff --git a/package/transmission/Config.in b/package/transmission/Config.in
index aaed7ec111..eb51ccf862 100644
--- a/package/transmission/Config.in
+++ b/package/transmission/Config.in
@@ -2,8 +2,8 @@ config BR2_PACKAGE_TRANSMISSION
bool "transmission"
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU # fork()
- depends on !BR2_BINFMT_FLAT # libminiupnpc, libnatpmp
- depends on !BR2_STATIC_LIBS # libminiupnpc, libnatpmp
+ depends on !BR2_BINFMT_FLAT # libnatpmp
+ depends on !BR2_STATIC_LIBS # libnatpmp
select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_DHT
select BR2_PACKAGE_OPENSSL
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 2/2] package/libminiupnpc: drop dependencies
2022-03-16 20:39 ` [Buildroot] [PATCH 2/2] package/libminiupnpc: drop dependencies Fabrice Fontaine
@ 2022-03-16 22:20 ` Yann E. MORIN
0 siblings, 0 replies; 5+ messages in thread
From: Yann E. MORIN @ 2022-03-16 22:20 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: Bernd Kuhls, buildroot
Fabrice, All,
On 2022-03-16 21:39 +0100, Fabrice Fontaine spake thusly:
> libminiupnpc can be statically built with or without binfmt flat since
> version 1.7 and
> https://github.com/miniupnp/miniupnp/commit/c183a72c46cae9e37ddf635318dfb0bdcd56ed9d
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
[--SNIP--]
> diff --git a/package/transmission/Config.in b/package/transmission/Config.in
> index aaed7ec111..eb51ccf862 100644
> --- a/package/transmission/Config.in
> +++ b/package/transmission/Config.in
> @@ -2,8 +2,8 @@ config BR2_PACKAGE_TRANSMISSION
> bool "transmission"
> depends on BR2_TOOLCHAIN_HAS_THREADS
> depends on BR2_USE_MMU # fork()
> - depends on !BR2_BINFMT_FLAT # libminiupnpc, libnatpmp
> - depends on !BR2_STATIC_LIBS # libminiupnpc, libnatpmp
> + depends on !BR2_BINFMT_FLAT # libnatpmp
> + depends on !BR2_STATIC_LIBS # libnatpmp
This does not apply to current master;
error: patch failed: package/transmission/Config.in:2
error: package/transmission/Config.in: patch does not apply
hint: Use 'git am --show-current-patch' to see the failed patch
Applying: package/libminiupnpc: drop dependencies
Patch failed at 0001 package/libminiupnpc: drop dependencies
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Care to have a look and respin, please?
Regards,
Yann E. MORIN.
> select BR2_PACKAGE_ZLIB
> select BR2_PACKAGE_DHT
> select BR2_PACKAGE_OPENSSL
> --
> 2.35.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/libminiupnpc: disable sample and tests
2022-03-16 20:39 [Buildroot] [PATCH 1/2] package/libminiupnpc: disable sample and tests Fabrice Fontaine
2022-03-16 20:39 ` [Buildroot] [PATCH 2/2] package/libminiupnpc: drop dependencies Fabrice Fontaine
@ 2022-03-16 22:19 ` Yann E. MORIN
2022-03-21 7:54 ` Peter Korsgaard
2 siblings, 0 replies; 5+ messages in thread
From: Yann E. MORIN @ 2022-03-16 22:19 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: Bernd Kuhls, buildroot
Fabrice, All,
On 2022-03-16 21:39 +0100, Fabrice Fontaine spake thusly:
> Disable sample and tests (which are built by default since version 2.1:
> https://github.com/miniupnp/miniupnp/commit/530b2723500c4a708546815f5593b5c819ab5f76)
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> package/libminiupnpc/libminiupnpc.mk | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk
> index 551a6767cf..0633ccd234 100644
> --- a/package/libminiupnpc/libminiupnpc.mk
> +++ b/package/libminiupnpc/libminiupnpc.mk
> @@ -16,5 +16,6 @@ LIBMINIUPNPC_CPE_ID_VENDOR = miniupnp_project
> LIBMINIUPNPC_CPE_ID_PRODUCT = miniupnpc
> LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR)
> LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR)
> +LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF
>
> $(eval $(cmake-package))
> --
> 2.35.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/libminiupnpc: disable sample and tests
2022-03-16 20:39 [Buildroot] [PATCH 1/2] package/libminiupnpc: disable sample and tests Fabrice Fontaine
2022-03-16 20:39 ` [Buildroot] [PATCH 2/2] package/libminiupnpc: drop dependencies Fabrice Fontaine
2022-03-16 22:19 ` [Buildroot] [PATCH 1/2] package/libminiupnpc: disable sample and tests Yann E. MORIN
@ 2022-03-21 7:54 ` Peter Korsgaard
2 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2022-03-21 7:54 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: Bernd Kuhls, buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> Disable sample and tests (which are built by default since version 2.1:
> https://github.com/miniupnp/miniupnp/commit/530b2723500c4a708546815f5593b5c819ab5f76)
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-03-21 7:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-16 20:39 [Buildroot] [PATCH 1/2] package/libminiupnpc: disable sample and tests Fabrice Fontaine
2022-03-16 20:39 ` [Buildroot] [PATCH 2/2] package/libminiupnpc: drop dependencies Fabrice Fontaine
2022-03-16 22:20 ` Yann E. MORIN
2022-03-16 22:19 ` [Buildroot] [PATCH 1/2] package/libminiupnpc: disable sample and tests Yann E. MORIN
2022-03-21 7:54 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox