diff mbox

[1/1] libwebsockets: add option to enable/disable ipv6 support

Message ID 816992ffccd84eb3bdfaa89a699d1610@LysExc01.nanotronic.local
State Changes Requested
Headers show

Commit Message

Andreas Wetzel Sept. 23, 2015, 2:43 p.m. UTC
Hi Vincente,

Please find the corrected (with tabs) patch in the attachment.

Regards,
Andi

Comments

Vicente Olivert Riera Sept. 23, 2015, 2:51 p.m. UTC | #1
Dear Wetzel Andreas,

thanks for fixing the issue.

On 09/23/2015 03:43 PM, Wetzel Andreas wrote:
> Hi Vincente,
> 
> Please find the corrected (with tabs) patch in the attachment.

why don't you send the v2 of your patch using git send-email? The
Buildroot project strongly prefers patches to be sent using git
send-email. It easier for everyone to review them and also for the
maintainer to apply them.

Regards,

Vincent.

> 
> Regards,
> Andi
> 
> ________________________________________
> From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> Sent: Wednesday, September 23, 2015 16:08
> To: Wetzel Andreas
> Cc: buildroot
> Subject: Re: [Buildroot] [PATCH 1/1] libwebsockets: add option to enable/disable ipv6 support
> 
> Dear Andreas Wetzel,
> 
> On 09/23/2015 02:16 PM, Andreas Wetzel wrote:
>> Added configuration option BR2_PACKAGE_LIBWEBSOCKETS_IPV6 that
>> adds -DLWS_IPV6=ON/OFF to LIBWEBSOCKETS_CONF_OPTS.
>>
>> Signed-off-by: Andreas Wetzel <andreas.wetzel@nanotronic.ch>
>> ---
>>  package/libwebsockets/Config.in        | 7 +++++++
>>  package/libwebsockets/libwebsockets.mk | 8 +++++++-
>>  2 files changed, 14 insertions(+), 1 deletion(-)
>>
>> diff --git a/package/libwebsockets/Config.in b/package/libwebsockets/Config.in
>> index 2b350bf..e3c7eea 100644
>> --- a/package/libwebsockets/Config.in
>> +++ b/package/libwebsockets/Config.in
>> @@ -8,3 +8,10 @@ config BR2_PACKAGE_LIBWEBSOCKETS
>>         in both directions.
>>
>>         http://libwebsockets.org/
>> +
>> +if BR2_PACKAGE_LIBWEBSOCKETS
>> +
>> +config BR2_PACKAGE_LIBWEBSOCKETS_IPV6
>> +    bool "Compile with support for ipv6"
> 
> please use tabs for indentation, not spaces.
> 
> Regards,
> 
> Vincent.
> 
>> +
>> +endif
>> diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk
>> index 2f83748..f4a3db2 100644
>> --- a/package/libwebsockets/libwebsockets.mk
>> +++ b/package/libwebsockets/libwebsockets.mk
>> @@ -11,7 +11,7 @@ LIBWEBSOCKETS_LICENSE = LGPLv2.1 with exceptions
>>  LIBWEBSOCKETS_LICENSE_FILES = LICENSE
>>  LIBWEBSOCKETS_DEPENDENCIES = zlib
>>  LIBWEBSOCKETS_INSTALL_STAGING = YES
>> -LIBWEBSOCKETS_CONF_OPTS = -DLWS_WITHOUT_TESTAPPS=ON -DLWS_IPV6=ON
>> +LIBWEBSOCKETS_CONF_OPTS = -DLWS_WITHOUT_TESTAPPS=ON
>>
>>  ifeq ($(BR2_PACKAGE_OPENSSL),y)
>>  LIBWEBSOCKETS_DEPENDENCIES += openssl host-openssl
>> @@ -20,4 +20,10 @@ else
>>  LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_SSL=OFF
>>  endif
>>
>> +ifeq ($(BR2_PACKAGE_LIBWEBSOCKETS_IPV6),y)
>> +LIBWEBSOCKETS_CONF_OPTS += -DLWS_IPV6=ON
>> +else
>> +LIBWEBSOCKETS_CONF_OPTS += -DLWS_IPV6=OFF
>> +endif
>> +
>>  $(eval $(cmake-package))
>>
> 
>
Andreas Wetzel Sept. 23, 2015, 3:12 p.m. UTC | #2
Hi Vincente,

