rpms/libunwind/devel libunwind-snap-070224-multilib-rh342451.patch, NONE, 1.1 libunwind.spec, 1.24, 1.25

Sun Feb 24 06:32:17 UTC 2008

Author: jkratoch

Update of /cvs/pkgs/rpms/libunwind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24298

Modified Files:
	libunwind.spec 
Added Files:
	libunwind-snap-070224-multilib-rh342451.patch 
Log Message:
* Sun Feb 24 2008 Jan Kratochvil <jan.kratochvil at redhat.com> - 0.99-0.5.frysk20070405cvs
- Fix the multilib conflicts (BZ 342451).


libunwind-snap-070224-multilib-rh342451.patch:

--- NEW FILE libunwind-snap-070224-multilib-rh342451.patch ---
diff -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile -x Makefile.in libunwind-0.99-alpha-orig/Makefile.am libunwind-0.99-alpha/Makefile.am
--- libunwind-0.99-alpha-orig/Makefile.am	2006-07-27 05:13:14.000000000 +0200
+++ libunwind-0.99-alpha/Makefile.am	2008-02-24 06:43:08.000000000 +0100
@@ -40,6 +40,6 @@ EXTRA_DIST = include/dwarf.h include/dwa
 	include/libunwind-x86.h include/tdep-x86/libunwind_i.h		\
 	include/tdep-x86/jmpbuf.h include/tdep-x86/dwarf-config.h	\
 	include/libunwind-x86_64.h include/tdep-x86_64/libunwind_i.h	\
-	include/tdep-x86_64/jmpbuf.h include/tdep-x86_64/dwarf-config.h
-
-DISTCLEANFILES = include/libunwind.h include/tdep
+	include/tdep-x86_64/jmpbuf.h include/tdep-x86_64/dwarf-config.h	\
+	include/libunwind.h include/tdep/libunwind_i.h			\
+	include/tdep/jmpbuf.h include/tdep/dwarf-config.h
diff -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile -x Makefile.in libunwind-0.99-alpha-orig/configure.in libunwind-0.99-alpha/configure.in
--- libunwind-0.99-alpha-orig/configure.in	2008-02-24 06:29:08.000000000 +0100
+++ libunwind-0.99-alpha/configure.in	2008-02-24 06:30:29.000000000 +0100
@@ -80,8 +80,6 @@ AM_CONDITIONAL(OS_HPUX, expr x$target_os
 if test x$target_arch != x$build_arch; then
   CPPFLAGS="${CPPFLAGS} -DUNW_REMOTE_ONLY"
 fi
-AC_CONFIG_LINKS(include/libunwind.h:include/libunwind-$target_arch.h
-		include/tdep:include/tdep-$target_arch)
 
 AC_ARG_ENABLE(debug,
 [  --enable-debug          turn on debug support (slows down execution)],
diff -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile -x Makefile.in libunwind-0.99-alpha-orig/include/libunwind.h libunwind-0.99-alpha/include/libunwind.h
--- libunwind-0.99-alpha-orig/include/libunwind.h	1970-01-01 01:00:00.000000000 +0100
+++ libunwind-0.99-alpha/include/libunwind.h	2008-02-24 06:40:59.000000000 +0100
@@ -0,0 +1,17 @@
+/* Provide a real file - not a symlink - as it would cause multiarch conflicts
+   (when multiple different arch releases are installed simultaneously.
+   https://bugzilla.redhat.com/show_bug.cgi?id=342451  */
+
+#if defined __x86_64__
+# include "libunwind-x86_64.h"
+#elif defined __i386__
+# include "libunwind-x86.h"
+#elif defined __ia64__
+# include "libunwind-ia64.h"
+#elif defined __powerpc64__
+# include "libunwind-ppc64.h"
+#elif defined __hpux
+# include "libunwind-hppa.h"
+#else
+# error "Unsupported arch"
+#endif
diff -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile -x Makefile.in libunwind-0.99-alpha-orig/include/tdep/dwarf-config.h libunwind-0.99-alpha/include/tdep/dwarf-config.h
--- libunwind-0.99-alpha-orig/include/tdep/dwarf-config.h	1970-01-01 01:00:00.000000000 +0100
+++ libunwind-0.99-alpha/include/tdep/dwarf-config.h	2008-02-24 06:41:02.000000000 +0100
@@ -0,0 +1,17 @@
+/* Provide a real file - not a symlink - as it would cause multiarch conflicts
+   (when multiple different arch releases are installed simultaneously.
+   https://bugzilla.redhat.com/show_bug.cgi?id=342451  */
+
+#if defined __x86_64__
+# include "tdep-x86_64/dwarf-config.h"
+#elif defined __i386__
+# include "tdep-x86/dwarf-config.h"
+#elif defined __ia64__
+# include "tdep-ia64/dwarf-config.h"
+#elif defined __powerpc64__
+# include "tdep-ppc64/dwarf-config.h"
+#elif defined __hpux
+# include "tdep-hppa/dwarf-config.h"
+#else
+# error "Unsupported arch"
+#endif
diff -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile -x Makefile.in libunwind-0.99-alpha-orig/include/tdep/jmpbuf.h libunwind-0.99-alpha/include/tdep/jmpbuf.h
--- libunwind-0.99-alpha-orig/include/tdep/jmpbuf.h	1970-01-01 01:00:00.000000000 +0100
+++ libunwind-0.99-alpha/include/tdep/jmpbuf.h	2008-02-24 06:41:04.000000000 +0100
@@ -0,0 +1,17 @@
+/* Provide a real file - not a symlink - as it would cause multiarch conflicts
+   (when multiple different arch releases are installed simultaneously.
+   https://bugzilla.redhat.com/show_bug.cgi?id=342451  */
+
+#if defined __x86_64__
+# include "tdep-x86_64/jmpbuf.h"
+#elif defined __i386__
+# include "tdep-x86/jmpbuf.h"
+#elif defined __ia64__
+# include "tdep-ia64/jmpbuf.h"
+#elif defined __powerpc64__
+# include "tdep-ppc64/jmpbuf.h"
+#elif defined __hpux
+# include "tdep-hppa/jmpbuf.h"
+#else
+# error "Unsupported arch"
+#endif
diff -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile -x Makefile.in libunwind-0.99-alpha-orig/include/tdep/libunwind_i.h libunwind-0.99-alpha/include/tdep/libunwind_i.h
--- libunwind-0.99-alpha-orig/include/tdep/libunwind_i.h	1970-01-01 01:00:00.000000000 +0100
+++ libunwind-0.99-alpha/include/tdep/libunwind_i.h	2008-02-24 06:41:06.000000000 +0100
@@ -0,0 +1,17 @@
+/* Provide a real file - not a symlink - as it would cause multiarch conflicts
+   (when multiple different arch releases are installed simultaneously.
+   https://bugzilla.redhat.com/show_bug.cgi?id=342451  */
+
+#if defined __x86_64__
+# include "tdep-x86_64/libunwind_i.h"
+#elif defined __i386__
+# include "tdep-x86/libunwind_i.h"
+#elif defined __ia64__
+# include "tdep-ia64/libunwind_i.h"
+#elif defined __powerpc64__
+# include "tdep-ppc64/libunwind_i.h"
+#elif defined __hpux
+# include "tdep-hppa/libunwind_i.h"
+#else
+# error "Unsupported arch"
+#endif


Index: libunwind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libunwind/devel/libunwind.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libunwind.spec	24 Feb 2008 04:55:53 -0000	1.24
+++ libunwind.spec	24 Feb 2008 06:31:44 -0000	1.25
@@ -8,12 +8,13 @@
 Version: 0.99
 %define frysksnap 20070405cvs
 %define upstreamsnap 070224
-Release: 0.4.frysk%{frysksnap}%{?dist}
+Release: 0.5.frysk%{frysksnap}%{?dist}
 License: BSD
 Group: Development/Debuggers
 Source: http://download.savannah.nongnu.org/releases/libunwind/libunwind-snap-%{upstreamsnap}.tar.gz
 Patch1: libunwind-snap-%{upstreamsnap}-frysk%{frysksnap}.patch
 Patch2: libunwind-snap-070224-orphanripper.patch
+Patch3: libunwind-snap-070224-multilib-rh342451.patch
 Source1: libunwind-orphanripper.c
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 URL: http://savannah.nongnu.org/projects/libunwind
@@ -46,6 +47,8 @@
 %patch2 -p1 -E
 cp -p %{SOURCE1} tests/orphanripper.c
 
+%patch3 -p1 -E
+
 %build
 mkdir -p config
 aclocal
@@ -82,6 +85,9 @@
 %{_includedir}/*
 
 %changelog
+* Sun Feb 24 2008 Jan Kratochvil <jan.kratochvil at redhat.com> - 0.99-0.5.frysk20070405cvs
+- Fix the multilib conflicts (BZ 342451).
+
 * Sun Feb 24 2008 Jan Kratochvil <jan.kratochvil at redhat.com> - 0.99-0.4.frysk20070405cvs
 - Abort the possibly hung up testcases after 120 seconds (BZ 427850, BZ 434147).
 


