| Message ID | 20210617091456.272611-6-nolange79@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | None | expand |
On 17/06/2021 11:14, Norbert Lange wrote: > If the libzstd DSO is available, then link the > tool against it. > > Signed-off-by: Norbert Lange <nolange79@gmail.com> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> However this depends on ZSTD_BUILD_PROG_TARGET which was added in the first patch, so I haven't applied. Regards, Arnout > --- > v2->v3: > * Drop config options, just use zstd-dll if possible > --- > package/zstd/zstd.mk | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk > index 58b0d0099e..2131f3fb16 100644 > --- a/package/zstd/zstd.mk > +++ b/package/zstd/zstd.mk > @@ -39,7 +39,12 @@ endif > # zstd will append -O3 after $(CFLAGS), use MOREFLAGS to override again > ZSTD_OPTS += MOREFLAGS="$(TARGET_OPTIMIZATION)" > > +# prefer zstd-dll unless no library is available > +ifeq ($(BR2_STATIC_LIBS),y) > ZSTD_BUILD_PROG_TARGET = zstd-release > +else > +ZSTD_BUILD_PROG_TARGET = zstd-dll > +endif > > ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) > ZSTD_BUILD_LIBS += libzstd.a >
diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index 58b0d0099e..2131f3fb16 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -39,7 +39,12 @@ endif # zstd will append -O3 after $(CFLAGS), use MOREFLAGS to override again ZSTD_OPTS += MOREFLAGS="$(TARGET_OPTIMIZATION)" +# prefer zstd-dll unless no library is available +ifeq ($(BR2_STATIC_LIBS),y) ZSTD_BUILD_PROG_TARGET = zstd-release +else +ZSTD_BUILD_PROG_TARGET = zstd-dll +endif ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) ZSTD_BUILD_LIBS += libzstd.a
If the libzstd DSO is available, then link the tool against it. Signed-off-by: Norbert Lange <nolange79@gmail.com> --- v2->v3: * Drop config options, just use zstd-dll if possible --- package/zstd/zstd.mk | 5 +++++ 1 file changed, 5 insertions(+)