diff --git a/frysk-0.0.1.2008.01.18.rh1-elfutils-werror.patch b/frysk-0.0.1.2008.01.18.rh1-elfutils-werror.patch new file mode 100644 index 0000000..d01ef34 --- /dev/null +++ b/frysk-0.0.1.2008.01.18.rh1-elfutils-werror.patch @@ -0,0 +1,69 @@ +diff -up frysk-0.0.1.2008.01.18.rh1/frysk-imports/elfutils/src/ld.h.elfutils-werror frysk-0.0.1.2008.01.18.rh1/frysk-imports/elfutils/src/ld.h +--- frysk-0.0.1.2008.01.18.rh1/frysk-imports/elfutils/src/ld.h.elfutils-werror 2008-02-05 16:47:35.000000000 -0500 ++++ frysk-0.0.1.2008.01.18.rh1/frysk-imports/elfutils/src/ld.h 2008-02-05 16:48:06.000000000 -0500 +@@ -1087,19 +1087,5 @@ extern bool dynamically_linked_p (void); + + /* Checked whether the symbol is undefined and referenced from a DSO. */ + extern bool linked_from_dso_p (struct scninfo *scninfo, size_t symidx); +-extern inline bool +-linked_from_dso_p (struct scninfo *scninfo, size_t symidx) +-{ +- struct usedfiles *file = scninfo->fileinfo; +- +- /* If this symbol is not undefined in this file it cannot come from +- a DSO. */ +- if (symidx < file->nlocalsymbols) +- return false; +- +- struct symbol *sym = file->symref[symidx]; +- +- return sym->defined && sym->in_dso; +-} + + #endif /* ld.h */ +diff -up frysk-0.0.1.2008.01.18.rh1/frysk-imports/elfutils/src/elflint.c.elfutils-werror frysk-0.0.1.2008.01.18.rh1/frysk-imports/elfutils/src/elflint.c +--- frysk-0.0.1.2008.01.18.rh1/frysk-imports/elfutils/src/elflint.c.elfutils-werror 2008-02-05 17:33:50.000000000 -0500 ++++ frysk-0.0.1.2008.01.18.rh1/frysk-imports/elfutils/src/elflint.c 2008-02-05 17:33:57.000000000 -0500 +@@ -1514,8 +1514,7 @@ check_dynamic (Ebl *ebl, GElf_Ehdr *ehdr + [DT_RELENT] = { [DT_REL] = true }, + [DT_JMPREL] = { [DT_PLTRELSZ] = true, [DT_PLTREL] = true }, + [DT_RUNPATH] = { [DT_STRTAB] = true }, +- [DT_PLTREL] = { [DT_JMPREL] = true }, +- [DT_PLTRELSZ] = { [DT_JMPREL] = true } ++ [DT_PLTREL] = { [DT_JMPREL] = true } + }; + bool has_dt[DT_NUM]; + bool has_val_dt[DT_VALNUM]; +diff -up frysk-0.0.1.2008.01.18.rh1/frysk-imports/elfutils/tests/dwfl-bug-fd-leak.c.elfutils-werror frysk-0.0.1.2008.01.18.rh1/frysk-imports/elfutils/tests/dwfl-bug-fd-leak.c +--- frysk-0.0.1.2008.01.18.rh1/frysk-imports/elfutils/tests/dwfl-bug-fd-leak.c.elfutils-werror 2008-02-05 19:33:32.000000000 -0500 ++++ frysk-0.0.1.2008.01.18.rh1/frysk-imports/elfutils/tests/dwfl-bug-fd-leak.c 2008-02-05 19:34:44.000000000 -0500 +@@ -102,7 +102,7 @@ main (void) + + for (int i = 0; i < 5000; ++i) + { +- Dwfl *dwfl = elfutils_open (getpid (), (Dwarf_Addr) main); ++ Dwfl *dwfl = elfutils_open (getpid (), (Dwarf_Addr) (long) main); + elfutils_close (dwfl); + } + +diff -up frysk-0.0.1.2008.01.18.rh1/frysk-imports/elfutils/libelf/common.h.elfutils-werror frysk-0.0.1.2008.01.18.rh1/frysk-imports/elfutils/libelf/common.h +--- frysk-0.0.1.2008.01.18.rh1/frysk-imports/elfutils/libelf/common.h.elfutils-werror 2008-02-05 14:50:24.000000000 -0500 ++++ frysk-0.0.1.2008.01.18.rh1/frysk-imports/elfutils/libelf/common.h 2008-02-05 14:51:37.000000000 -0500 +@@ -111,7 +111,7 @@ allocate_elf (int fildes, void *map_addr + + + /* Acquire lock for the descriptor and all children. */ +-static void ++static inline void + libelf_acquire_all (Elf *elf) + { + rwlock_wrlock (elf->lock); +@@ -130,7 +130,7 @@ libelf_acquire_all (Elf *elf) + } + + /* Release own lock and those of the children. */ +-static void ++static inline void + libelf_release_all (Elf *elf) + { + if (elf->kind == ELF_K_AR) diff --git a/frysk.spec b/frysk.spec index cf24d04..7c7b40e 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Frysk execution analysis and debugging tools Name: frysk Version: 0.0.1.2008.01.18.rh1 -Release: 2%{?dist} +Release: 3%{?dist} # antlrv2 is Public Domain; antlrv3 is BSD. # cdtparser is EPL # getopt is GPLv2 with exception @@ -23,6 +23,7 @@ Source: %{name}-%{version}.tar.bz2 Patch4: frysk-0.0.1.2008.01.18.rh1-no-sysroot.patch Patch5: frysk-0.0.1.2008.01.18.rh1-line-npe.patch +Patch6: frysk-0.0.1.2008.01.18.rh1-elfutils-werror.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -114,6 +115,7 @@ This package contains the GNOME front end for Frysk. pwd %patch4 -p1 -b .no-sysroot %patch5 -p1 -b .line-npe +%patch6 -p1 -b .elfutils-werror ./bootstrap.sh %build @@ -253,6 +255,10 @@ rm -rf %{buildroot} %{_datadir}/gnome/help/%{name}/* %changelog +* Tue Feb 5 2008 Andrew Cagney - 0.0.1.2008.01.18.rh1-3 +- Add frysk-0.0.1.2008.01.18.rh1-elfutils-werror.patch to fix elfutils + errors. + * Mon Feb 4 2008 Stepan Kasal - 0.0.1.2008.01.18.rh1-2 - rebuild against rebuilt java-gnome