Re: CVS commit: pkgsrc/net/libsoup

[Juraj LUTTER <otis%NetBSD.org@localhost>]

Hi,

[builder@sosbuild02 ~/pkgsrc/net/libsoup]$ cvs diff Makefile
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/libsoup/Makefile,v
retrieving revision 1.53
diff -u -p -r1.53 Makefile
--- Makefile    18 Aug 2019 08:13:30 -0000      1.53
+++ Makefile    19 Aug 2019 19:47:17 -0000
@@ -23,6 +23,8 @@ MAKE_ENV+=            LD_LIBRARY_PATH=${WRKSRC}/ou
 # disable vala detection
 MESON_ARGS+=           -Dvapi=false

+LDFLAGS.SunOS+=                -lsocket
+
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)


[builder@sosbuild02 ~/pkgsrc/net/libsoup/patches]$ cat patch-meson.build
$NetBSD$

--- meson.build.orig    2019-08-19 19:41:36.080576330 +0000
+++ meson.build
@@ -31,6 +31,11 @@ default_source_flag = [

 add_project_arguments(default_source_flag, language: 'c')

+# Needed for build on SmartOS
+if host_system == 'sunos'
+      add_project_arguments('-D__EXTENSIONS__', language: 'c')
+endif
+
 common_flags = [
   '-DHAVE_CONFIG_H',
 ]

like this?

otis

—
Juraj Lutter
URL:  http://www.wilbury.sk/
XMPP: juraj%lutter.sk@localhost
Do not hesitate to inquiry for professional services!

> On 18 Aug 2019, at 23:50, Thomas Klausner <wiz%netbsd.org@localhost> wrote:
> 
> I have no idea about that define. Can you make it conditional on SunOS
> just to be on the safe side?
> Thomas
> 
> On Sun, Aug 18, 2019 at 11:30:07PM +0200, Juraj LUTTER wrote:
>> Hi,
>> 
>> One more note:
>> 
>> For successul build on SmartOS, __EXTENSIONS__ have to be defined. I have a patch for this:
>> 
>> $NetBSD$
>> 
>> --- meson.build.orig    2019-05-15 13:36:29.000000000 +0000
>> +++ meson.build
>> @@ -31,6 +31,8 @@ default_source_flag = [
>> 
>> add_project_arguments(default_source_flag, language: 'c')
>> 
>> +add_project_arguments('-D__EXTENSIONS__', language: 'c')
>> +
>> common_flags = [
>>   '-DHAVE_CONFIG_H',
>> ]
>> 
>> Is it OK to commit this?
>> 
>> thx
>> 
>> —
>> Juraj Lutter
>> URL:  http://www.wilbury.sk/
>> XMPP: juraj%lutter.sk@localhost
>> Do not hesitate to inquiry for professional services!
>> 
>>> On 17 Aug 2019, at 17:03, Juraj Lutter <otis%NetBSD.org@localhost> wrote:
>>> 
>>> Hi,
>>> 
>>> for me, only one change:
>>> 
>>> On Sat, Aug 17, 2019 at 04:50:54PM +0200, Leonardo Taccari wrote:
>>>>> .if !empty(PKG_OPTIONS:Mgssapi)
>>>>> .  include "../../mk/krb5.buildlink3.mk"
>>>>> -CONFIGURE_ARGS+= --with-gssapi
>>>>> -CONFIGURE_ARGS+= --with-krb5-config=${KRB5_CONFIG}
>>>>> -.else
>>>>> -CONFIGURE_ARGS+= --without-gssapi
>>>>> .endif
>>>>> 
>>>> 
>>>> Should this be adjusted to, for `gssapi' enabled:
>>>> 
>>> 
>>> 
>>>> MESON_ARGS+=       -Dgssapi=true
>>>> MESON_ARGS+=       -Dkrb5_config=${KRB5_CONFIG}
>>> 
>>> Move these two into ".if !empty(PKG_OPTIONS:Mgssapi)" section so gssapi will be
>>> explicitly enabled or disabled.
>>> 
>>>> 
>>>> ...and whe the `.else' code path:
>>>> 
>>>> MESON_ARGS+=       -Dgssapi=false
>>>> 
>>>> Also, it seems that now upstream enable `gssapi' by default and for ~24
>>>> hours or so on some platforms libsoup could be accidentally built with
>>>> it enabled despide the empty PKG_SUGGESTED_OPTIONS or user's `-gssapi'.
>>>> 
>>>> Should we also adjust PKG_SUGGESTED_OPTIONS or is it better to keep it
>>>> as is (in that case, to be on the safe side, I think that a PKGREVISION
>>>> bump is needed and probably also a revbmup for libsoup).
>>>> 
>>>> 
>>>> Thank you!
>>> 
>>> -- 
>>> Juraj Lutter <otis%NetBSD.org@localhost>
>>> pkgsrc committer
>>