From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu, 22 Aug 2024 16:04:20 +0000 (+0100)
Subject: build: remove --with-rootlibdir toggle
X-Git-Tag: v34~491
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a3947d8d36e50ac2f9c8629a70977bd9e00d7bf;p=thirdparty%2Fkmod.git

build: remove --with-rootlibdir toggle

At a glance this option was introduced with distributions migrating from
/lib to /usr/lib.

Checking with Debian, Arch, Alpine, Fedora and Gentoo - only Debian and
Alpine set it. In the former - it's explicitly set to the default
(libdir), while the latter uses /lib and /usr/lib respectively.

Looking at the implementation itself, we don't adjust the libkmod.pc
which lists libdir, while libkmod.so is installed in rootlibdir.

Considering the negligible user base and somewhat broken state, drop the
option.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/86
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
---

diff --git a/Makefile.am b/Makefile.am
index be8d8fbd..c76b90d6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -117,13 +117,6 @@ dist_bashcompletion_DATA = \
 	shell-completion/bash/kmod
 
 install-exec-hook:
-	if test "$(libdir)" != "$(rootlibdir)"; then \
-		$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
-		so_img_name=$$(readlink $(DESTDIR)$(libdir)/libkmod.so) && \
-		so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-		ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libkmod.so && \
-		mv $(DESTDIR)$(libdir)/libkmod.so.* $(DESTDIR)$(rootlibdir); \
-	fi
 if BUILD_TOOLS
 	for tool in insmod lsmod rmmod depmod modprobe modinfo; do \
 		$(LN_S) -f kmod $(DESTDIR)$(bindir)/$$tool; \
@@ -131,7 +124,6 @@ if BUILD_TOOLS
 endif
 
 uninstall-hook:
-	rm -f $(DESTDIR)$(rootlibdir)/libkmod.so*
 if BUILD_TOOLS
 	for tool in insmod lsmod rmmod depmod modprobe modinfo; do \
 		rm -f $(DESTDIR)$(bindir)/$$tool; \
diff --git a/autogen.sh b/autogen.sh
index a7a6022d..95c65447 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -23,12 +23,6 @@ if [ -f "$topdir/.config.args" ]; then
     args="$args $(cat $topdir/.config.args)"
 fi
 
-if [ ! -L /bin ]; then
-    args="$args \
-        --with-rootlibdir=$(libdir /lib) \
-        "
-fi
-
 cd $oldpwd
 
 hackargs="\
diff --git a/configure.ac b/configure.ac
index 2f1c5252..ec99cf4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,11 +86,6 @@ AC_ARG_WITH([distconfdir], AS_HELP_STRING([--with-distconfdir=DIR], [directory t
         [], [with_distconfdir='${prefix}/lib'])
 AC_SUBST([distconfdir], [$with_distconfdir])
 
-AC_ARG_WITH([rootlibdir],
-        AS_HELP_STRING([--with-rootlibdir=DIR], [rootfs directory to install shared libraries]),
-        [], [with_rootlibdir=$libdir])
-AC_SUBST([rootlibdir], [$with_rootlibdir])
-
 # Ideally this would be $prefix/lib/modules but default to /lib/modules for compatibility with earlier versions
 AC_ARG_WITH([module_directory],
         AS_HELP_STRING([--with-module-directory=DIR], [directory in which to look for kernel modules @<:@default=/lib/modules@:>@]),
@@ -98,7 +93,7 @@ AC_ARG_WITH([module_directory],
 AC_SUBST([module_directory], [$with_module_directory])
 
 # Check all directory arguments for consistency.
-for ac_var in	distconfdir rootlibdir module_directory
+for ac_var in	distconfdir module_directory
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -330,7 +325,6 @@ AC_MSG_RESULT([
 	sysconfdir:		${sysconfdir}
 	distconfdir:		${distconfdir}
 	libdir:			${libdir}
-	rootlibdir:		${rootlibdir}
 	includedir:		${includedir}
 	bindir:			${bindir}
 	Bash completions dir:   ${with_bashcompletiondir}