Skip to contentSkip to conversation

package/python3: adjust _REMOVE_USELESS_FILES fix for new layout

PATCH New Peter Korsgaard 2 participants 3 messages Aug 2, 2019 – Aug 31, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/python3: adjust _REMOVE_USELESS_FILES fix for new layout

python3 nowadays appends the triplet to the config-<version>m directory:

echo target/usr/lib/python3.7/config-* target/usr/lib/python3.7/config-3.7m-powerpc-linux-gnu

Likewise, there is no longer a pyconfig.h:

ls target/usr/lib/python3.7/config-3.7m-powerpc-linux-gnu config.c config.c.in install-sh libpython3.7m.a Makefile makesetup python-config.py python.o Setup Setup.local

So adjust the removal logic to match. Use a wildcard rather than $GNU_TARGET_NAME as buildroot and python3's idea of the triplet doesn't always match (E.G. for musl/uclibc).

---
 package/python3/python3.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/python3/python3.mk +2 -2
index decae1b721..8e6a0296ed 100644
@@ -203,8 +203,8 @@ define PYTHON3_REMOVE_USELESS_FILES
 	rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)m-config
 	rm -f $(TARGET_DIR)/usr/bin/python3-config
 	rm -f $(TARGET_DIR)/usr/bin/smtpd.py.3
-	for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-$(PYTHON3_VERSION_MAJOR)m/ \
-		-type f -not -name pyconfig.h -a -not -name Makefile` ; do \
+	for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-$(PYTHON3_VERSION_MAJOR)m-*/ \
+		-type f -not -name Makefile` ; do \
 		rm -f $$i ; \
 	done
 	rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/__pycache__/
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 package/python3: adjust _REMOVE_USELESS_FILES fix for new layout

Quoted 11 lines · Peter Korsgaard

python3 nowadays appends the triplet to the config-<version>m directory:

echo target/usr/lib/python3.7/config-* target/usr/lib/python3.7/config-3.7m-powerpc-linux-gnu

Likewise, there is no longer a pyconfig.h:

ls target/usr/lib/python3.7/config-3.7m-powerpc-linux-gnu config.c config.c.in install-sh libpython3.7m.a Makefile makesetup python-config.py python.o Setup Setup.local

Quoted 5 lines

So adjust the removal logic to match. Use a wildcard rather than $GNU_TARGET_NAME as buildroot and python3's idea of the triplet doesn't always match (E.G. for musl/uclibc).

Applied to master, thanks.

Regards,
Arnout

Quoted 20 lines
---
 package/python3/python3.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/python3/python3.mk +2 -2
index decae1b721..8e6a0296ed 100644
@@ -203,8 +203,8 @@ define PYTHON3_REMOVE_USELESS_FILES
 	rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)m-config
 	rm -f $(TARGET_DIR)/usr/bin/python3-config
 	rm -f $(TARGET_DIR)/usr/bin/smtpd.py.3
-	for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-$(PYTHON3_VERSION_MAJOR)m/ \
-		-type f -not -name pyconfig.h -a -not -name Makefile` ; do \
+	for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-$(PYTHON3_VERSION_MAJOR)m-*/ \
+		-type f -not -name Makefile` ; do \
 		rm -f $$i ; \
 	done
 	rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/__pycache__/
#2 lore raw

PATCH 1/1 package/python3: adjust _REMOVE_USELESS_FILES fix for new layout

In reply to Peter Korsgaard
Quoted 12 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

python3 nowadays appends the triplet to the config-<version>m directory:
echo target/usr/lib/python3.7/config-* target/usr/lib/python3.7/config-3.7m-powerpc-linux-gnu

Likewise, there is no longer a pyconfig.h:

ls target/usr/lib/python3.7/config-3.7m-powerpc-linux-gnu config.c config.c.in install-sh libpython3.7m.a Makefile makesetup python-config.py python.o Setup Setup.local

Quoted 5 lines

So adjust the removal logic to match. Use a wildcard rather than $GNU_TARGET_NAME as buildroot and python3's idea of the triplet doesn't always match (E.G. for musl/uclibc).

Committed to 2019.02.x and 2019.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard