Thanks, applied as f95699a5412a9dc47ce81cade915e7cf972f113a. Michael
[sent from post-receive hook] On Mon, 17 Aug 2020 08:18:28 +0200, Marco Felsch <[email protected]> wrote: > Drop useless ZSTD_LIBZSTD selection. The main purpose of the zstd > package is to install the libzstd. Explicit selecting the zstdlib is > not intuitive and causes errors if someone assumes that this lib gets > installed just by selection the zstd package. > > Link the zstd helper against the shared libzstd while on it. > > Signed-off-by: Marco Felsch <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/mesalib.in b/rules/mesalib.in > index 4d87d0e616c6..df0da381c11d 100644 > --- a/rules/mesalib.in > +++ b/rules/mesalib.in > @@ -31,7 +31,6 @@ menuconfig MESALIB > select EXPAT > select ZLIB > select ZSTD if MESALIB_ZSTD > - select ZSTD_LIBZSTD if MESALIB_ZSTD > help > Mesa is a 3-D graphics library with an API which is very > similar to that of OpenGL. See the project homepage for > diff --git a/rules/squashfs-tools.in b/rules/squashfs-tools.in > index 9e4f48550c1b..cbd1f324b3e2 100644 > --- a/rules/squashfs-tools.in > +++ b/rules/squashfs-tools.in > @@ -7,7 +7,6 @@ menuconfig SQUASHFS_TOOLS > select GCCLIBS_GCC_S > select ZLIB > select ZSTD if SQUASHFS_TOOLS_ZSTD_SUPPORT > - select ZSTD_LIBZSTD if SQUASHFS_TOOLS_ZSTD_SUPPORT > prompt "squashfs-tools " > help > Squashfs is a highly compressed read-only filesystem for Linux. > diff --git a/rules/zstd.in b/rules/zstd.in > index 3010ebda3ff7..b855c4e3ac4b 100644 > --- a/rules/zstd.in > +++ b/rules/zstd.in > @@ -15,23 +15,16 @@ menuconfig ZSTD > > if ZSTD > > -config ZSTD_LIBZSTD > - bool > - prompt "install zstd library" > - > config ZSTD_ZSTD > bool > - select ZSTD_LIBZSTD > prompt "install zstd tool" > > config ZSTD_ZSTDGREP > bool > - select ZSTD_LIBZSTD > prompt "install zstdgrep" > > config ZSTD_ZSTDLESS > bool > - select ZSTD_LIBZSTD > prompt "install zstdless" > > endif > diff --git a/rules/zstd.make b/rules/zstd.make > index 670fba739fee..3dfcf1d6d3f9 100644 > --- a/rules/zstd.make > +++ b/rules/zstd.make > @@ -39,7 +39,7 @@ ZSTD_CONF_OPT := \ > -DZSTD_BUILD_CONTRIB=OFF \ > -DZSTD_BUILD_TESTS=OFF \ > -DZSTD_USE_STATIC_RUNTIME=OFF \ > - -DZSTD_PROGRAMS_LINK_SHARED=OFF \ > + -DZSTD_PROGRAMS_LINK_SHARED=ON \ > -DZSTD_BUILD_STATIC=ON \ > -DZSTD_BUILD_SHARED=ON \ > -DZSTD_ZLIB_SUPPORT=OFF \ > @@ -59,9 +59,8 @@ $(STATEDIR)/zstd.targetinstall: > @$(call install_fixup, zstd, AUTHOR, "Florian Faber > <[email protected]>") > @$(call install_fixup, zstd, DESCRIPTION, missing) > > -ifdef PTXCONF_ZSTD_LIBZSTD > @$(call install_lib, zstd, 0, 0, 0644, libzstd) > -endif > + > ifdef PTXCONF_ZSTD_ZSTD > @$(call install_copy, zstd, 0, 0, 0755, -, /usr/bin/zstd) > @$(call install_link, zstd, zstd, /usr/bin/zstdcat) _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
