From 91f2c4505ec52b7f6f7bf44b015ddae377739a02 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 24 Jan 2016 17:11:51 +0000 Subject: [PATCH] create-pkg-config.sh: Add versions to requires directives in package-config Signed-off-by: Jan Lindemann --- scripts/create-pkg-config.sh | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/scripts/create-pkg-config.sh b/scripts/create-pkg-config.sh index bfd4b955..f74e30cc 100644 --- a/scripts/create-pkg-config.sh +++ b/scripts/create-pkg-config.sh @@ -8,6 +8,23 @@ try_assign_sec() [ -n "$val" ] && eval $3=\"$val\" } +cleanup_requires() +{ +# echo $@ | sed -e ' +# s/\([a-zA-Z0-9.-]\+\) *\([a-zA-Z0-9.-]\+\) */\1, \2 /g +# #s/\([a-zA-Z-]\+\) *\([<>=]*\) *\([a-zA-Z0-9\.-]*\)/\1 \2 \3,/g +# #s/,,/,/g +# #s/,$// +# ' + echo $@ | sed -e ' + s/^ //g + s/\([ ]\|$\)\+/, /g + s/, $// + s/, $// + s/ *,* *\([<>=]\+\) *,* */ \1 /g + ' +} + usage() { cat <<- EOT | sed 's/^ *|//' @@ -110,8 +127,8 @@ Version: $version EOT [ "$cflags" ] && echo "Cflags: $cflags" [ "$libflags" ] && echo "Libs: $libflags" -[ "$requires_run" ] && echo "Requires: $requires_run" -[ "$requires_build" ] && echo "Requires.private: $requires_build" +[ "$requires_run" ] && echo "Requires: `cleanup_requires $requires_run`" +[ "$requires_build" ] && echo "Requires.private: `cleanup_requires $requires_build`" # [ "$requires_devel" ] && ?? # not sure what to do with this exit 0