* [meta-oe][PATCH] leveldb: update to 1.20
@ 2017-06-02 8:04 Pascal Bach
2017-06-02 15:06 ` Khem Raj
0 siblings, 1 reply; 2+ messages in thread
From: Pascal Bach @ 2017-06-02 8:04 UTC (permalink / raw)
To: openembedded-devel
The tmalloc patch went upstream in the meantime
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
---
.../leveldb/0001-Explicitly-disable-tcmalloc.patch | 48 ----------------------
meta-oe/recipes-extended/leveldb/leveldb_git.bb | 8 ++--
2 files changed, 3 insertions(+), 53 deletions(-)
delete mode 100644 meta-oe/recipes-extended/leveldb/leveldb/0001-Explicitly-disable-tcmalloc.patch
diff --git a/meta-oe/recipes-extended/leveldb/leveldb/0001-Explicitly-disable-tcmalloc.patch b/meta-oe/recipes-extended/leveldb/leveldb/0001-Explicitly-disable-tcmalloc.patch
deleted file mode 100644
index 4b76dd0..0000000
--- a/meta-oe/recipes-extended/leveldb/leveldb/0001-Explicitly-disable-tcmalloc.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From d6daac04dab4b3acf4b88f16742d1b402cdc3d83 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Wed, 1 Oct 2014 18:54:04 +0200
-Subject: [PATCH] Explicitly disable tcmalloc
-
-Without this change leveldb autodetects tcmalloc from sysroot and
-sometimes became dependant on gperftools
-
-Disable autodetection without TCMALLOC_ENABLED=true pased to make
-
-Upstream-Status: Pending
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- build_detect_platform | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/build_detect_platform b/build_detect_platform
-index bb76c4f..a586364 100755
---- a/build_detect_platform
-+++ b/build_detect_platform
-@@ -201,15 +201,17 @@ EOF
- PLATFORM_LIBS="$PLATFORM_LIBS -lsnappy"
- fi
-
-- # Test whether tcmalloc is available
-- $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -ltcmalloc 2>/dev/null <<EOF
-- int main() {}
-+ if [ "$TCMALLOC_ENABLED" = "true" ]; then
-+ # Test whether tcmalloc is available
-+ $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -ltcmalloc 2>/dev/null <<EOF
-+ int main() {}
- EOF
-- if [ "$?" = 0 ]; then
-- PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc"
-- fi
-+ if [ "$?" = 0 ]; then
-+ PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc"
-+ fi
-
-- rm -f $CXXOUTPUT 2>/dev/null
-+ rm -f $CXXOUTPUT 2>/dev/null
-+ fi
- fi
-
- PLATFORM_CCFLAGS="$PLATFORM_CCFLAGS $COMMON_FLAGS"
---
-2.1.1
-
diff --git a/meta-oe/recipes-extended/leveldb/leveldb_git.bb b/meta-oe/recipes-extended/leveldb/leveldb_git.bb
index a6a3024..8c66055 100644
--- a/meta-oe/recipes-extended/leveldb/leveldb_git.bb
+++ b/meta-oe/recipes-extended/leveldb/leveldb_git.bb
@@ -4,12 +4,10 @@ HOMEPAGE = "http://leveldb.googlecode.com"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=92d1b128950b11ba8495b64938fc164d"
-SRCREV = "803d69203a62faf50f1b77897310a3a1fcae712b"
-PV = "1.18+git${SRCPV}"
+SRCREV = "a53934a3ae1244679f812d998a4f16f2c7f309a6"
+PV = "1.20+git${SRCPV}"
-SRC_URI = "git://github.com/google/${BPN}.git \
- file://0001-Explicitly-disable-tcmalloc.patch \
-"
+SRC_URI = "git://github.com/google/${BPN}.git"
S = "${WORKDIR}/git"
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [meta-oe][PATCH] leveldb: update to 1.20
2017-06-02 8:04 [meta-oe][PATCH] leveldb: update to 1.20 Pascal Bach
@ 2017-06-02 15:06 ` Khem Raj
0 siblings, 0 replies; 2+ messages in thread
From: Khem Raj @ 2017-06-02 15:06 UTC (permalink / raw)
To: Pascal Bach; +Cc: openembeded-devel
Pascal
I sent a patch to upgrade to 1.20 yesterday
http://lists.openembedded.org/pipermail/openembedded-devel/2017-June/113003.html
with additional packaging changes as well.
On Fri, Jun 2, 2017 at 1:04 AM, Pascal Bach <pascal.bach@siemens.com> wrote:
> The tmalloc patch went upstream in the meantime
>
> Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
> ---
> .../leveldb/0001-Explicitly-disable-tcmalloc.patch | 48 ----------------------
> meta-oe/recipes-extended/leveldb/leveldb_git.bb | 8 ++--
> 2 files changed, 3 insertions(+), 53 deletions(-)
> delete mode 100644 meta-oe/recipes-extended/leveldb/leveldb/0001-Explicitly-disable-tcmalloc.patch
>
> diff --git a/meta-oe/recipes-extended/leveldb/leveldb/0001-Explicitly-disable-tcmalloc.patch b/meta-oe/recipes-extended/leveldb/leveldb/0001-Explicitly-disable-tcmalloc.patch
> deleted file mode 100644
> index 4b76dd0..0000000
> --- a/meta-oe/recipes-extended/leveldb/leveldb/0001-Explicitly-disable-tcmalloc.patch
> +++ /dev/null
> @@ -1,48 +0,0 @@
> -From d6daac04dab4b3acf4b88f16742d1b402cdc3d83 Mon Sep 17 00:00:00 2001
> -From: Martin Jansa <Martin.Jansa@gmail.com>
> -Date: Wed, 1 Oct 2014 18:54:04 +0200
> -Subject: [PATCH] Explicitly disable tcmalloc
> -
> -Without this change leveldb autodetects tcmalloc from sysroot and
> -sometimes became dependant on gperftools
> -
> -Disable autodetection without TCMALLOC_ENABLED=true pased to make
> -
> -Upstream-Status: Pending
> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ----
> - build_detect_platform | 16 +++++++++-------
> - 1 file changed, 9 insertions(+), 7 deletions(-)
> -
> -diff --git a/build_detect_platform b/build_detect_platform
> -index bb76c4f..a586364 100755
> ---- a/build_detect_platform
> -+++ b/build_detect_platform
> -@@ -201,15 +201,17 @@ EOF
> - PLATFORM_LIBS="$PLATFORM_LIBS -lsnappy"
> - fi
> -
> -- # Test whether tcmalloc is available
> -- $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -ltcmalloc 2>/dev/null <<EOF
> -- int main() {}
> -+ if [ "$TCMALLOC_ENABLED" = "true" ]; then
> -+ # Test whether tcmalloc is available
> -+ $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -ltcmalloc 2>/dev/null <<EOF
> -+ int main() {}
> - EOF
> -- if [ "$?" = 0 ]; then
> -- PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc"
> -- fi
> -+ if [ "$?" = 0 ]; then
> -+ PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc"
> -+ fi
> -
> -- rm -f $CXXOUTPUT 2>/dev/null
> -+ rm -f $CXXOUTPUT 2>/dev/null
> -+ fi
> - fi
> -
> - PLATFORM_CCFLAGS="$PLATFORM_CCFLAGS $COMMON_FLAGS"
> ---
> -2.1.1
> -
> diff --git a/meta-oe/recipes-extended/leveldb/leveldb_git.bb b/meta-oe/recipes-extended/leveldb/leveldb_git.bb
> index a6a3024..8c66055 100644
> --- a/meta-oe/recipes-extended/leveldb/leveldb_git.bb
> +++ b/meta-oe/recipes-extended/leveldb/leveldb_git.bb
> @@ -4,12 +4,10 @@ HOMEPAGE = "http://leveldb.googlecode.com"
> LICENSE = "BSD-3-Clause"
> LIC_FILES_CHKSUM = "file://LICENSE;md5=92d1b128950b11ba8495b64938fc164d"
>
> -SRCREV = "803d69203a62faf50f1b77897310a3a1fcae712b"
> -PV = "1.18+git${SRCPV}"
> +SRCREV = "a53934a3ae1244679f812d998a4f16f2c7f309a6"
> +PV = "1.20+git${SRCPV}"
>
> -SRC_URI = "git://github.com/google/${BPN}.git \
> - file://0001-Explicitly-disable-tcmalloc.patch \
> -"
> +SRC_URI = "git://github.com/google/${BPN}.git"
>
> S = "${WORKDIR}/git"
>
> --
> 2.1.4
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-06-02 15:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-02 8:04 [meta-oe][PATCH] leveldb: update to 1.20 Pascal Bach
2017-06-02 15:06 ` Khem Raj
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.