Skip to contentSkip to conversation

Version 2.3.4 of libtalloc needs to define PYTHONHASHSEED, as a check has been added to the configure script, and build will fail if it is not defined.

PATCH In review David GOUARIN 2 participants 2 messages Jul 24, 2022

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 Version 2.3.4 of libtalloc needs to define PYTHONHASHSEED, as a check has been added to the configure script, and build will fail if it is not defined.

From: David GOUARIN <[email protected]>

This is originately a workaround by samba developpers meant to avoid rebuilding talloc with each call to make. Defining PYTHONHASHSEED would not be required in the context of builroot, if not for the check in the configure script.

This change required an upgrade to pkg_waf.mk.

---
Changes v1 -> v2:
- edit commit message (suggested by Yann E. MORIN)

---
 package/libtalloc/libtalloc.hash | 2 +-
 package/libtalloc/libtalloc.mk   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
package/libtalloc/libtalloc.hash +1 -1
index cbfd11e63b..0bc8edb695 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  6be95b2368bd0af1c4cd7a88146eb6ceea18e46c3ffc9330bf6262b40d1d8aaa  talloc-2.3.3.tar.gz
+sha256  179f9ebe265e67e4ab2c26cad2b7de4b6a77c6c212f966903382869f06be6505  talloc-2.3.4.tar.gz
 sha256  f8340c449dd64a55c6605b02fcad2aec6f473612ac6026739a22995380a8043c  talloc.h
package/libtalloc/libtalloc.mk +4 -1
index 8cba699ea1..d12f4fcfff 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBTALLOC_VERSION = 2.3.3
+LIBTALLOC_VERSION = 2.3.4
 LIBTALLOC_SOURCE = talloc-$(LIBTALLOC_VERSION).tar.gz
 LIBTALLOC_SITE = https://www.samba.org/ftp/talloc
 LIBTALLOC_LICENSE = LGPL-3.0+
@@ -40,6 +40,9 @@ else
 LIBTALLOC_CONF_OPTS += --disable-python
 endif
 
+#LIBTALLOC_CONF_ENV += PYTHONHASHSEED=1
+#LIBTALLOC_MAKE_ENV += PYTHONHASHSEED=1
+
 LIBTALLOC_WAF = ./buildtools/bin/waf
 
 # like samba4, libtalloc uses the waf build system which requires a
Signature · 6 lines
2.17.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

Hello David,

Le 24/07/2022 à 15:18, David GOUARIN a écrit :

Quoted 1 line

From: David GOUARIN <[email protected]>

The commit title is a bit long, usually we want something like:

package/libtallc: bump version to 2.3.4

Quoted 6 lines

This is originately a workaround by samba developpers meant to avoid rebuilding talloc with each call to make. Defining PYTHONHASHSEED would not be required in the context of builroot, if not for the check in the configure script.

This change required an upgrade to pkg_waf.mk.

The waf infra has been updated now. Maybe this technical detail would go bellow "---" line.

Quoted 35 lines

---
Changes v1 -> v2:
- edit commit message (suggested by Yann E. MORIN)

---
 package/libtalloc/libtalloc.hash | 2 +-
 package/libtalloc/libtalloc.mk   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
package/libtalloc/libtalloc.hash +1 -1
index cbfd11e63b..0bc8edb695 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  6be95b2368bd0af1c4cd7a88146eb6ceea18e46c3ffc9330bf6262b40d1d8aaa  talloc-2.3.3.tar.gz
+sha256  179f9ebe265e67e4ab2c26cad2b7de4b6a77c6c212f966903382869f06be6505  talloc-2.3.4.tar.gz
 sha256  f8340c449dd64a55c6605b02fcad2aec6f473612ac6026739a22995380a8043c  talloc.h
package/libtalloc/libtalloc.mk +1 -1
index 8cba699ea1..d12f4fcfff 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBTALLOC_VERSION = 2.3.3
+LIBTALLOC_VERSION = 2.3.4
 LIBTALLOC_SOURCE = talloc-$(LIBTALLOC_VERSION).tar.gz
 LIBTALLOC_SITE = https://www.samba.org/ftp/talloc
 LIBTALLOC_LICENSE = LGPL-3.0+

package/libtalloc/libtalloc.mk else · line 44

Quoted 5 lines
package/libtalloc/libtalloc.mk +2 -0
@@ -40,6 +40,9 @@ else
 LIBTALLOC_CONF_OPTS += --disable-python
 endif
 
+#LIBTALLOC_CONF_ENV += PYTHONHASHSEED=1
+#LIBTALLOC_MAKE_ENV += PYTHONHASHSEED=1

humm, theses lines are actually commented.

Best regards,
Romain

package/libtalloc/libtalloc.mk else · line 48

Quoted 4 lines
package/libtalloc/libtalloc.mk +1 -0
+
 LIBTALLOC_WAF = ./buildtools/bin/waf
 
 # like samba4, libtalloc uses the waf build system which requires a

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot