[libdwarf] Link libdwarf.so with libelf

Tom Hughes tomh at fedoraproject.org
Tue Feb 4 22:56:32 UTC 2014


commit dc304e631e4ed760507722a9ff7f2f634e18f066
Author: Tom Hughes <tom at compton.nu>
Date:   Tue Feb 4 22:56:30 2014 +0000

    Link libdwarf.so with libelf

 libdwarf-soname.patch => libdwarf-shlib.patch |    2 +-
 libdwarf.spec                                 |    9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/libdwarf-soname.patch b/libdwarf-shlib.patch
similarity index 97%
rename from libdwarf-soname.patch
rename to libdwarf-shlib.patch
index a392439..eba8ee5 100644
--- a/libdwarf-soname.patch
+++ b/libdwarf-shlib.patch
@@ -12,7 +12,7 @@ index 76add35..1876507 100644
 +	ln -s $(SONAME) $@
 +
 +$(SONAME): dwarf_names.h dwarf_names.c $(OBJS) dwarf_names.o
-+	$(CC) $(CFLAGS) -shared $(OBJS) -Wl,-soname,$(SONAME)  dwarf_names.o -o $@
++	$(CC) $(CFLAGS) -shared $(OBJS) -Wl,-soname,$(SONAME)  dwarf_names.o -lelf -o $@
  
  none:
  	echo "do nothing"
diff --git a/libdwarf.spec b/libdwarf.spec
index b4b972f..903c9d9 100644
--- a/libdwarf.spec
+++ b/libdwarf.spec
@@ -4,14 +4,14 @@
 
 Name:          libdwarf
 Version:       20140131
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Library to access the DWARF Debugging file format 
 Group:         Development/Libraries
 
 License:       LGPLv2
 URL:           http://www.prevanders.net/dwarf.html
 Source0:       http://www.prevanders.net/%{name}-%{version}.tar.gz
-Patch0:        libdwarf-soname.patch
+Patch0:        libdwarf-shlib.patch
 
 BuildRequires: binutils-devel elfutils-libelf-devel
 
@@ -50,7 +50,7 @@ to access DWARF debug information.
 
 %prep
 %setup -q -n dwarf-%{version}
-%patch0 -p1 -b .soname
+%patch0 -p1 -b .shlib
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %configure --enable-shared
@@ -87,6 +87,9 @@ install -pDm 0755 dwarfdump2/dwarfdump     %{buildroot}%{_bindir}/dwarfdump
 %{_bindir}/dwarfdump
 
 %changelog
+* Tue Feb  4 2014 Tom Hughes <tom at compton.nu> - 20140131-2
+- Link libdwarf.so with libelf
+
 * Sun Feb  2 2014 Tom Hughes <tom at compton.nu> - 20140131-1
 - Update to 20140131 upstream release
 


More information about the scm-commits mailing list