packages: libunwind/libunwind.spec, libunwind/libunwind-disable-setjmp.patc...

cactus cactus at pld-linux.org
Tue Aug 31 15:43:17 CEST 2010


Author: cactus                       Date: Tue Aug 31 13:43:17 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; add disable setjmp patch - incompatible with gcc

---- Files affected:
packages/libunwind:
   libunwind.spec (1.13 -> 1.14) , libunwind-disable-setjmp.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libunwind/libunwind.spec
diff -u packages/libunwind/libunwind.spec:1.13 packages/libunwind/libunwind.spec:1.14
--- packages/libunwind/libunwind.spec:1.13	Sat Jul 25 23:43:33 2009
+++ packages/libunwind/libunwind.spec	Tue Aug 31 15:43:12 2010
@@ -3,11 +3,12 @@
 Summary(pl.UTF-8):	libunwind - (prawie) niezależne od platformy API do rozwijania
 Name:		libunwind
 Version:	0.99
-Release:	1
+Release:	2
 License:	MIT
 Group:		Libraries
 Source0:	http://download.savannah.gnu.org/releases/libunwind/%{name}-%{version}.tar.gz
 # Source0-md5:	3e9ca08118e22165a7f07d01d61a2d0d
+Patch0:		%{name}-disable-setjmp.patch
 URL:		http://www.nongnu.org/libunwind/
 BuildRequires:  autoconf
 BuildRequires:  automake >= 1.6
@@ -65,6 +66,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -92,19 +94,15 @@
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 %attr(755,root,root) %{_libdir}/libunwind.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libunwind.so.7
-%attr(755,root,root) %{_libdir}/libunwind-setjmp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libunwind-setjmp.so.0
 %attr(755,root,root) %{_libdir}/libunwind-%{asuf}.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libunwind-%{asuf}.so.7
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libunwind.so
-%attr(755,root,root) %{_libdir}/libunwind-setjmp.so
 %attr(755,root,root) %{_libdir}/libunwind-generic.so
 %attr(755,root,root) %{_libdir}/libunwind-%{asuf}.so
 %{_libdir}/libunwind.la
-%{_libdir}/libunwind-setjmp.la
 %{_libdir}/libunwind-%{asuf}.la
 # static-only
 %{_libdir}/libunwind-ptrace.a
@@ -117,7 +115,6 @@
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libunwind.a
-%{_libdir}/libunwind-setjmp.a
 %{_libdir}/libunwind-generic.a
 %{_libdir}/libunwind-%{asuf}.a
 
@@ -127,6 +124,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2010/08/31 13:43:12  cactus
+- rel 2; add disable setjmp patch - incompatible with gcc
+
 Revision 1.13  2009/07/25 21:43:33  arekm
 - up to 0.99
 

================================================================
Index: packages/libunwind/libunwind-disable-setjmp.patch
diff -u /dev/null packages/libunwind/libunwind-disable-setjmp.patch:1.1
--- /dev/null	Tue Aug 31 15:43:17 2010
+++ packages/libunwind/libunwind-disable-setjmp.patch	Tue Aug 31 15:43:12 2010
@@ -0,0 +1,212 @@
+At least x86_64 version cannot work, src/setjmp/setjmp.c and
+src/setjmp/sigsetjmp.c are not even compiled, src/x86_64/longjmp.S does not
+match src/setjmp/setjmp.c + include/tdep-x86_64/jmpbuf.h .
+
+google-perftools link only with libunwind.so.7 .
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -12,7 +12,7 @@ lib_LTLIBRARIES_cdep_setjmp	=
+ else
+ LIBRARIES_cdep			= libunwind-ptrace.a
+ lib_LTLIBRARIES_cdep		= libunwind.la
+-lib_LTLIBRARIES_cdep_setjmp	= libunwind-setjmp.la
++lib_LTLIBRARIES_cdep_setjmp	= #libunwind-setjmp.la
+ endif
+ 
+ ### libunwind-ptrace:
+@@ -27,21 +27,21 @@ libunwind_ptrace_a_SOURCES =						  \
+ 	ptrace/_UPT_reg_offset.c ptrace/_UPT_resume.c
+ 
+ ### libunwind-setjmp:
+-libunwind_setjmp_la_LDFLAGS		= $(COMMON_SO_LDFLAGS)		     \
+-					  -version-info $(SETJMP_SO_VERSION)
+-libunwind_setjmp_la_LIBADD		= libunwind-$(arch).la -lc
+-libunwind_setjmp_la_SOURCES_common	= setjmp/setjmp_i.h 	\
+-					  setjmp/longjmp.c	\
+-					  setjmp/siglongjmp.c
+-libunwind_setjmp_la_SOURCES_arm		= arm/siglongjmp.S
+-libunwind_setjmp_la_SOURCES_ia64	= ia64/setjmp.S  ia64/sigsetjmp.S  \
+-					  ia64/longjmp.S ia64/siglongjmp.S
+-libunwind_setjmp_la_SOURCES_hppa	= hppa/siglongjmp.S
+-libunwind_setjmp_la_SOURCES_mips	= mips/siglongjmp.S
+-libunwind_setjmp_la_SOURCES_x86		= x86/longjmp.S x86/siglongjmp.S
+-libunwind_setjmp_la_SOURCES_x86_64	= x86_64/longjmp.S x86_64/siglongjmp.S
+-libunwind_setjmp_la_SOURCES_ppc64       = ppc/longjmp.S ppc/siglongjmp.S
+-libunwind_setjmp_la_SOURCES_ppc32       = ppc/longjmp.S ppc/siglongjmp.S
++#libunwind_setjmp_la_LDFLAGS		= $(COMMON_SO_LDFLAGS)		     \
++#					  -version-info $(SETJMP_SO_VERSION)
++#libunwind_setjmp_la_LIBADD		= libunwind-$(arch).la -lc
++#libunwind_setjmp_la_SOURCES_common	= setjmp/setjmp_i.h 	\
++#					  setjmp/longjmp.c	\
++#					  setjmp/siglongjmp.c
++#libunwind_setjmp_la_SOURCES_arm		= arm/siglongjmp.S
++#libunwind_setjmp_la_SOURCES_ia64	= ia64/setjmp.S  ia64/sigsetjmp.S  \
++#					  ia64/longjmp.S ia64/siglongjmp.S
++#libunwind_setjmp_la_SOURCES_hppa	= hppa/siglongjmp.S
++#libunwind_setjmp_la_SOURCES_mips	= mips/siglongjmp.S
++#libunwind_setjmp_la_SOURCES_x86		= x86/longjmp.S x86/siglongjmp.S
++#libunwind_setjmp_la_SOURCES_x86_64	= x86_64/longjmp.S x86_64/siglongjmp.S
++#libunwind_setjmp_la_SOURCES_ppc64       = ppc/longjmp.S ppc/siglongjmp.S
++#libunwind_setjmp_la_SOURCES_ppc32       = ppc/longjmp.S ppc/siglongjmp.S
+ 
+ ### libunwind:
+ 
+@@ -359,8 +359,8 @@ if ARCH_ARM
+ if !REMOTE_ONLY
+  libunwind_arm_la_LIBADD = libunwind.la -lc
+ endif
+- libunwind_setjmp_la_SOURCES	= $(libunwind_setjmp_la_SOURCES_common) \
+-				  $(libunwind_setjmp_la_SOURCES_arm)
++# libunwind_setjmp_la_SOURCES	= $(libunwind_setjmp_la_SOURCES_common) \
++#				  $(libunwind_setjmp_la_SOURCES_arm)
+ else
+ if ARCH_IA64
+  ia64_mk_Gcursor_i_SOURCES = ia64/mk_Gcursor_i.c
+@@ -378,8 +378,8 @@ Lcursor_i.h: ia64/mk_Lcursor_i
+ if !REMOTE_ONLY
+  libunwind_ia64_la_LIBADD = libunwind.la -lc
+ endif
+- libunwind_setjmp_la_SOURCES	= $(libunwind_setjmp_la_SOURCES_common) \
+-				  $(libunwind_setjmp_la_SOURCES_ia64)
++# libunwind_setjmp_la_SOURCES	= $(libunwind_setjmp_la_SOURCES_common) \
++#				  $(libunwind_setjmp_la_SOURCES_ia64)
+ else
+ if ARCH_HPPA
+  lib_LTLIBRARIES_arch = libunwind-hppa.la
+@@ -389,8 +389,8 @@ if ARCH_HPPA
+ if !REMOTE_ONLY
+  libunwind_hppa_la_LIBADD = libunwind.la -lc
+ endif
+- libunwind_setjmp_la_SOURCES	= $(libunwind_setjmp_la_SOURCES_common) \
+-				  $(libunwind_setjmp_la_SOURCES_hppa)
++# libunwind_setjmp_la_SOURCES	= $(libunwind_setjmp_la_SOURCES_common) \
++#				  $(libunwind_setjmp_la_SOURCES_hppa)
+ else
+ if ARCH_MIPS
+  lib_LTLIBRARIES_arch = libunwind-mips.la
+@@ -400,8 +400,8 @@ if ARCH_MIPS
+ if !REMOTE_ONLY
+  libunwind_mips_la_LIBADD = libunwind.la -lc
+ endif
+- libunwind_setjmp_la_SOURCES	= $(libunwind_setjmp_la_SOURCES_common) \
+-				  $(libunwind_setjmp_la_SOURCES_mips)
++# libunwind_setjmp_la_SOURCES	= $(libunwind_setjmp_la_SOURCES_common) \
++#				  $(libunwind_setjmp_la_SOURCES_mips)
+ else
+ if ARCH_X86
+  lib_LTLIBRARIES_arch = libunwind-x86.la
+@@ -411,8 +411,8 @@ if ARCH_X86
+ if !REMOTE_ONLY
+  libunwind_x86_la_LIBADD = libunwind.la -lc
+ endif
+- libunwind_setjmp_la_SOURCES	= $(libunwind_setjmp_la_SOURCES_common) \
+-				  $(libunwind_setjmp_la_SOURCES_x86)
++# libunwind_setjmp_la_SOURCES	= $(libunwind_setjmp_la_SOURCES_common) \
++#				  $(libunwind_setjmp_la_SOURCES_x86)
+ else
+ if ARCH_X86_64
+  lib_LTLIBRARIES_arch = libunwind-x86_64.la
+@@ -422,8 +422,8 @@ if ARCH_X86_64
+ if !REMOTE_ONLY
+  libunwind_x86_64_la_LIBADD = libunwind.la -lc
+ endif
+- libunwind_setjmp_la_SOURCES	= $(libunwind_setjmp_la_SOURCES_common) \
+-				  $(libunwind_setjmp_la_SOURCES_x86_64)
++# libunwind_setjmp_la_SOURCES	= $(libunwind_setjmp_la_SOURCES_common) \
++#				  $(libunwind_setjmp_la_SOURCES_x86_64)
+ else
+ if ARCH_PPC32
+  lib_LTLIBRARIES_arch = libunwind-ppc32.la
+@@ -433,8 +433,8 @@ if ARCH_PPC32
+ if !REMOTE_ONLY
+  libunwind_ppc32_la_LIBADD = libunwind.la -lc
+ endif
+- libunwind_setjmp_la_SOURCES    = $(libunwind_setjmp_la_SOURCES_common) \
+-                                  $(libunwind_setjmp_la_SOURCES_ppc32)
++# libunwind_setjmp_la_SOURCES    = $(libunwind_setjmp_la_SOURCES_common) \
++#                                  $(libunwind_setjmp_la_SOURCES_ppc32)
+ else
+ if ARCH_PPC64
+  lib_LTLIBRARIES_arch = libunwind-ppc64.la
+@@ -444,8 +444,8 @@ if ARCH_PPC64
+ if !REMOTE_ONLY
+  libunwind_ppc64_la_LIBADD = libunwind.la -lc
+ endif
+- libunwind_setjmp_la_SOURCES    = $(libunwind_setjmp_la_SOURCES_common) \
+-                                  $(libunwind_setjmp_la_SOURCES_ppc64)
++# libunwind_setjmp_la_SOURCES    = $(libunwind_setjmp_la_SOURCES_common) \
++#                                  $(libunwind_setjmp_la_SOURCES_ppc64)
+ 
+ endif # ARCH_PPC64
+ endif # ARCH_PPC32
+@@ -466,7 +466,7 @@ libunwind_la_LIBADD  = -lc $(LIBCRTS)
+ 
+ lib_LIBRARIES = $(LIBRARIES_cdep)
+ lib_LTLIBRARIES = $(lib_LTLIBRARIES_cdep) $(lib_LTLIBRARIES_arch) \
+-		  $(lib_LTLIBRARIES_cdep_setjmp)
++		  # $(lib_LTLIBRARIES_cdep_setjmp)
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/tdep-$(arch) -I.
+ AM_CCASFLAGS = $(AM_CPPFLAGS)
+@@ -488,16 +488,16 @@ EXTRA_DIST =	elfxx.h elfxx.c unwind/unwind-internal.h	\
+ 		$(libunwind_mips_la_SOURCES_mips)		\
+ 		$(libunwind_x86_la_SOURCES_x86)			\
+ 		$(libunwind_x86_64_la_SOURCES_x86_64)		\
+-		$(libunwind_ptrace_a_SOURCES)			\
+-		$(libunwind_setjmp_la_SOURCES_common)		\
+-		$(libunwind_setjmp_la_SOURCES_arm)		\
+-		$(libunwind_setjmp_la_SOURCES_hppa)		\
+-		$(libunwind_setjmp_la_SOURCES_ia64)		\
+-		$(libunwind_setjmp_la_SOURCES_mips)		\
+-		$(libunwind_setjmp_la_SOURCES_x86)		\
+-		$(libunwind_setjmp_la_SOURCES_x86_64)		\
+-		$(libunwind_setjmp_la_SOURCES_ppc32)		\
+-		$(libunwind_setjmp_la_SOURCES_ppc64)
++		$(libunwind_ptrace_a_SOURCES)
++#		$(libunwind_setjmp_la_SOURCES_common)		\
++#		$(libunwind_setjmp_la_SOURCES_arm)		\
++#		$(libunwind_setjmp_la_SOURCES_hppa)		\
++#		$(libunwind_setjmp_la_SOURCES_ia64)		\
++#		$(libunwind_setjmp_la_SOURCES_mips)		\
++#		$(libunwind_setjmp_la_SOURCES_x86)		\
++#		$(libunwind_setjmp_la_SOURCES_x86_64)		\
++#		$(libunwind_setjmp_la_SOURCES_ppc32)		\
++#		$(libunwind_setjmp_la_SOURCES_ppc64)
+ 
+ 
+ # The -version-info flag accepts an argument of the form
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -24,7 +24,8 @@ if ARCH_IA64
+ 			Gia64-test-nat Lia64-test-nat			\
+ 			Gia64-test-rbs Lia64-test-rbs			\
+ 			Gia64-test-readonly Lia64-test-readonly		\
+-			ia64-test-setjmp ia64-test-sig
++			ia64-test-sig
++# ia64-test-setjmp
+ else
+ if ARCH_PPC64
+ if USE_ALTIVEC 
+@@ -40,8 +41,9 @@ endif #ARCH_IA64
+ 			Gtest-resume-sig Ltest-resume-sig		 \
+ 			Gtest-dyn1 Ltest-dyn1				 \
+ 			test-async-sig test-flush-cache test-init-remote \
+-			test-mem test-setjmp test-ptrace		 \
++			test-mem test-ptrace				 \
+ 			Ltest-nomalloc
++# test-setjmp
+  noinst_PROGRAMS_cdep = forker mapper test-ptrace-misc test-varargs	\
+ 			Gperf-simple Lperf-simple
+ 
+@@ -93,8 +95,8 @@ test_ptrace_misc_SOURCES = test-ptrace-misc.c ident.c
+ LIBUNWIND = ../src/libunwind-$(arch).la $(LIBUNWIND_local)
+ LDADD = $(LIBUNWIND)
+ 
+-test_setjmp_LDADD = ../src/libunwind-setjmp.la $(LIBUNWIND_local)
+-ia64_test_setjmp_LDADD = ../src/libunwind-setjmp.la $(LIBUNWIND_local)
++# test_setjmp_LDADD = ../src/libunwind-setjmp.la $(LIBUNWIND_local)
++# ia64_test_setjmp_LDADD = ../src/libunwind-setjmp.la $(LIBUNWIND_local)
+ test_ptrace_LDADD = ../src/libunwind-ptrace.a $(LIBUNWIND)
+ Ltest_concurrent_LDADD = $(LIBUNWIND) -lpthread
+ Gtest_concurrent_LDADD = $(LIBUNWIND) -lpthread
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libunwind/libunwind.spec?r1=1.13&r2=1.14&f=u



More information about the pld-cvs-commit mailing list