updated to 2012.04.10, workaround parallel build failure, link tools with rpath durin...

diff --git a/libdwarf-makefile.patch b/libdwarf-makefile.patch
index 872f042e6a45b20be6bd912b56455af539bbac3e..15a341073d46ae7994b1c5e1cd74b8ea512904ec 100644 (file)
--- a/libdwarf-makefile.patch
+++ b/libdwarf-makefile.patch
@@ -1,33 +1,35 @@
---- dwarf-20070703/dwarfdump/Makefile.in.orig  2007-07-03 19:37:21.000000000 -0400
-+++ dwarf-20070703/dwarfdump/Makefile.in       2007-07-30 11:29:54.672110755 -0400
-@@ -11,7 +11,7 @@
+--- dwarf-20120410/dwarfdump/Makefile.in.orig  2012-04-10 20:48:29.000000000 +0200
++++ dwarf-20120410/dwarfdump/Makefile.in       2012-08-29 16:12:14.974029480 +0200
+@@ -12,7 +12,7 @@
  prefix =      @prefix@
  exec_prefix = @exec_prefix@
  bindir =      $(exec_prefix)/bin
 -libdir =      $(exec_prefix)/lib
 +sysconfdir =  @sysconfdir@
- mandir =      @mandir@
+ mandir =        $(exec_prefix)/share/man
  man1dir =       $(mandir)/man1
  
-@@ -27,7 +27,7 @@
- DEFS =                @DEFS@
+@@ -33,8 +33,8 @@
+ DIRINC =        $(srcdir)/../libdwarf
  LIBS =                @LIBS@ -L../libdwarf -ldwarf -lelf
  INCLUDES =    -I. -I$(srcdir) -I$(srcdir)/../libdwarf
--CFLAGS =      @CFLAGS@ $(INCLUDES) -DCONFPREFIX=${libdir}
-+CFLAGS =      @CFLAGS@ $(INCLUDES) -DCONFPREFIX=${sysconfdir}
- LDFLAGS =     @LDFLAGS@  $(LIBS)
- 
- # ../libdwarf gets us to local headers
-@@ -110,9 +110,9 @@
+-CFLAGS =      $(PREINCS) @CFLAGS@ $(INCLUDES) -DCONFPREFIX=${libdir} $(POSTINCS)
+-LDFLAGS =     $(PRELIBS) @LDFLAGS@  $(LIBS) $(POSTLIBS)
++CFLAGS =      $(PREINCS) @CFLAGS@ $(INCLUDES) -DCONFPREFIX=${sysconfdir} $(POSTINCS)
++LDFLAGS =     $(PRELIBS) @LDFLAGS@ -Wl,-rpath,../libdwarf $(LIBS) $(POSTLIBS)
  
  
+ INSTALL = cp
+@@ -151,9 +151,9 @@
+ # will work and leave sensible permissions on the resulting files.
+ # Some adjustment might be required, see README.
  install: all
 -      $(INSTALL) dwarfdump $(bindir)/dwarfdump
--      $(INSTALL) $(srcdir)/dwarfdump.1 $(man1dir)/dwarfdump.1
 -      $(INSTALL) $(srcdir)/dwarfdump.conf $(libdir)/dwarfdump.conf
+-      $(INSTALL) $(srcdir)/dwarfdump.1 $(man1dir)/dwarfdump.1
 +      $(INSTALL) dwarfdump $(DESTDIR)$(bindir)/dwarfdump
-+      $(INSTALL) $(srcdir)/dwarfdump.1 $(DESTDIR)$(man1dir)/dwarfdump.1
 +      $(INSTALL) $(srcdir)/dwarfdump.conf $(DESTDIR)$(sysconfdir)/dwarfdump.conf
++      $(INSTALL) $(srcdir)/dwarfdump.1 $(DESTDIR)$(man1dir)/dwarfdump.1
  
  uninstall:
        -rm -f $(bindir)/dwarfdump

diff --git a/libdwarf.spec b/libdwarf.spec
index 8e6b31e377c73b4fb67d0229a6dce0f6a0c298af..eb649c1ea35e18a9a31e7ef5487674cc2b672380 100644 (file)
--- 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
-%define                snap    20080228
+%define                snap    20120410
 Version:       0.%{snap}.1
 Release:       1
 License:       LGPL v2.1
 Group:         Libraries
 Source0:       http://reality.sgiweb.org/davea/%{name}-%{snap}.tar.gz
-# Source0-md5: d35831f2f19136848854d7bfc53396f6
+# Source0-md5: 77c8b351f11738bc9fa50474a69d5b36
 Patch0:                %{name}-makefile.patch
 URL:           http://reality.sgiweb.org/davea/dwarf.html
 BuildRequires: elfutils-devel
@@ -67,7 +67,7 @@ cd libdwarf
 cd ..
 cd dwarfdump
 %configure
-%{__make}
+%{__make} -j1
 cd ..
 
 %install