From 211c82717766526cb8e65b0574db7a3248633e78 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Thu, 27 May 2021 16:00:59 +0300 Subject: [PATCH] Kick out libtool dependency generator People mostly only care about removing any .la files present in their packages, I've yet to see a single use of a desired/used libtool() dependency during its 14 year existence in rpm. There are enough provides in the world without creating unused ones just because. --- fileattrs/Makefile.am | 2 +- fileattrs/libtool.attr | 3 --- scripts/Makefile.am | 4 ++-- scripts/libtooldeps.sh | 42 ------------------------------------------ 4 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 fileattrs/libtool.attr delete mode 100644 scripts/libtooldeps.sh diff --git a/fileattrs/Makefile.am b/fileattrs/Makefile.am index f13bdd81aa..09e3d8e609 100644 --- a/fileattrs/Makefile.am +++ b/fileattrs/Makefile.am @@ -6,7 +6,7 @@ AM_CFLAGS = @RPMCFLAGS@ fattrsdir = $(rpmconfigdir)/fileattrs fattrs_DATA = \ - debuginfo.attr desktop.attr elf.attr font.attr libtool.attr metainfo.attr \ + debuginfo.attr desktop.attr elf.attr font.attr metainfo.attr \ perl.attr perllib.attr pkgconfig.attr ocaml.attr \ script.attr diff --git a/fileattrs/libtool.attr b/fileattrs/libtool.attr deleted file mode 100644 index ed5cb8cf85..0000000000 --- a/fileattrs/libtool.attr +++ /dev/null @@ -1,3 +0,0 @@ -%__libtool_provides %{_rpmconfigdir}/libtooldeps.sh --provides %{buildroot} %{name} -%__libtool_requires %{_rpmconfigdir}/libtooldeps.sh --requires %{buildroot} %{name} -%__libtool_path ^%{_libdir}/.*\.la$ diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 11b4e94266..7939a28cf0 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -18,7 +18,7 @@ EXTRA_DIST = \ tgpg vpkg-provides.sh \ find-requires find-provides \ ocamldeps.sh \ - pkgconfigdeps.sh libtooldeps.sh \ + pkgconfigdeps.sh \ fontconfig.prov script.req rpmconfig_SCRIPTS = \ @@ -29,7 +29,7 @@ rpmconfig_SCRIPTS = \ check-buildroot check-rpaths check-rpaths-worker \ find-lang.sh find-requires find-provides \ perl.prov perl.req \ - pkgconfigdeps.sh libtooldeps.sh \ + pkgconfigdeps.sh \ ocamldeps.sh \ fontconfig.prov script.req \ rpmdb_dump rpmdb_load \ diff --git a/scripts/libtooldeps.sh b/scripts/libtooldeps.sh deleted file mode 100644 index af86789c47..0000000000 --- a/scripts/libtooldeps.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -[ $# -ge 2 ] || { - cat > /dev/null - exit 0 -} - -case $1 in --P|--provides) - shift - RPM_BUILD_ROOT="$1" - while read possible - do - case "$possible" in - *.la) - if grep -Eiq '^# Generated by (libtool|ltmain.sh)' "$possible" 2> /dev/null ; then - possible="`echo ${possible} | sed -e s,${RPM_BUILD_ROOT}/,/,`" - echo "libtool($possible)" - fi - ;; - esac - done - ;; --R|--requires) - while read possible ; do - case "$possible" in - *.la) - for dep in `grep '^dependency_libs='"$possible" 2> /dev/null | \ - sed -e "s,^dependency_libs='\(.*\)',\1,g"` - do - case "$dep" in - /*.la) - echo "libtool($dep)" - ;; - esac - done - ;; - esac - done - ;; -esac -exit 0