* [Buildroot] [PATCH v2,1/1] package/dmalloc: fix static build
@ 2021-05-15 15:17 Fabrice Fontaine
2021-05-15 16:10 ` Yann E. MORIN
2021-05-17 21:33 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2021-05-15 15:17 UTC (permalink / raw
To: buildroot
Build of dmalloc is broken since commit
19ec872f169a851b48ba04d22432b7c0939847d4 because --enable-shlib is
unconditionally set
Fixes:
- http://autobuild.buildroot.org/results/62c9c6aebca60649bd6f635125507bf10d63fc05
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Yann E. Morin):
- Don't unconditionally set --enable-shlib
package/dmalloc/dmalloc.mk | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk
index 638fe0fcda..749c35359c 100644
--- a/package/dmalloc/dmalloc.mk
+++ b/package/dmalloc/dmalloc.mk
@@ -13,10 +13,12 @@ DMALLOC_LICENSE = MIT-like
DMALLOC_LICENSE_FILES = dmalloc.h.1
DMALLOC_INSTALL_STAGING = YES
-DMALLOC_CONF_OPTS = --enable-shlib
DMALLOC_CFLAGS = $(TARGET_CFLAGS)
-ifeq ($(BR2_STATIC_LIBS),)
+ifeq ($(BR2_STATIC_LIBS),y)
+DMALLOC_CONF_OPTS += --disable-shlib
+else
+DMALLOC_CONF_OPTS += --enable-shlib
DMALLOC_CFLAGS += -fPIC
endif
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH v2,1/1] package/dmalloc: fix static build
2021-05-15 15:17 [Buildroot] [PATCH v2,1/1] package/dmalloc: fix static build Fabrice Fontaine
@ 2021-05-15 16:10 ` Yann E. MORIN
2021-05-17 21:33 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2021-05-15 16:10 UTC (permalink / raw
To: buildroot
Fabrice, All,
On 2021-05-15 17:17 +0200, Fabrice Fontaine spake thusly:
> Build of dmalloc is broken since commit
> 19ec872f169a851b48ba04d22432b7c0939847d4 because --enable-shlib is
> unconditionally set
>
> Fixes:
> - http://autobuild.buildroot.org/results/62c9c6aebca60649bd6f635125507bf10d63fc05
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> Changes v1 -> v2 (after review of Yann E. Morin):
> - Don't unconditionally set --enable-shlib
>
> package/dmalloc/dmalloc.mk | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk
> index 638fe0fcda..749c35359c 100644
> --- a/package/dmalloc/dmalloc.mk
> +++ b/package/dmalloc/dmalloc.mk
> @@ -13,10 +13,12 @@ DMALLOC_LICENSE = MIT-like
> DMALLOC_LICENSE_FILES = dmalloc.h.1
>
> DMALLOC_INSTALL_STAGING = YES
> -DMALLOC_CONF_OPTS = --enable-shlib
> DMALLOC_CFLAGS = $(TARGET_CFLAGS)
>
> -ifeq ($(BR2_STATIC_LIBS),)
> +ifeq ($(BR2_STATIC_LIBS),y)
> +DMALLOC_CONF_OPTS += --disable-shlib
> +else
> +DMALLOC_CONF_OPTS += --enable-shlib
> DMALLOC_CFLAGS += -fPIC
> endif
>
> --
> 2.30.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH v2,1/1] package/dmalloc: fix static build
2021-05-15 15:17 [Buildroot] [PATCH v2,1/1] package/dmalloc: fix static build Fabrice Fontaine
2021-05-15 16:10 ` Yann E. MORIN
@ 2021-05-17 21:33 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2021-05-17 21:33 UTC (permalink / raw
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> Build of dmalloc is broken since commit
> 19ec872f169a851b48ba04d22432b7c0939847d4 because --enable-shlib is
> unconditionally set
> Fixes:
> - http://autobuild.buildroot.org/results/62c9c6aebca60649bd6f635125507bf10d63fc05
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> Changes v1 -> v2 (after review of Yann E. Morin):
> - Don't unconditionally set --enable-shlib
Committed to 2021.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-17 21:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-15 15:17 [Buildroot] [PATCH v2,1/1] package/dmalloc: fix static build Fabrice Fontaine
2021-05-15 16:10 ` Yann E. MORIN
2021-05-17 21:33 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.