I thought about using git send-email again. But then favoured a reply to have the history included in the mail body. Sorry for that.

Next time I will use git send-email again. I don't like our outlook webmail anyway :)

Regards,
Andi
Vicente Olivert Riera Sept. 23, 2015, 3:42 p.m. UTC | #3
Dear Wetzel Andreas,

On 09/23/2015 04:12 PM, Wetzel Andreas wrote:
> Hi Vincente,
> 
> I thought about using git send-email again. But then favoured a reply to have the history included in the mail body. Sorry for that.
> 
> Next time I will use git send-email again. I don't like our outlook webmail anyway :)

Nobody will do it for you, so I suggest you to send the v2 using send
email. That's what I would do if I were you :P

Regards,

Vincent.

> 
> Regards,
> Andi
> 
> ________________________________________
> From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> Sent: Wednesday, September 23, 2015 16:51
> To: Wetzel Andreas
> Cc: buildroot
> Subject: Re: [Buildroot] [PATCH 1/1] libwebsockets: add option to enable/disable ipv6 support
> 
> Dear Wetzel Andreas,
> 
> thanks for fixing the issue.
> 
> On 09/23/2015 03:43 PM, Wetzel Andreas wrote:
>> Hi Vincente,
>>
>> Please find the corrected (with tabs) patch in the attachment.
> 
> why don't you send the v2 of your patch using git send-email? The
> Buildroot project strongly prefers patches to be sent using git
> send-email. It easier for everyone to review them and also for the
> maintainer to apply them.
> 
> Regards,
> 
> Vincent.
> 
>>
>> Regards,
>> Andi
>>
>> ________________________________________
>> From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
>> Sent: Wednesday, September 23, 2015 16:08
>> To: Wetzel Andreas
>> Cc: buildroot
>> Subject: Re: [Buildroot] [PATCH 1/1] libwebsockets: add option to enable/disable ipv6 support
>>
>> Dear Andreas Wetzel,
>>
>> On 09/23/2015 02:16 PM, Andreas Wetzel wrote:
>>> Added configuration option BR2_PACKAGE_LIBWEBSOCKETS_IPV6 that
>>> adds -DLWS_IPV6=ON/OFF to LIBWEBSOCKETS_CONF_OPTS.
>>>
>>> Signed-off-by: Andreas Wetzel <andreas.wetzel@nanotronic.ch>
>>> ---
>>>  package/libwebsockets/Config.in        | 7 +++++++
>>>  package/libwebsockets/libwebsockets.mk | 8 +++++++-
>>>  2 files changed, 14 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/package/libwebsockets/Config.in b/package/libwebsockets/Config.in
>>> index 2b350bf..e3c7eea 100644
>>> --- a/package/libwebsockets/Config.in
>>> +++ b/package/libwebsockets/Config.in
>>> @@ -8,3 +8,10 @@ config BR2_PACKAGE_LIBWEBSOCKETS
>>>         in both directions.
>>>
>>>         http://libwebsockets.org/
>>> +
>>> +if BR2_PACKAGE_LIBWEBSOCKETS
>>> +
>>> +config BR2_PACKAGE_LIBWEBSOCKETS_IPV6
>>> +    bool "Compile with support for ipv6"
>>
>> please use tabs for indentation, not spaces.
>>
>> Regards,
>>
>> Vincent.
>>
>>> +
>>> +endif
>>> diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk
>>> index 2f83748..f4a3db2 100644
>>> --- a/package/libwebsockets/libwebsockets.mk
>>> +++ b/package/libwebsockets/libwebsockets.mk
>>> @@ -11,7 +11,7 @@ LIBWEBSOCKETS_LICENSE = LGPLv2.1 with exceptions
>>>  LIBWEBSOCKETS_LICENSE_FILES = LICENSE
>>>  LIBWEBSOCKETS_DEPENDENCIES = zlib
>>>  LIBWEBSOCKETS_INSTALL_STAGING = YES
>>> -LIBWEBSOCKETS_CONF_OPTS = -DLWS_WITHOUT_TESTAPPS=ON -DLWS_IPV6=ON
>>> +LIBWEBSOCKETS_CONF_OPTS = -DLWS_WITHOUT_TESTAPPS=ON
>>>
>>>  ifeq ($(BR2_PACKAGE_OPENSSL),y)
>>>  LIBWEBSOCKETS_DEPENDENCIES += openssl host-openssl
>>> @@ -20,4 +20,10 @@ else
>>>  LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_SSL=OFF
>>>  endif
>>>
>>> +ifeq ($(BR2_PACKAGE_LIBWEBSOCKETS_IPV6),y)
>>> +LIBWEBSOCKETS_CONF_OPTS += -DLWS_IPV6=ON
>>> +else
>>> +LIBWEBSOCKETS_CONF_OPTS += -DLWS_IPV6=OFF
>>> +endif
>>> +
>>>  $(eval $(cmake-package))
>>>
>>
>>
> 
>
diff mbox

Patch

From c3d55dd79fa0a0f522287501a6af4df78ad185b0 Mon Sep 17 00:00:00 2001
From: Andreas Wetzel <andreas.wetzel@nanotronic.ch>
Date: Wed, 23 Sep 2015 15:11:58 +0200
Subject: [PATCH 1/1] libwebsockets: add option to enable/disable ipv6 support

Added configuration option BR2_PACKAGE_LIBWEBSOCKETS_IPV6 that
adds -DLWS_IPV6=ON/OFF to LIBWEBSOCKETS_CONF_OPTS.

Signed-off-by: Andreas Wetzel <andreas.wetzel@nanotronic.ch>
---
 package/libwebsockets/Config.in        | 7 +++++++
 package/libwebsockets/libwebsockets.mk | 8 +++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/package/libwebsockets/Config.in b/package/libwebsockets/Config.in
index 2b350bf..f48e859 100644
--- a/package/libwebsockets/Config.in
+++ b/package/libwebsockets/Config.in
@@ -8,3 +8,10 @@  config BR2_PACKAGE_LIBWEBSOCKETS
 	  in both directions.
 
 	  http://libwebsockets.org/
+
+if BR2_PACKAGE_LIBWEBSOCKETS
+
+config BR2_PACKAGE_LIBWEBSOCKETS_IPV6
+	bool "Compile with support for ipv6"
+
+endif
diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk
index 2f83748..f4a3db2 100644
--- a/package/libwebsockets/libwebsockets.mk
+++ b/package/libwebsockets/libwebsockets.mk
@@ -11,7 +11,7 @@  LIBWEBSOCKETS_LICENSE = LGPLv2.1 with exceptions
 LIBWEBSOCKETS_LICENSE_FILES = LICENSE
 LIBWEBSOCKETS_DEPENDENCIES = zlib
 LIBWEBSOCKETS_INSTALL_STAGING = YES
-LIBWEBSOCKETS_CONF_OPTS = -DLWS_WITHOUT_TESTAPPS=ON -DLWS_IPV6=ON
+LIBWEBSOCKETS_CONF_OPTS = -DLWS_WITHOUT_TESTAPPS=ON
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 LIBWEBSOCKETS_DEPENDENCIES += openssl host-openssl
@@ -20,4 +20,10 @@  else
 LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_SSL=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_LIBWEBSOCKETS_IPV6),y)
+LIBWEBSOCKETS_CONF_OPTS += -DLWS_IPV6=ON
+else
+LIBWEBSOCKETS_CONF_OPTS += -DLWS_IPV6=OFF
+endif
+
 $(eval $(cmake-package))
-- 
2.1.4