From dd60555cd3030e0b42a8b6eea2161308433f7c7a Mon Sep 17 00:00:00 2001
From: Alex Kiernan <alex.kiernan@gmail.com>
Date: Thu, 1 Aug 2019 14:42:45 +0100
Subject: zstd: Update 1.4.0 -> 1.4.2

Also drop zstd-<variants> and add PACKAGECONFIG support for build options

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-extended/zstd/zstd_1.4.0.bb | 50 -----------------------------
 meta-oe/recipes-extended/zstd/zstd_1.4.2.bb | 35 ++++++++++++++++++++
 2 files changed, 35 insertions(+), 50 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/zstd/zstd_1.4.0.bb
 create mode 100644 meta-oe/recipes-extended/zstd/zstd_1.4.2.bb

(limited to 'meta-oe')

diff --git a/meta-oe/recipes-extended/zstd/zstd_1.4.0.bb b/meta-oe/recipes-extended/zstd/zstd_1.4.0.bb
deleted file mode 100644
index 06357da956..0000000000
--- a/meta-oe/recipes-extended/zstd/zstd_1.4.0.bb
+++ /dev/null
@@ -1,50 +0,0 @@
-SUMMARY = "Zstandard - Fast real-time compression algorithm"
-DESCRIPTION = "Zstandard is a fast lossless compression algorithm, targeting \
-real-time compression scenarios at zlib-level and better compression ratios. \
-It's backed by a very fast entropy stage, provided by Huff0 and FSE library."
-HOMEPAGE = "http://www.zstd.net/"
-SECTION = "console/utils"
-
-LICENSE = "BSD-3-Clause & GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \
-                    file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0"
-
-SRC_URI = "git://github.com/facebook/zstd.git;nobranch=1"
-
-SRCREV = "83b51e9f886be7c2a4d477b6e7bc6db831791d8d"
-UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
-
-S = "${WORKDIR}/git"
-
-do_compile () {
-    oe_runmake
-    oe_runmake -C programs zstd-compress zstd-decompress zstd-frugal
-}
-
-do_install () {
-    oe_runmake install 'DESTDIR=${D}'
-    install -d -m 0755 ${D}${bindir}
-    install -m 0755 ${S}/programs/zstd-compress ${D}${bindir}
-    install -m 0755 ${S}/programs/zstd-decompress ${D}${bindir}
-    install -m 0755 ${S}/programs/zstd-frugal ${D}${bindir}
-}
-
-PACKAGE_BEFORE_PN += " \
-    ${PN}-compress \
-    ${PN}-decompress \
-    ${PN}-frugal \
-"
-
-FILES_${PN}-compress = " \
-    ${bindir}/zstd-compress \
-"
-
-FILES_${PN}-decompress = " \
-    ${bindir}/zstd-decompress \
-"
-
-FILES_${PN}-frugal = " \
-    ${bindir}/zstd-frugal \
-"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-extended/zstd/zstd_1.4.2.bb b/meta-oe/recipes-extended/zstd/zstd_1.4.2.bb
new file mode 100644
index 0000000000..b5d95d940b
--- /dev/null
+++ b/meta-oe/recipes-extended/zstd/zstd_1.4.2.bb
@@ -0,0 +1,35 @@
+SUMMARY = "Zstandard - Fast real-time compression algorithm"
+DESCRIPTION = "Zstandard is a fast lossless compression algorithm, targeting \
+real-time compression scenarios at zlib-level and better compression ratios. \
+It's backed by a very fast entropy stage, provided by Huff0 and FSE library."
+HOMEPAGE = "http://www.zstd.net/"
+SECTION = "console/utils"
+
+LICENSE = "BSD-3-Clause & GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \
+                    file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0"
+
+SRC_URI = "git://github.com/facebook/zstd.git;nobranch=1"
+
+SRCREV = "ff304e9e65e7cde17a637eea190a874c26c48634"
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
+
+S = "${WORKDIR}/git"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[lz4] = "HAVE_LZ4=1,HAVE_LZ4=0,lz4"
+PACKAGECONFIG[lzma] = "HAVE_LZMA=1,HAVE_LZMA=0,xz"
+PACKAGECONFIG[zlib] = "HAVE_ZLIB=1,HAVE_ZLIB=0,zlib"
+
+# See programs/README.md for how to use this
+ZSTD_LEGACY_SUPPORT ??= "4"
+
+do_compile () {
+    oe_runmake ${PACKAGECONFIG_CONFARGS} ZSTD_LEGACY_SUPPORT=${ZSTD_LEGACY_SUPPORT}
+}
+
+do_install () {
+    oe_runmake install 'DESTDIR=${D}'
+}
+
+BBCLASSEXTEND = "native nativesdk"
-- 
cgit v1.2.3-54-g00ecf