mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH 1/3] protobuf: version bump 3.6.1 -> 3.7.1
@ 2019-05-23 16:26 Clemens Gruber
  2019-05-23 16:26 ` [ptxdist] [PATCH 2/3] grpc: version bump 1.18.0 -> 1.21.0 Clemens Gruber
  2019-05-23 16:26 ` [ptxdist] [PATCH 3/3] mosh: add upstream patch to fix build error Clemens Gruber
  0 siblings, 2 replies; 3+ messages in thread
From: Clemens Gruber @ 2019-05-23 16:26 UTC (permalink / raw)
  To: ptxdist; +Cc: Clemens Gruber

The patch is no longer necessary.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 ...batomic-when-necessary-eg.-on-armv6l.patch | 58 -------------------
 patches/protobuf-all-3.6.1/autogen.sh         |  1 -
 patches/protobuf-all-3.6.1/series             |  4 --
 rules/protobuf.make                           |  4 +-
 4 files changed, 2 insertions(+), 65 deletions(-)
 delete mode 100644 patches/protobuf-all-3.6.1/0001-Link-to-libatomic-when-necessary-eg.-on-armv6l.patch
 delete mode 120000 patches/protobuf-all-3.6.1/autogen.sh
 delete mode 100644 patches/protobuf-all-3.6.1/series

diff --git a/patches/protobuf-all-3.6.1/0001-Link-to-libatomic-when-necessary-eg.-on-armv6l.patch b/patches/protobuf-all-3.6.1/0001-Link-to-libatomic-when-necessary-eg.-on-armv6l.patch
deleted file mode 100644
index 4ac4a9a56..000000000
--- a/patches/protobuf-all-3.6.1/0001-Link-to-libatomic-when-necessary-eg.-on-armv6l.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Ben Wolsieffer <benwolsieffer@gmail.com>
-Date: Thu, 4 Oct 2018 20:25:10 -0400
-Subject: [PATCH] Link to libatomic when necessary (eg. on armv6l)
-
----
- configure.ac    | 16 ++++++++++++++++
- src/Makefile.am |  4 ++--
- 2 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7d6682764950..56bbef6009af 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -165,6 +165,22 @@ AS_IF([test "$with_zlib" != no], [
- ])
- AM_CONDITIONAL([HAVE_ZLIB], [test $HAVE_ZLIB = 1])
- 
-+dnl On some platforms, std::atomic needs a helper library
-+AC_MSG_CHECKING(whether -latomic is needed)
-+AC_LINK_IFELSE([AC_LANG_SOURCE([[
-+  #include <atomic>
-+  #include <cstdint>
-+  std::atomic<std::int64_t> v;
-+  int main() {
-+    return v;
-+  }
-+]])], STD_ATOMIC_NEED_LIBATOMIC=no, STD_ATOMIC_NEED_LIBATOMIC=yes)
-+AC_MSG_RESULT($STD_ATOMIC_NEED_LIBATOMIC)
-+if test "x$STD_ATOMIC_NEED_LIBATOMIC" = xyes; then
-+  LIBATOMIC_LIBS="-latomic"
-+fi
-+AC_SUBST([LIBATOMIC_LIBS])
-+
- AS_IF([test "$with_protoc" != "no"], [
-   PROTOC=$with_protoc
-   AS_IF([test "$with_protoc" = "yes"], [
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 4bb77452f203..0a59b3147be8 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -163,7 +163,7 @@ nobase_include_HEADERS =                                         \
- 
- lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la
- 
--libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS)
-+libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS) $(LIBATOMIC_LIBS)
- libprotobuf_lite_la_LDFLAGS = -version-info 17:0:0 -export-dynamic -no-undefined
- if HAVE_LD_VERSION_SCRIPT
- libprotobuf_lite_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotobuf-lite.map
-@@ -209,7 +209,7 @@ libprotobuf_lite_la_SOURCES =                                  \
-   google/protobuf/io/zero_copy_stream.cc                       \
-   google/protobuf/io/zero_copy_stream_impl_lite.cc
- 
--libprotobuf_la_LIBADD = $(PTHREAD_LIBS)
-+libprotobuf_la_LIBADD = $(PTHREAD_LIBS) $(LIBATOMIC_LIBS)
- libprotobuf_la_LDFLAGS = -version-info 17:0:0 -export-dynamic -no-undefined
- if HAVE_LD_VERSION_SCRIPT
- libprotobuf_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotobuf.map
diff --git a/patches/protobuf-all-3.6.1/autogen.sh b/patches/protobuf-all-3.6.1/autogen.sh
deleted file mode 120000
index 9f8a4cb7d..000000000
--- a/patches/protobuf-all-3.6.1/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/protobuf-all-3.6.1/series b/patches/protobuf-all-3.6.1/series
deleted file mode 100644
index b238a9cca..000000000
--- a/patches/protobuf-all-3.6.1/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Link-to-libatomic-when-necessary-eg.-on-armv6l.patch
-# 9e36f76040f8c202ae5b588b48401b69  - git-ptx-patches magic
diff --git a/rules/protobuf.make b/rules/protobuf.make
index eae8aa1af..dd7b42386 100644
--- a/rules/protobuf.make
+++ b/rules/protobuf.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_PROTOBUF) += protobuf
 #
 # Paths and names
 #
-PROTOBUF_VERSION	:= 3.6.1
-PROTOBUF_MD5		:= d4c50a611ac6486c6433eb53e3f60d1f
+PROTOBUF_VERSION	:= 3.7.1
+PROTOBUF_MD5		:= cda6ae370a5df941f8aa837c8a0292ba
 PROTOBUF		:= protobuf-all-$(PROTOBUF_VERSION)
 PROTOBUF_SUFFIX		:= tar.gz
 PROTOBUF_URL		:= https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION)/$(PROTOBUF).$(PROTOBUF_SUFFIX)
-- 
2.21.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-05-23 16:26 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-23 16:26 [ptxdist] [PATCH 1/3] protobuf: version bump 3.6.1 -> 3.7.1 Clemens Gruber
2019-05-23 16:26 ` [ptxdist] [PATCH 2/3] grpc: version bump 1.18.0 -> 1.21.0 Clemens Gruber
2019-05-23 16:26 ` [ptxdist] [PATCH 3/3] mosh: add upstream patch to fix build error Clemens Gruber

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox