Skip to contentSkip to conversation

package/python3: fix initconfig.h include

PATCH New Fabrice Fontaine 3 participants 5 messages Feb 2, 2020 – May 26, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/python3: fix initconfig.h include

This fix is needed to enable cracklib with python3

---
 ...n-pystate.h-fix-initconfig.h-include.patch | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/python3/0034-Include-cpython-pystate.h-fix-initconfig.h-include.patch
package/python3/0034-Include-cpython-pystate.h-fix-initconfig.h-include.patch new file +30 -0
new file mode 100644
index 0000000000..aa7835e0a4
@@ -0,0 +1,30 @@
+From ce8731443896e7513239c2d831733b0d87417e42 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Sun, 2 Feb 2020 18:52:56 +0100
+Subject: [PATCH] Include/cpython/pystate.h: fix initconfig.h include
+
+This fix is needed to fix detection of python3.8/Python.h with cracklib
+
+See https://bugs.python.org/issue39026
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ Include/cpython/pystate.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Include/cpython/pystate.h b/Include/cpython/pystate.h
+index d1792575c9..0a141b6e67 100644
+--- a/Include/cpython/pystate.h
++++ b/Include/cpython/pystate.h
+@@ -6,7 +6,7 @@
+ extern "C" {
+ #endif
+ 
+-#include "cpython/initconfig.h"
++#include "initconfig.h"
+ 
+ PyAPI_FUNC(int) _PyInterpreterState_RequiresIDRef(PyInterpreterState *);
+ PyAPI_FUNC(void) _PyInterpreterState_RequireIDRef(PyInterpreterState *, int);
+-- 
+2.24.1
+
Signature · 1 line
2.24.1
#1 lore raw

PATCH 2/2 package/cracklib: add python3 support

python bindings supports python3 since version 2.8.19 and
https://github.com/cracklib/cracklib/commit/219de98766b9f1e4c8c5b174de770158ffda3a93

---
 package/cracklib/cracklib.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/cracklib/cracklib.mk +2 -2
index 91d510ff34..be1b50f138 100644
@@ -19,9 +19,9 @@ else
 CRACKLIB_CONF_OPTS += --without-zlib
 endif
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
+ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
 CRACKLIB_CONF_OPTS += --with-python
-CRACKLIB_DEPENDENCIES += python
+CRACKLIB_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3)
 else
 CRACKLIB_CONF_OPTS += --without-python
 endif
Signature · 1 line
2.24.1
#2 lore raw

PATCH 2/2 package/cracklib: add python3 support

Fabrice, All,

On 2020-02-02 21:53 +0100, Fabrice Fontaine spake thusly:

Quoted 4 lines

python bindings supports python3 since version 2.8.19 and
https://github.com/cracklib/cracklib/commit/219de98766b9f1e4c8c5b174de770158ffda3a93

Applied to master, thanks.

(but I forgot to add a reference to a recent build failure...)

Regards,
Yann E. MORIN.

Quoted 27 lines
---
 package/cracklib/cracklib.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/cracklib/cracklib.mk +2 -2
index 91d510ff34..be1b50f138 100644
@@ -19,9 +19,9 @@ else
 CRACKLIB_CONF_OPTS += --without-zlib
 endif
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
+ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
 CRACKLIB_CONF_OPTS += --with-python
-CRACKLIB_DEPENDENCIES += python
+CRACKLIB_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3)
 else
 CRACKLIB_CONF_OPTS += --without-python
 endif
Signature · 6 lines
2.24.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH 2/2 package/cracklib: add python3 support

Fabrice, All,

On 2020-05-19 21:04 +0200, Yann E. MORIN spake thusly:

Quoted 8 lines

On 2020-02-02 21:53 +0100, Fabrice Fontaine spake thusly:

Quoted 4 lines

python bindings supports python3 since version 2.8.19 and
https://github.com/cracklib/cracklib/commit/219de98766b9f1e4c8c5b174de770158ffda3a93

Applied to master, thanks.
(but I forgot to add a reference to a recent build failure...)

I eventually had to revert it, as the preparatory patch against python was not applied, as upstream believes it is dangerous, and are still debating the proper way:

    https://bugs.python.org/issue39026#msg369309

Hint: they believe removing the include is the best course of action.

Can you have anotherlook, please?

Thanks, and sorry for the long delay.,..

Regards,
Yann E. MORIN.

Quoted 42 lines

Regards,
Yann E. MORIN.

Quoted 27 lines
---
 package/cracklib/cracklib.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/cracklib/cracklib.mk +2 -2
index 91d510ff34..be1b50f138 100644
@@ -19,9 +19,9 @@ else
 CRACKLIB_CONF_OPTS += --without-zlib
 endif
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
+ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
 CRACKLIB_CONF_OPTS += --with-python
-CRACKLIB_DEPENDENCIES += python
+CRACKLIB_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3)
 else
 CRACKLIB_CONF_OPTS += --without-python
 endif
Signature · 6 lines
2.24.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#4 lore raw

PATCH 1/2 package/python3: fix initconfig.h include

In reply to Fabrice Fontaine
Quoted 14 lines · Fabrice Fontaine

This fix is needed to enable cracklib with python3

---
 ...n-pystate.h-fix-initconfig.h-include.patch | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/python3/0034-Include-cpython-pystate.h-fix-initconfig.h-include.patch
package/python3/0034-Include-cpython-pystate.h-fix-initconfig.h-include.patch new file +0 -0
new file mode 100644
index 0000000000..aa7835e0a4

package/python3/0034-Include-cpython-pystate.h-fix-initconfig.h-include.patch line 8

Quoted 8 lines
package/python3/0034-Include-cpython-pystate.h-fix-initconfig.h-include.patch new file +8 -0
@@ -0,0 +1,30 @@
+From ce8731443896e7513239c2d831733b0d87417e42 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Sun, 2 Feb 2020 18:52:56 +0100
+Subject: [PATCH] Include/cpython/pystate.h: fix initconfig.h include
+
+This fix is needed to fix detection of python3.8/Python.h with cracklib
+
+See https://bugs.python.org/issue39026

The last comment in that bug suggests to instead just remove the #include from
pystate.h. Care to try that (and report the conclusion in the bug, so it hopefully progresses a bit)?

Series marked as Changes Requested.

Regards,
Arnout

Quoted 23 lines
package/python3/0034-Include-cpython-pystate.h-fix-initconfig.h-include.patch new file +22 -0
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ Include/cpython/pystate.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Include/cpython/pystate.h b/Include/cpython/pystate.h
+index d1792575c9..0a141b6e67 100644
+--- a/Include/cpython/pystate.h
++++ b/Include/cpython/pystate.h
+@@ -6,7 +6,7 @@
+ extern "C" {
+ #endif
+ 
+-#include "cpython/initconfig.h"
++#include "initconfig.h"
+ 
+ PyAPI_FUNC(int) _PyInterpreterState_RequiresIDRef(PyInterpreterState *);
+ PyAPI_FUNC(void) _PyInterpreterState_RequireIDRef(PyInterpreterState *, int);
+-- 
+2.24.1
+