All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v4 1/2] package/libargon2: conditionally shared/static build
@ 2026-05-18 22:02 Andreas Mohr via buildroot
  2026-05-18 22:02 ` [Buildroot] [PATCH v4 2/2] package/libargon2: fix pkgconfig version string Andreas Mohr via buildroot
  2026-05-19  3:20 ` [Buildroot] [PATCH v4 1/2] package/libargon2: conditionally shared/static build Baruch Siach via buildroot
  0 siblings, 2 replies; 7+ messages in thread
From: Andreas Mohr via buildroot @ 2026-05-18 22:02 UTC (permalink / raw)
  To: buildroot; +Cc: Pascal de Bruijn

Add static build support of libargon2.
This will allow dependent packages like cryptsetup to build static as well.

Signed-off-by: Andreas Mohr <and@gmx.li>
---
 package/libargon2/Config.in    | 5 -----
 package/libargon2/libargon2.mk | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package/libargon2/Config.in b/package/libargon2/Config.in
index 6bba74cf..73c1e0d7 100644
--- a/package/libargon2/Config.in
+++ b/package/libargon2/Config.in
@@ -1,12 +1,7 @@
 config BR2_PACKAGE_LIBARGON2
 	bool "libargon2"
 	depends on BR2_USE_MMU
-	depends on !BR2_STATIC_LIBS
 	help
 	  A modern password hashing algorithm
 
 	  https://password-hashing.net/#argon2
-
-comment "libargon needs a toolchain w/ dynamic library"
-	depends on BR2_USE_MMU
-	depends on BR2_STATIC_LIBS
diff --git a/package/libargon2/libargon2.mk b/package/libargon2/libargon2.mk
index b3f6e1b2..8ca0071a 100644
--- a/package/libargon2/libargon2.mk
+++ b/package/libargon2/libargon2.mk
@@ -23,6 +23,12 @@ ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
 LIBARGON2_OPTS += NO_THREADS=1
 endif
 
+ifeq ($(BR2_STATIC_LIBS),y)
+LIBARGON2_OPTS += LIB_SH= LINKED_LIB_SH=
+else ifeq ($(BR2_SHARED_LIBS),y)
+LIBARGON2_OPTS += LIB_ST=
+endif
+
 define LIBARGON2_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
 		$(LIBARGON2_OPTS)
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

* [Buildroot] [PATCH v4 2/2] package/libargon2: fix pkgconfig version string
  2026-05-18 22:02 [Buildroot] [PATCH v4 1/2] package/libargon2: conditionally shared/static build Andreas Mohr via buildroot
@ 2026-05-18 22:02 ` Andreas Mohr via buildroot
  2026-05-20 19:28   ` Arnout Vandecappelle via buildroot
  2026-05-29  8:30   ` Thomas Perale via buildroot
  2026-05-19  3:20 ` [Buildroot] [PATCH v4 1/2] package/libargon2: conditionally shared/static build Baruch Siach via buildroot
  1 sibling, 2 replies; 7+ messages in thread
From: Andreas Mohr via buildroot @ 2026-05-18 22:02 UTC (permalink / raw)
  To: buildroot; +Cc: Pascal de Bruijn

Current build generated pkgconfig/libargon2.pc has wrong version string.
    Version: ZERO

Signed-off-by: Andreas Mohr <and@gmx.li>
---
 package/libargon2/libargon2.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libargon2/libargon2.mk b/package/libargon2/libargon2.mk
index 8ca0071a..e968aa08 100644
--- a/package/libargon2/libargon2.mk
+++ b/package/libargon2/libargon2.mk
@@ -11,6 +11,7 @@ LIBARGON2_LICENSE_FILES = LICENSE
 LIBARGON2_INSTALL_STAGING = YES
 
 LIBARGON2_OPTS = LIBRARY_REL=lib
+LIBARGON2_OPTS += ARGON2_VERSION=$(LIBARGON2_VERSION)
 
 # GCC_TARGET_ARCH is not defined for all architectures, but libargon2
 # only uses it to detect if some x86 optimizations can be used, and
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

* Re: [Buildroot] [PATCH v4 1/2] package/libargon2: conditionally shared/static build
  2026-05-18 22:02 [Buildroot] [PATCH v4 1/2] package/libargon2: conditionally shared/static build Andreas Mohr via buildroot
  2026-05-18 22:02 ` [Buildroot] [PATCH v4 2/2] package/libargon2: fix pkgconfig version string Andreas Mohr via buildroot
@ 2026-05-19  3:20 ` Baruch Siach via buildroot
  2026-05-19 18:43   ` Andreas Mohr via buildroot
  1 sibling, 1 reply; 7+ messages in thread
From: Baruch Siach via buildroot @ 2026-05-19  3:20 UTC (permalink / raw)
  To: Andreas Mohr via buildroot; +Cc: Andreas Mohr, Pascal de Bruijn

Hi Andreas,

On Mon, May 18 2026, Andreas Mohr via buildroot wrote:
> Add static build support of libargon2.
> This will allow dependent packages like cryptsetup to build static as well.

The comment in package/cryptsetup/Config.in needs update, then.

Can lua-argon2 build statically now? If not, the comment in its
Config.in pointing at libargon2 needs update as well.

Same goes for python-argon2-cffi-bindings.

baruch

> Signed-off-by: Andreas Mohr <and@gmx.li>
> ---
>  package/libargon2/Config.in    | 5 -----
>  package/libargon2/libargon2.mk | 6 ++++++
>  2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/package/libargon2/Config.in b/package/libargon2/Config.in
> index 6bba74cf..73c1e0d7 100644
> --- a/package/libargon2/Config.in
> +++ b/package/libargon2/Config.in
> @@ -1,12 +1,7 @@
>  config BR2_PACKAGE_LIBARGON2
>  	bool "libargon2"
>  	depends on BR2_USE_MMU
> -	depends on !BR2_STATIC_LIBS
>  	help
>  	  A modern password hashing algorithm
>  
>  	  https://password-hashing.net/#argon2
> -
> -comment "libargon needs a toolchain w/ dynamic library"
> -	depends on BR2_USE_MMU
> -	depends on BR2_STATIC_LIBS
> diff --git a/package/libargon2/libargon2.mk b/package/libargon2/libargon2.mk
> index b3f6e1b2..8ca0071a 100644
> --- a/package/libargon2/libargon2.mk
> +++ b/package/libargon2/libargon2.mk
> @@ -23,6 +23,12 @@ ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
>  LIBARGON2_OPTS += NO_THREADS=1
>  endif
>  
> +ifeq ($(BR2_STATIC_LIBS),y)
> +LIBARGON2_OPTS += LIB_SH= LINKED_LIB_SH=
> +else ifeq ($(BR2_SHARED_LIBS),y)
> +LIBARGON2_OPTS += LIB_ST=
> +endif
> +
>  define LIBARGON2_BUILD_CMDS
>  	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
>  		$(LIBARGON2_OPTS)

-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

* Re: [Buildroot] [PATCH v4 1/2] package/libargon2: conditionally shared/static build
  2026-05-19  3:20 ` [Buildroot] [PATCH v4 1/2] package/libargon2: conditionally shared/static build Baruch Siach via buildroot
@ 2026-05-19 18:43   ` Andreas Mohr via buildroot
  2026-05-20 19:28     ` Arnout Vandecappelle via buildroot
  0 siblings, 1 reply; 7+ messages in thread
From: Andreas Mohr via buildroot @ 2026-05-19 18:43 UTC (permalink / raw)
  To: Baruch Siach, Andreas Mohr via buildroot; +Cc: Pascal de Bruijn

Hi baruch,

Am 19.05.26 um 05:20 schrieb Baruch Siach:
> Hi Andreas,
>
> On Mon, May 18 2026, Andreas Mohr via buildroot wrote:
>> Add static build support of libargon2.
>> This will allow dependent packages like cryptsetup to build static as well.
> The comment in package/cryptsetup/Config.in needs update, then.
>
> Can lua-argon2 build statically now? If not, the comment in its
> Config.in pointing at libargon2 needs update as well.
>
> Same goes for python-argon2-cffi-bindings.

Yes, in a future patch set, once the libargon2 static build patch has 
been incorporated.

> baruch
>
>> Signed-off-by: Andreas Mohr <and@gmx.li>
>> ---
>>   package/libargon2/Config.in    | 5 -----
>>   package/libargon2/libargon2.mk | 6 ++++++
>>   2 files changed, 6 insertions(+), 5 deletions(-)
>>
>> diff --git a/package/libargon2/Config.in b/package/libargon2/Config.in
>> index 6bba74cf..73c1e0d7 100644
>> --- a/package/libargon2/Config.in
>> +++ b/package/libargon2/Config.in
>> @@ -1,12 +1,7 @@
>>   config BR2_PACKAGE_LIBARGON2
>>   	bool "libargon2"
>>   	depends on BR2_USE_MMU
>> -	depends on !BR2_STATIC_LIBS
>>   	help
>>   	  A modern password hashing algorithm
>>   
>>   	  https://password-hashing.net/#argon2
>> -
>> -comment "libargon needs a toolchain w/ dynamic library"
>> -	depends on BR2_USE_MMU
>> -	depends on BR2_STATIC_LIBS
>> diff --git a/package/libargon2/libargon2.mk b/package/libargon2/libargon2.mk
>> index b3f6e1b2..8ca0071a 100644
>> --- a/package/libargon2/libargon2.mk
>> +++ b/package/libargon2/libargon2.mk
>> @@ -23,6 +23,12 @@ ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
>>   LIBARGON2_OPTS += NO_THREADS=1
>>   endif
>>   
>> +ifeq ($(BR2_STATIC_LIBS),y)
>> +LIBARGON2_OPTS += LIB_SH= LINKED_LIB_SH=
>> +else ifeq ($(BR2_SHARED_LIBS),y)
>> +LIBARGON2_OPTS += LIB_ST=
>> +endif
>> +
>>   define LIBARGON2_BUILD_CMDS
>>   	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
>>   		$(LIBARGON2_OPTS)
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

* Re: [Buildroot] [PATCH v4 1/2] package/libargon2: conditionally shared/static build
  2026-05-19 18:43   ` Andreas Mohr via buildroot
@ 2026-05-20 19:28     ` Arnout Vandecappelle via buildroot
  0 siblings, 0 replies; 7+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2026-05-20 19:28 UTC (permalink / raw)
  To: Andreas Mohr, Baruch Siach, Andreas Mohr via buildroot; +Cc: Pascal de Bruijn



On 19/05/2026 20:43, Andreas Mohr via buildroot wrote:
> Hi baruch,
> 
> Am 19.05.26 um 05:20 schrieb Baruch Siach:
>> Hi Andreas,
>>
>> On Mon, May 18 2026, Andreas Mohr via buildroot wrote:
>>> Add static build support of libargon2.
>>> This will allow dependent packages like cryptsetup to build static as well.
>> The comment in package/cryptsetup/Config.in needs update, then.
>>
>> Can lua-argon2 build statically now? If not, the comment in its
>> Config.in pointing at libargon2 needs update as well.
>>
>> Same goes for python-argon2-cffi-bindings.
> 
> Yes, in a future patch set, once the libargon2 static build patch has been 
> incorporated.

  No, it really has to be in the same patch. Just search the git history for 
other commits that enable static build.

  I did it myself and applied to next, thanks.

  Regards,
  Arnout

> 
>> baruch
>>
>>> Signed-off-by: Andreas Mohr <and@gmx.li>
>>> ---
>>>   package/libargon2/Config.in    | 5 -----
>>>   package/libargon2/libargon2.mk | 6 ++++++
>>>   2 files changed, 6 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/package/libargon2/Config.in b/package/libargon2/Config.in
>>> index 6bba74cf..73c1e0d7 100644
>>> --- a/package/libargon2/Config.in
>>> +++ b/package/libargon2/Config.in
>>> @@ -1,12 +1,7 @@
>>>   config BR2_PACKAGE_LIBARGON2
>>>       bool "libargon2"
>>>       depends on BR2_USE_MMU
>>> -    depends on !BR2_STATIC_LIBS
>>>       help
>>>         A modern password hashing algorithm
>>>         https://password-hashing.net/#argon2
>>> -
>>> -comment "libargon needs a toolchain w/ dynamic library"
>>> -    depends on BR2_USE_MMU
>>> -    depends on BR2_STATIC_LIBS
>>> diff --git a/package/libargon2/libargon2.mk b/package/libargon2/libargon2.mk
>>> index b3f6e1b2..8ca0071a 100644
>>> --- a/package/libargon2/libargon2.mk
>>> +++ b/package/libargon2/libargon2.mk
>>> @@ -23,6 +23,12 @@ ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
>>>   LIBARGON2_OPTS += NO_THREADS=1
>>>   endif
>>> +ifeq ($(BR2_STATIC_LIBS),y)
>>> +LIBARGON2_OPTS += LIB_SH= LINKED_LIB_SH=
>>> +else ifeq ($(BR2_SHARED_LIBS),y)
>>> +LIBARGON2_OPTS += LIB_ST=
>>> +endif
>>> +
>>>   define LIBARGON2_BUILD_CMDS
>>>       $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
>>>           $(LIBARGON2_OPTS)
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

* Re: [Buildroot] [PATCH v4 2/2] package/libargon2: fix pkgconfig version string
  2026-05-18 22:02 ` [Buildroot] [PATCH v4 2/2] package/libargon2: fix pkgconfig version string Andreas Mohr via buildroot
@ 2026-05-20 19:28   ` Arnout Vandecappelle via buildroot
  2026-05-29  8:30   ` Thomas Perale via buildroot
  1 sibling, 0 replies; 7+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2026-05-20 19:28 UTC (permalink / raw)
  To: Andreas Mohr, buildroot; +Cc: Pascal de Bruijn



On 19/05/2026 00:02, Andreas Mohr via buildroot wrote:
> Current build generated pkgconfig/libargon2.pc has wrong version string.
>      Version: ZERO
> 
> Signed-off-by: Andreas Mohr <and@gmx.li>

  Applied to master, thanks.

  Regards,
  Arnout

> ---
>   package/libargon2/libargon2.mk | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/package/libargon2/libargon2.mk b/package/libargon2/libargon2.mk
> index 8ca0071a..e968aa08 100644
> --- a/package/libargon2/libargon2.mk
> +++ b/package/libargon2/libargon2.mk
> @@ -11,6 +11,7 @@ LIBARGON2_LICENSE_FILES = LICENSE
>   LIBARGON2_INSTALL_STAGING = YES
>   
>   LIBARGON2_OPTS = LIBRARY_REL=lib
> +LIBARGON2_OPTS += ARGON2_VERSION=$(LIBARGON2_VERSION)
>   
>   # GCC_TARGET_ARCH is not defined for all architectures, but libargon2
>   # only uses it to detect if some x86 optimizations can be used, and

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

* Re: [Buildroot] [PATCH v4 2/2] package/libargon2: fix pkgconfig version string
  2026-05-18 22:02 ` [Buildroot] [PATCH v4 2/2] package/libargon2: fix pkgconfig version string Andreas Mohr via buildroot
  2026-05-20 19:28   ` Arnout Vandecappelle via buildroot
@ 2026-05-29  8:30   ` Thomas Perale via buildroot
  1 sibling, 0 replies; 7+ messages in thread
From: Thomas Perale via buildroot @ 2026-05-29  8:30 UTC (permalink / raw)
  To: Andreas Mohr; +Cc: Thomas Perale, buildroot

In reply of:
> Current build generated pkgconfig/libargon2.pc has wrong version string.
>     Version: ZERO
> 
> Signed-off-by: Andreas Mohr <and@gmx.li>

Applied to 2025.02.x & 2026.02.x. Thanks

> ---
>  package/libargon2/libargon2.mk | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/package/libargon2/libargon2.mk b/package/libargon2/libargon2.mk
> index 8ca0071a..e968aa08 100644
> --- a/package/libargon2/libargon2.mk
> +++ b/package/libargon2/libargon2.mk
> @@ -11,6 +11,7 @@ LIBARGON2_LICENSE_FILES = LICENSE
>  LIBARGON2_INSTALL_STAGING = YES
>  
>  LIBARGON2_OPTS = LIBRARY_REL=lib
> +LIBARGON2_OPTS += ARGON2_VERSION=$(LIBARGON2_VERSION)
>  
>  # GCC_TARGET_ARCH is not defined for all architectures, but libargon2
>  # only uses it to detect if some x86 optimizations can be used, and
> -- 
> 2.53.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

end of thread, other threads:[~2026-05-29  8:30 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-05-18 22:02 [Buildroot] [PATCH v4 1/2] package/libargon2: conditionally shared/static build Andreas Mohr via buildroot
2026-05-18 22:02 ` [Buildroot] [PATCH v4 2/2] package/libargon2: fix pkgconfig version string Andreas Mohr via buildroot
2026-05-20 19:28   ` Arnout Vandecappelle via buildroot
2026-05-29  8:30   ` Thomas Perale via buildroot
2026-05-19  3:20 ` [Buildroot] [PATCH v4 1/2] package/libargon2: conditionally shared/static build Baruch Siach via buildroot
2026-05-19 18:43   ` Andreas Mohr via buildroot
2026-05-20 19:28     ` Arnout Vandecappelle via buildroot

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.