* [Buildroot] [PATCH] protobuf: fix musl build
@ 2017-04-27 20:19 Baruch Siach
2017-04-27 21:12 ` Mario Rugiero
2017-04-29 13:44 ` Thomas Petazzoni
0 siblings, 2 replies; 5+ messages in thread
From: Baruch Siach @ 2017-04-27 20:19 UTC (permalink / raw)
To: buildroot
Add upstream patch fixing conflict with musl defined major/minor macros.
Fixes:
http://autobuild.buildroot.net/results/fc5/fc5ea266eecb6ecab011ea3542f0bb680fb8fb3b/
http://autobuild.buildroot.net/results/3b3/3b3fe16978f19e65a6c6dc1712d72cb349eed0d5/
http://autobuild.buildroot.net/results/1da/1dac9d5e49342700036c90ed4785fff7398b8966/
Cc: Mario J. Rugiero <mrugiero@gmail.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
package/protobuf/protobuf.hash | 1 +
package/protobuf/protobuf.mk | 2 ++
2 files changed, 3 insertions(+)
diff --git a/package/protobuf/protobuf.hash b/package/protobuf/protobuf.hash
index 9ec6bc759d8f..8c2ade37e7cd 100644
--- a/package/protobuf/protobuf.hash
+++ b/package/protobuf/protobuf.hash
@@ -1,2 +1,3 @@
# Locally calculated
sha256 51d773e4297238b282eaa4c1dd317099675b12eef2b414732b851c00459225c6 protobuf-cpp-3.2.0.tar.gz
+sha256 da80c39838515913633f4cbd875fdd4ad711be95c83a50ff5096b9f1254033b3 416f90939d4de58fe1a4e2489120010313183291.patch
diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk
index a3e96d4f898c..610da8c04a94 100644
--- a/package/protobuf/protobuf.mk
+++ b/package/protobuf/protobuf.mk
@@ -19,6 +19,8 @@ PROTOBUF_CONF_OPTS = --with-protoc=$(HOST_DIR)/usr/bin/protoc
PROTOBUF_INSTALL_STAGING = YES
+PROTOBUF_PATCH = https://github.com/google/protobuf/commit/416f90939d4de58fe1a4e2489120010313183291.patch
+
ifeq ($(BR2_PACKAGE_ZLIB),y)
PROTOBUF_DEPENDENCIES += zlib
endif
--
2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] protobuf: fix musl build
2017-04-27 20:19 [Buildroot] [PATCH] protobuf: fix musl build Baruch Siach
@ 2017-04-27 21:12 ` Mario Rugiero
2017-04-28 6:24 ` Baruch Siach
2017-04-29 13:44 ` Thomas Petazzoni
1 sibling, 1 reply; 5+ messages in thread
From: Mario Rugiero @ 2017-04-27 21:12 UTC (permalink / raw)
To: buildroot
Looks good to me.
2017-04-27 17:19 GMT-03:00 Baruch Siach <baruch@tkos.co.il>:
> Add upstream patch fixing conflict with musl defined major/minor macros.
>
> Fixes:
> http://autobuild.buildroot.net/results/fc5/fc5ea266eecb6ecab011ea3542f0bb680fb8fb3b/
> http://autobuild.buildroot.net/results/3b3/3b3fe16978f19e65a6c6dc1712d72cb349eed0d5/
> http://autobuild.buildroot.net/results/1da/1dac9d5e49342700036c90ed4785fff7398b8966/
>
> Cc: Mario J. Rugiero <mrugiero@gmail.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
> package/protobuf/protobuf.hash | 1 +
> package/protobuf/protobuf.mk | 2 ++
> 2 files changed, 3 insertions(+)
>
> diff --git a/package/protobuf/protobuf.hash b/package/protobuf/protobuf.hash
> index 9ec6bc759d8f..8c2ade37e7cd 100644
> --- a/package/protobuf/protobuf.hash
> +++ b/package/protobuf/protobuf.hash
> @@ -1,2 +1,3 @@
> # Locally calculated
> sha256 51d773e4297238b282eaa4c1dd317099675b12eef2b414732b851c00459225c6 protobuf-cpp-3.2.0.tar.gz
> +sha256 da80c39838515913633f4cbd875fdd4ad711be95c83a50ff5096b9f1254033b3 416f90939d4de58fe1a4e2489120010313183291.patch
> diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk
> index a3e96d4f898c..610da8c04a94 100644
> --- a/package/protobuf/protobuf.mk
> +++ b/package/protobuf/protobuf.mk
> @@ -19,6 +19,8 @@ PROTOBUF_CONF_OPTS = --with-protoc=$(HOST_DIR)/usr/bin/protoc
>
> PROTOBUF_INSTALL_STAGING = YES
>
> +PROTOBUF_PATCH = https://github.com/google/protobuf/commit/416f90939d4de58fe1a4e2489120010313183291.patch
> +
> ifeq ($(BR2_PACKAGE_ZLIB),y)
> PROTOBUF_DEPENDENCIES += zlib
> endif
> --
> 2.11.0
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] protobuf: fix musl build
2017-04-27 21:12 ` Mario Rugiero
@ 2017-04-28 6:24 ` Baruch Siach
2017-04-28 13:45 ` Mario Rugiero
0 siblings, 1 reply; 5+ messages in thread
From: Baruch Siach @ 2017-04-28 6:24 UTC (permalink / raw)
To: buildroot
Hi Mario,
On Thu, Apr 27, 2017 at 06:12:14PM -0300, Mario Rugiero wrote:
> Looks good to me.
Thanks.
Care to send a formal Acked-by for patchwork to note?
baruch
> 2017-04-27 17:19 GMT-03:00 Baruch Siach <baruch@tkos.co.il>:
> > Add upstream patch fixing conflict with musl defined major/minor macros.
> >
> > Fixes:
> > http://autobuild.buildroot.net/results/fc5/fc5ea266eecb6ecab011ea3542f0bb680fb8fb3b/
> > http://autobuild.buildroot.net/results/3b3/3b3fe16978f19e65a6c6dc1712d72cb349eed0d5/
> > http://autobuild.buildroot.net/results/1da/1dac9d5e49342700036c90ed4785fff7398b8966/
> >
> > Cc: Mario J. Rugiero <mrugiero@gmail.com>
> > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> > ---
> > package/protobuf/protobuf.hash | 1 +
> > package/protobuf/protobuf.mk | 2 ++
> > 2 files changed, 3 insertions(+)
> >
> > diff --git a/package/protobuf/protobuf.hash b/package/protobuf/protobuf.hash
> > index 9ec6bc759d8f..8c2ade37e7cd 100644
> > --- a/package/protobuf/protobuf.hash
> > +++ b/package/protobuf/protobuf.hash
> > @@ -1,2 +1,3 @@
> > # Locally calculated
> > sha256 51d773e4297238b282eaa4c1dd317099675b12eef2b414732b851c00459225c6 protobuf-cpp-3.2.0.tar.gz
> > +sha256 da80c39838515913633f4cbd875fdd4ad711be95c83a50ff5096b9f1254033b3 416f90939d4de58fe1a4e2489120010313183291.patch
> > diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk
> > index a3e96d4f898c..610da8c04a94 100644
> > --- a/package/protobuf/protobuf.mk
> > +++ b/package/protobuf/protobuf.mk
> > @@ -19,6 +19,8 @@ PROTOBUF_CONF_OPTS = --with-protoc=$(HOST_DIR)/usr/bin/protoc
> >
> > PROTOBUF_INSTALL_STAGING = YES
> >
> > +PROTOBUF_PATCH = https://github.com/google/protobuf/commit/416f90939d4de58fe1a4e2489120010313183291.patch
> > +
> > ifeq ($(BR2_PACKAGE_ZLIB),y)
> > PROTOBUF_DEPENDENCIES += zlib
> > endif
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 5+ messages in thread* [Buildroot] [PATCH] protobuf: fix musl build
2017-04-28 6:24 ` Baruch Siach
@ 2017-04-28 13:45 ` Mario Rugiero
0 siblings, 0 replies; 5+ messages in thread
From: Mario Rugiero @ 2017-04-28 13:45 UTC (permalink / raw)
To: buildroot
2017-04-28 3:24 GMT-03:00 Baruch Siach <baruch@tkos.co.il>:
> Hi Mario,
>
> On Thu, Apr 27, 2017 at 06:12:14PM -0300, Mario Rugiero wrote:
>> Looks good to me.
>
> Thanks.
>
> Care to send a formal Acked-by for patchwork to note?
>
> baruch
>
>> 2017-04-27 17:19 GMT-03:00 Baruch Siach <baruch@tkos.co.il>:
>> > Add upstream patch fixing conflict with musl defined major/minor macros.
>> >
>> > Fixes:
>> > http://autobuild.buildroot.net/results/fc5/fc5ea266eecb6ecab011ea3542f0bb680fb8fb3b/
>> > http://autobuild.buildroot.net/results/3b3/3b3fe16978f19e65a6c6dc1712d72cb349eed0d5/
>> > http://autobuild.buildroot.net/results/1da/1dac9d5e49342700036c90ed4785fff7398b8966/
>> >
>> > Cc: Mario J. Rugiero <mrugiero@gmail.com>
>> > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
>> > ---
>> > package/protobuf/protobuf.hash | 1 +
>> > package/protobuf/protobuf.mk | 2 ++
>> > 2 files changed, 3 insertions(+)
>> >
>> > diff --git a/package/protobuf/protobuf.hash b/package/protobuf/protobuf.hash
>> > index 9ec6bc759d8f..8c2ade37e7cd 100644
>> > --- a/package/protobuf/protobuf.hash
>> > +++ b/package/protobuf/protobuf.hash
>> > @@ -1,2 +1,3 @@
>> > # Locally calculated
>> > sha256 51d773e4297238b282eaa4c1dd317099675b12eef2b414732b851c00459225c6 protobuf-cpp-3.2.0.tar.gz
>> > +sha256 da80c39838515913633f4cbd875fdd4ad711be95c83a50ff5096b9f1254033b3 416f90939d4de58fe1a4e2489120010313183291.patch
>> > diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk
>> > index a3e96d4f898c..610da8c04a94 100644
>> > --- a/package/protobuf/protobuf.mk
>> > +++ b/package/protobuf/protobuf.mk
>> > @@ -19,6 +19,8 @@ PROTOBUF_CONF_OPTS = --with-protoc=$(HOST_DIR)/usr/bin/protoc
>> >
>> > PROTOBUF_INSTALL_STAGING = YES
>> >
>> > +PROTOBUF_PATCH = https://github.com/google/protobuf/commit/416f90939d4de58fe1a4e2489120010313183291.patch
>> > +
>> > ifeq ($(BR2_PACKAGE_ZLIB),y)
>> > PROTOBUF_DEPENDENCIES += zlib
>> > endif
>
> --
> http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
> =}------------------------------------------------ooO--U--Ooo------------{=
> - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
Acked-by: Mario J. Rugiero <mrugiero@gmail.com>
Tested-by: Mario J. Rugiero <mrugiero@gmail.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] protobuf: fix musl build
2017-04-27 20:19 [Buildroot] [PATCH] protobuf: fix musl build Baruch Siach
2017-04-27 21:12 ` Mario Rugiero
@ 2017-04-29 13:44 ` Thomas Petazzoni
1 sibling, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2017-04-29 13:44 UTC (permalink / raw)
To: buildroot
Hello,
On Thu, 27 Apr 2017 23:19:08 +0300, Baruch Siach wrote:
> Add upstream patch fixing conflict with musl defined major/minor macros.
>
> Fixes:
> http://autobuild.buildroot.net/results/fc5/fc5ea266eecb6ecab011ea3542f0bb680fb8fb3b/
> http://autobuild.buildroot.net/results/3b3/3b3fe16978f19e65a6c6dc1712d72cb349eed0d5/
> http://autobuild.buildroot.net/results/1da/1dac9d5e49342700036c90ed4785fff7398b8966/
>
> Cc: Mario J. Rugiero <mrugiero@gmail.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
> package/protobuf/protobuf.hash | 1 +
> package/protobuf/protobuf.mk | 2 ++
> 2 files changed, 3 insertions(+)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-04-29 13:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-27 20:19 [Buildroot] [PATCH] protobuf: fix musl build Baruch Siach
2017-04-27 21:12 ` Mario Rugiero
2017-04-28 6:24 ` Baruch Siach
2017-04-28 13:45 ` Mario Rugiero
2017-04-29 13:44 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox