[packages/libdwarf] - updated to 20160613 (note: soname changed to follow upstream) - updated makefile,link patches

qboosh qboosh at pld-linux.org
Mon Aug 1 18:44:20 CEST 2016


commit 24ccbeb28096d4621f2f221867e6b3996cc89e10
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Aug 1 18:44:57 2016 +0200

    - updated to 20160613 (note: soname changed to follow upstream)
    - updated makefile,link patches

 libdwarf-link.patch     | 12 ++++++------
 libdwarf-makefile.patch | 10 +++++-----
 libdwarf.spec           | 12 ++++++------
 3 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/libdwarf.spec b/libdwarf.spec
index 2e249e3..00a0e66 100644
--- a/libdwarf.spec
+++ b/libdwarf.spec
@@ -1,13 +1,13 @@
 Summary:	Library to read DWARF debug information of an ELF object
 Summary(pl.UTF-8):	Biblioteka do odczytu informacji debugowych DWARF z obiektów ELF
 Name:		libdwarf
-Version:	20160507
+Version:	20160613
 Release:	1
 License:	LGPL v2.1 (library), GPL v2 (utilities)
 Group:		Libraries
 #Source0Download: https://www.prevanders.net/dwarf.html
 Source0:	https://www.prevanders.net/%{name}-%{version}.tar.gz
-# Source0-md5:	ae32d6f9ece5daf05e2d4b14822ea811
+# Source0-md5:	2e0f0ef6546b2155f53e2a4ed65bc44a
 Patch0:		%{name}-makefile.patch
 Patch1:		%{name}-link.patch
 URL:		https://www.prevanders.net/dwarf.html
@@ -82,9 +82,9 @@ cd ../dwarfgen
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_includedir},%{_libdir},%{_mandir}/man1}
 
-install -p libdwarf/libdwarf.so $RPM_BUILD_ROOT%{_libdir}/libdwarf.so.0.%{version}
-ln -s libdwarf.so.0.%{version} $RPM_BUILD_ROOT%{_libdir}/libdwarf.so.0
-ln -s libdwarf.so.0.%{version} $RPM_BUILD_ROOT%{_libdir}/libdwarf.so
+install -p libdwarf/libdwarf.so.1 $RPM_BUILD_ROOT%{_libdir}/libdwarf.so.1.%{version}
+ln -s libdwarf.so.1.%{version} $RPM_BUILD_ROOT%{_libdir}/libdwarf.so.1
+ln -s libdwarf.so.1.%{version} $RPM_BUILD_ROOT%{_libdir}/libdwarf.so
 cp -p libdwarf/libdwarf.a $RPM_BUILD_ROOT%{_libdir}
 cp -p libdwarf/libdwarf.h $RPM_BUILD_ROOT%{_includedir}
 
@@ -104,7 +104,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc libdwarf/CHANGES libdwarf/COPYING libdwarf/ChangeLog* libdwarf/NEWS libdwarf/README
 %attr(755,root,root) %{_libdir}/libdwarf.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdwarf.so.0
+%attr(755,root,root) %ghost %{_libdir}/libdwarf.so.1
 
 %files devel
 %defattr(644,root,root,755)
diff --git a/libdwarf-link.patch b/libdwarf-link.patch
index 7da8afb..e8b2fbc 100644
--- a/libdwarf-link.patch
+++ b/libdwarf-link.patch
@@ -1,11 +1,11 @@
---- dwarf-20160115/libdwarf/Makefile.in.orig	2016-04-05 17:13:20.829368602 +0200
-+++ dwarf-20160115/libdwarf/Makefile.in	2016-04-05 17:18:41.089355162 +0200
-@@ -129,7 +129,7 @@
+--- dwarf-20160613/libdwarf/Makefile.in.orig	2016-06-08 17:26:52.000000000 +0200
++++ dwarf-20160613/libdwarf/Makefile.in	2016-07-31 21:21:57.395979934 +0200
+@@ -132,7 +132,7 @@
  	$(AR) $(ARFLAGS) $@ $(OBJS)  dwarf_names.o > ar-output-temp
  
  libdwarf.so: dwarf_names.h dwarf_names.c $(OBJS) dwarf_names.o
--	$(CC) $(CFLAGS) -shared $(OBJS)  dwarf_names.o $(dwfzlib) -o $@
-+	$(CC) $(CFLAGS) -shared -Wl,-soname,libdwarf.so.0 $(OBJS)  dwarf_names.o $(dwfzlib) -o $@ -lelf
+-	$(CC) $(CFLAGS) $(LDFLAGS) -shared $(OBJS) -Wl,-soname=$(SONAME)  dwarf_names.o $(dwfzlib) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared $(OBJS) -Wl,-soname=$(SONAME)  dwarf_names.o $(dwfzlib) -o $@ -lelf
+ 	ln libdwarf.so $(SONAME)
  
  none:
- 	echo "do nothing " $@
diff --git a/libdwarf-makefile.patch b/libdwarf-makefile.patch
index 736f5b7..49d1912 100644
--- a/libdwarf-makefile.patch
+++ b/libdwarf-makefile.patch
@@ -1,5 +1,5 @@
---- dwarf-20160115/dwarfdump/Makefile.in.orig	2016-01-12 20:30:41.000000000 +0100
-+++ dwarf-20160115/dwarfdump/Makefile.in	2016-04-05 17:12:42.762703533 +0200
+--- dwarf-20160613/dwarfdump/Makefile.in.orig	2016-06-03 22:12:37.000000000 +0200
++++ dwarf-20160613/dwarfdump/Makefile.in	2016-07-31 21:01:28.765993963 +0200
 @@ -11,7 +11,7 @@
  prefix =	@prefix@
  exec_prefix =	@exec_prefix@
@@ -13,14 +13,14 @@
  DIRINC =        $(srcdir)/../libdwarf
  LIBS =		@LIBS@ -L../libdwarf -ldwarf -lelf $(dwfzlib)
  INCLUDES =	-I. -I$(srcdir) -I../libdwarf -I$(srcdir)/../libdwarf
--CFLAGS =	$(PREINCS) @CFLAGS@ $(INCLUDES) $(dwfwall) -DCONFPREFIX=${libdir} $(POSTINCS)
+-CFLAGS =	$(PREINCS) @CPPFLAGS@ @CFLAGS@ $(INCLUDES) $(dwfwall) -DCONFPREFIX=${libdir} $(POSTINCS)
 -LDFLAGS =	$(PRELIBS) @LDFLAGS@  $(LIBS) $(POSTLIBS)
-+CFLAGS =	$(PREINCS) @CFLAGS@ $(INCLUDES) $(dwfwall) -DCONFPREFIX=${sysconfdir} $(POSTINCS)
++CFLAGS =	$(PREINCS) @CPPFLAGS@ @CFLAGS@ $(INCLUDES) $(dwfwall) -DCONFPREFIX=${sysconfdir} $(POSTINCS)
 +LDFLAGS =	$(PRELIBS) @LDFLAGS@ -Wl,-rpath,../libdwarf $(LIBS) $(POSTLIBS)
  #VG =            valgrind --leak-check=full
  VG =
  
-@@ -190,9 +190,9 @@
+@@ -194,9 +194,9 @@
  # will work and leave sensible permissions on the resulting files.
  # Some adjustment might be required, see README.
  install: all
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libdwarf.git/commitdiff/24ccbeb28096d4621f2f221867e6b3996cc89e10



More information about the pld-cvs-commit mailing list