openmamba/autospec
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pck-update.in: auto build requirements: fix finding correct python version and skip requirements for rtld() (ldconfig)

Browse Source
This commit is contained in:
Silvan Calarco 2021-03-14 11:24:42 +01:00
parent 1747b898a2
commit 28a058dd07
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/pck-update.in
View File

@ -2301,6 +2301,7 @@ build the list of the build requirements""${NORM}"
: :
elif [ "${req:0:7}" = "rpmlib(" -o \ elif [ "${req:0:7}" = "rpmlib(" -o \
"${req:0:7}" = "config(" -o \ "${req:0:7}" = "config(" -o \
"${req:0:5}" = "rtld(" -o \
"${req:0:11}" = "executable(" ]; then "${req:0:11}" = "executable(" ]; then
# not a build requirement # not a build requirement
: :
@ -2317,9 +2318,12 @@ build the list of the build requirements""${NORM}"
[ "$buildreq" ] || [ "$buildreq" ] ||
echo "# $req: perl requirement not resolved" echo "# $req: perl requirement not resolved"
elif [ "${req}" = "python(abi)" ]; then elif [ "${req}" = "python(abi)" ]; then
# FIXME: libpython-devel should be defined in autospec.conf
# python requirement # python requirement
buildreq="libpython-devel" reqver=${line/*= /}
buildreq="libpython${reqver/\.}-devel"
rpm -q --qf %{name} --whatprovides "$buildreq" &>/dev/null || {
buildreq="libpython${reqver/\.*}-devel"
}
elif [[ "$req" =~ .*\.so\.[0-9]* ]]; then elif [[ "$req" =~ .*\.so\.[0-9]* ]]; then
solibpath_catch="" solibpath_catch=""
# is a shared library # is a shared library