summaryrefslogtreecommitdiffhomepage
path: root/patches/rpm_host-4.16.0_pre.local.patch
blob: 40eaa2b0cdfd061e49210391abe2f231c4eca971 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
--- rpm-4.17.0/configure.ac	2021-09-03 11:42:16.790237970 +0200
+++ rpm-4.17.0.new/configure.ac	2021-09-10 17:53:28.904112791 +0200
@@ -248,14 +248,22 @@
 
 #=================
 # Check for libelf library. Prefer external, otherwise none.
-WITH_LIBELF_LIB=
-AC_CHECK_HEADER([libelf.h])
-AC_CHECK_HEADERS([gelf.h], [
-	AC_CHECK_LIB(elf, gelf_getvernaux, [
-	    AC_DEFINE(HAVE_LIBELF, 1, [Define to 1 if you have the 'elf' library (-lelf).])
-	    WITH_LIBELF_LIB="-lelf"
-	    WITH_LIBELF=yes
-	])
+AC_ARG_ENABLE([libelf],
+		[AS_HELP_STRING([--enable-libelf=@<:@yes/no/auto@:>@],
+				[build with libelf support (default=yes)])],
+		[enable_libelf="$enableval"],
+		[enable_libelf=yes])
+
+AS_IF([test "x$enable_libelf" != "xno"], [
+  WITH_LIBELF_LIB=
+  AC_CHECK_HEADER([libelf.h])
+  AC_CHECK_HEADERS([gelf.h], [
+    AC_CHECK_LIB(elf, gelf_getvernaux, [
+    AC_DEFINE(HAVE_LIBELF, 1, [Define to 1 if you have the 'elf' library (-lelf).])
+    WITH_LIBELF_LIB="-lelf"
+    WITH_LIBELF=yes
+    ])
+  ])
 ])
 AC_SUBST(WITH_LIBELF_LIB)
 AM_CONDITIONAL(LIBELF,[test "$WITH_LIBELF" = yes])
diff -ru rpm-4.16.0.orig/configure.ac rpm-4.16.0/configure.ac
--- rpm-4.16.0.orig/configure.ac        2021-09-10 20:08:26.243318920 +0200
+++ rpm-4.16.0/configure.ac     2021-09-10 20:11:20.091320179 +0200
@@ -498,6 +498,8 @@

 #=================
 # Check for elfutils libdw library with dwelf_elf_gnu_build_id.
+AS_IF([test "x$enable_libelf" != "xno"], [
+
 WITH_LIBDW_LIB=
 HAVE_LIBDW_STRTAB=
 AS_IF([test "$WITH_LIBELF" = yes],[
@@ -518,6 +520,7 @@
     ])
   ])
 ])
+])
 AC_SUBST(WITH_LIBDW_LIB)
 AM_CONDITIONAL(LIBDW,[test "$WITH_LIBDW" = yes])
 AM_CONDITIONAL(HAVE_LIBDW_STRTAB,[test "$HAVE_LIBDW_STRTAB" = yes])