Notification time stamped 2022-02-22 09:34:41 UTC
From 21591ade5eeab4c8fdc1758acba591b09d5fa2d0 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro(a)gmail.com>
Date: Feb 10 2022 12:51:35 +0000
Subject: Move python dependency generation to mingw32/64_python3.attr in mingw-python3
package
---
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index c530dfc..64c6105 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -359,6 +359,7 @@ echo ".so man1/pkgconf.1" >
%{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
%changelog
* Thu Feb 10 2022 Sandro Mani <manisandro(a)gmail.com> - 131-1
+- Move python dependency generation to mingw32/64_python3.attr in mingw-python3 package
- More generic mingw_pkg_name macros to also deduce mingw package name from native name
* Wed Feb 02 2022 Sandro Mani <manisandro(a)gmail.com> - 130-1
diff --git a/mingw-find-debuginfo.sh b/mingw-find-debuginfo.sh
index 0dd2045..317749a 100755
--- a/mingw-find-debuginfo.sh
+++ b/mingw-find-debuginfo.sh
@@ -28,7 +28,7 @@ do
mingw-objcopy --only-keep-debug $f $dest || :
pushd `dirname $dest`
keep_symbols=`mktemp`
- mingw-nm $dest --format=sysv --defined-only | awk -F \| '{ if ($4 ~
"Function") print $1 }' | sort > "$keep_symbols"
+ mingw-nm $dest --format=sysv --defined-only | awk -F \| '{ if ($4 ~
"Function") print $1 }' | sort > "$keep_symbols"
mingw-objcopy --add-gnu-debuglink=`basename $dest` --strip-unneeded $f
--keep-symbols="$keep_symbols" || :
rm -f "$keep_symbols"
popd
diff --git a/mingw.req b/mingw.req
index 622e7f8..b7bb6d4 100755
--- a/mingw.req
+++ b/mingw.req
@@ -17,7 +17,6 @@ filelist=`sed "s/['\"]/\\\&/g"`
dlls=$(echo $filelist | tr '[:blank:]' '\n' | grep -Ei
'\.(dll|exe|pyd)$')
pkgconfig_files=$(echo $filelist | tr '[:blank:]' '\n' | grep -Ei
'\.(pc)$')
-py3_files=$(echo $filelist | tr '[:blank:]' '\n' | grep -Ei
'\.(pyd?)$')
for target in $targets; do
dll_found=false
@@ -38,6 +37,7 @@ for target in $targets; do
echo "${target}-crt"
fi
+ # Add a dependency on $target-pkg-config if necessary
pkgconfig_files_found=false
for f in $pkgconfig_files; do
if [[ $f =~ .*$host_triplet.* ]]; then
@@ -46,21 +46,8 @@ for target in $targets; do
fi
done
- py3_files_found=false
- for f in $py3_files; do
- if [[ $f =~ .*$host_triplet.*lib/python3.* ]]; then
- py3_files_found=true
- break
- fi
- done
-
- # Add a dependency on $target-pkg-config if necessary
if [ $pkgconfig_files_found = true ]; then
echo "${target}-pkg-config"
fi
- # Add a dependency on python if necessary
- if [ $py3_files_found = true ]; then
- echo "${target}-python3";
- fi
done | sort -u
https://src.fedoraproject.org/rpms/mingw-filesystem/c/21591ade5eeab4c8fdc...