X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=gdb.spec;h=75a7229c13f46204b261bca8ad9209c621cac612;hb=da6c3c8bb46044a232fd33865dcada4fd3c88197;hp=f35a027b9b25ce434a0be4710184c50ceff415a8;hpb=ac73038ff56c48fdf23bb1d4a1019c7655ed8cce;p=packages%2Fgdb.git

diff --git a/gdb.spec b/gdb.spec
index f35a027..75a7229 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -1,10 +1,10 @@
-# NOTE
-# - Do not remove -lib package, it is required by FPC
+# NOTE: -lib package is used by fpc.spec
 
 # TODO
 # - change install msg to poldek in buildid-locate-rpm-pld.patch when poldek allows it. LP#493922
 #
 # Conditional build:
+%bcond_without	guile		# Guile embedded scripting
 %bcond_without	python		# build without python support
 
 Summary:	A GNU source-level debugger for C, C++ and Fortran
@@ -20,158 +20,46 @@ Summary(zh_CN.UTF-8):	[开发]C和其他语言的调试器
 Summary(zh_TW.UTF-8):	[.-A開發]C和.$)B其.-A他語.$)B言的調試器
 %define		snap	20120926
 Name:		gdb
-Version:	7.5.0
-Release:	0.%{snap}.2
+Version:	8.0
+Release:	1
 License:	GPL v3+
 Group:		Development/Debuggers
-#Source0:	http://ftp.gnu.org/gnu/gdb/%{name}-%{version}.tar.bz2
-Source0:	%{name}-%{version}.%{snap}.tar.bz2
-# Source0-md5:	813b1d4f93e0eb56ff81d147de2286fb
+Source0:	http://ftp.gnu.org/gnu/gdb/%{name}-%{version}.tar.xz
+# Source0-md5:	c3d35cd949084be53b92cc1e03485f88
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	2e8a48939ae282c12bbacdd54e398247
 Source3:	%{name}-gstack.man
-
-# FEDORA -- use the same numbering that they do
-# don't ever modify these patches, apply secondary patch to alter it pld way
-# use:'<,'>!grep -vE '^(\#|$)' in vim to filterout comments, spaces
-
-Patch1:		%{name}-6.3-rh-dummykfail-20041202.patch
-Patch2:		%{name}-6.3-rh-testversion-20041202.patch
-Patch3:		%{name}-6.3-rh-testlibunwind-20041202.patch
-Patch105:	%{name}-6.3-ppc64syscall-20040622.patch
-Patch111:	%{name}-6.3-ppc64displaysymbol-20041124.patch
-Patch112:	%{name}-6.6-scheduler_locking-step-sw-watchpoints2.patch
-Patch260:	%{name}-6.6-scheduler_locking-step-is-default.patch
-Patch118:	%{name}-6.3-gstack-20050411.patch
-Patch122:	%{name}-6.3-test-pie-20050107.patch
-Patch389:	%{name}-archer-pie-addons.patch
-Patch394:	%{name}-archer-pie-addons-keep-disabled.patch
-Patch125:	%{name}-6.3-test-self-20050110.patch
-Patch133:	%{name}-6.3-test-dtorfix-20050121.patch
-Patch136:	%{name}-6.3-test-movedir-20050125.patch
-Patch140:	%{name}-6.3-gcore-thread-20050204.patch
-Patch145:	%{name}-6.3-threaded-watchpoints2-20050225.patch
-Patch153:	%{name}-6.3-ia64-gcore-page0-20050421.patch
-Patch158:	%{name}-6.3-ia64-sigtramp-frame-20050708.patch
-Patch160:	%{name}-6.3-ia64-gcore-speedup-20050714.patch
-Patch161:	%{name}-6.3-inferior-notification-20050721.patch
-Patch162:	%{name}-6.3-ia64-info-frame-fix-20050725.patch
-Patch163:	%{name}-6.3-inheritancetest-20050726.patch
-Patch164:	%{name}-6.3-readnever-20050907.patch
-Patch169:	%{name}-6.3-ia64-sigill-20051115.patch
-Patch188:	%{name}-6.5-bz203661-emit-relocs.patch
-Patch194:	%{name}-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
-Patch196:	%{name}-6.5-sharedlibrary-path.patch
-Patch199:	%{name}-6.5-bz190810-gdbserver-arch-advice.patch
-Patch211:	%{name}-6.5-last-address-space-byte-test.patch
-Patch208:	%{name}-6.5-BEA-testsuite.patch
-Patch213:	%{name}-6.5-readline-long-line-crash-test.patch
-Patch214:	%{name}-6.5-bz216711-clone-is-outermost.patch
-Patch216:	%{name}-6.5-bz218379-ppc-solib-trampoline-test.patch
-Patch217:	%{name}-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
-Patch225:	%{name}-6.5-bz109921-DW_AT_decl_file-test.patch
-Patch229:	%{name}-6.3-bz140532-ppc-unwinding-test.patch
-Patch231:	%{name}-6.3-bz202689-exec-from-pthread-test.patch
-Patch234:	%{name}-6.6-bz230000-power6-disassembly-test.patch
-Patch235:	%{name}-6.3-bz231832-obstack-2gb.patch
-Patch245:	%{name}-6.6-bz229517-gcore-without-terminal.patch
-Patch247:	%{name}-6.6-bz235197-fork-detach-info.patch
-Patch254:	%{name}-6.6-testsuite-timeouts.patch
-Patch258:	%{name}-6.6-bz237572-ppc-atomic-sequence-test.patch
-Patch263:	%{name}-6.3-attach-see-vdso-test.patch
-Patch271:	%{name}-6.5-bz243845-stale-testing-zombie-test.patch
-Patch274:	%{name}-6.6-buildid-locate.patch
-Patch659:	%{name}-6.6-buildid-locate-solib-missing-ids.patch
-Patch353:	%{name}-6.6-buildid-locate-rpm.patch
-Patch415:	%{name}-6.6-buildid-locate-core-as-arg.patch
-Patch519:	%{name}-6.6-buildid-locate-rpm-librpm-workaround.patch
-Patch276:	%{name}-6.6-bfd-vdso8k.patch
-Patch282:	%{name}-6.7-charsign-test.patch
-Patch284:	%{name}-6.7-ppc-clobbered-registers-O2-test.patch
-Patch287:	%{name}-6.7-testsuite-stable-results.patch
-Patch289:	%{name}-6.5-ia64-libunwind-leak-test.patch
-Patch290:	%{name}-6.5-missed-trap-on-step-test.patch
-Patch294:	%{name}-6.7-bz426600-DW_TAG_interface_type-test.patch
-Patch296:	%{name}-6.5-gcore-buffer-limit-test.patch
-Patch298:	%{name}-6.6-threads-static-test.patch
-Patch309:	%{name}-6.3-mapping-zero-inode-test.patch
-Patch311:	%{name}-6.3-focus-cmd-prev-test.patch
-Patch315:	%{name}-6.8-bz442765-threaded-exec-test.patch
-Patch317:	%{name}-6.8-sparc64-silence-memcpy-check.patch
-Patch320:	%{name}-6.5-section-num-fixup-test.patch
-Patch329:	%{name}-6.8-bz254229-gcore-prpsinfo.patch
-Patch330:	%{name}-6.8-bz436037-reg-no-longer-active.patch
-Patch331:	%{name}-6.8-quit-never-aborts.patch
-Patch335:	%{name}-rhel5-compat.patch
-Patch337:	%{name}-6.8-attach-signalled-detach-stopped.patch
-Patch343:	%{name}-6.8-watchpoint-conditionals-test.patch
-Patch348:	%{name}-6.8-bz466901-backtrace-full-prelinked.patch
-Patch349:	%{name}-archer.patch
-Patch360:	%{name}-6.8-bz457187-largefile-test.patch
-Patch381:	%{name}-simultaneous-step-resume-breakpoint-test.patch
-Patch382:	%{name}-core-open-vdso-warning.patch
-Patch391:	%{name}-x86_64-i386-syscall-restart.patch
-Patch392:	%{name}-bz533176-fortran-omp-step.patch
-Patch397:	%{name}-follow-child-stale-parent.patch
-Patch403:	%{name}-ccache-workaround.patch
-Patch404:	%{name}-fortran-common-reduce.patch
-Patch405:	%{name}-fortran-common.patch
-Patch407:	%{name}-lineno-makeup-test.patch
-Patch408:	%{name}-ppc-power7-test.patch
-Patch417:	%{name}-bz541866-rwatch-before-run.patch
-Patch459:	%{name}-moribund-utrace-workaround.patch
-Patch470:	%{name}-archer-next-over-throw-cxx-exec.patch
-Patch475:	%{name}-bz601887-dwarf4-rh-test.patch
-Patch490:	%{name}-test-bt-cfi-without-die.patch
-Patch491:	%{name}-gdb-add-index-script.patch
-Patch496:	%{name}-bz568248-oom-is-error.patch
-Patch504:	%{name}-bz623749-gcore-relro.patch
-Patch526:	%{name}-bz634108-solib_address.patch
-Patch542:	%{name}-test-pid0-core.patch
-Patch547:	%{name}-test-dw2-aranges.patch
-Patch548:	%{name}-test-expr-cumulative-archer.patch
-Patch579:	%{name}-7.2.50-sparc-add-workaround-to-broken-debug-files.patch
-Patch618:	%{name}-dlopen-stap-probe-1of7.patch
-Patch717:	%{name}-dlopen-stap-probe-2of7.patch
-Patch718:	%{name}-dlopen-stap-probe-3of7.patch
-Patch719:	%{name}-dlopen-stap-probe-4of7.patch
-Patch720:	%{name}-dlopen-stap-probe-5of7.patch
-Patch721:	%{name}-dlopen-stap-probe-6of7.patch
-Patch722:	%{name}-dlopen-stap-probe-7of7.patch
-Patch619:	%{name}-dlopen-stap-probe-test.patch
-Patch723:	%{name}-dlopen-stap-probe-test2.patch
-Patch627:	%{name}-glibc-vdso-workaround.patch
-Patch634:	%{name}-runtest-pie-override.patch
-Patch643:	%{name}-python-rdynamic.patch
-Patch653:	%{name}-attach-fail-reasons-5of5.patch
-Patch657:	%{name}-attach-fail-reasons-5of5configure.patch
-Patch661:	%{name}-stale-frame_info.patch
-Patch690:	%{name}-glibc-strstr-workaround.patch
-Patch698:	%{name}-rhel5.9-testcase-xlf-var-inside-mod.patch
-Patch703:	%{name}-rhbz-818343-set-solib-absolute-prefix-testcase.patch
-Patch716:	%{name}-minidebuginfo.patch
-Patch725:	%{name}-step-symless.patch
-Patch726:	%{name}-print-class.patch
-Patch728:	%{name}-check-type.patch
-Patch729:	%{name}-entryval-inlined.patch
-
-# PLD patches
+Patch0:		x32.patch
+Patch100:	gdb-6.6-buildid-locate.patch
+Patch101:	gdb-6.6-buildid-locate-solib-missing-ids.patch
+Patch102:	gdb-6.6-buildid-locate-rpm.patch
+Patch103:	gdb-6.6-buildid-locate-core-as-arg.patch
+Patch104:	gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
+Patch105:	gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+Patch106:	gdb-6.6-buildid-locate-rpm-scl.patch
+Patch110:	gdb-6.3-gstack-20050411.patch
+Patch111:	gdb-gdb-add-index-script.patch
+Patch112:	gdb-archer-vla-tests.patch
+Patch113:	gdb-vla-intel-fortran-strides.patch
+Patch114:	gdb-vla-intel-stringbt-fix.patch
+Patch115:	gdb-vla-intel-fortran-vla-strings.patch
+Patch116:	gdb-vla-intel-tests.patch
 Patch1000:	%{name}-readline.patch
 Patch1001:	%{name}-info.patch
 Patch1002:	%{name}-passflags.patch
 Patch1005:	%{name}-pretty-print-by-default.patch
 Patch1006:	buildid-locate-rpm-pld.patch
-
 URL:		http://www.gnu.org/software/gdb/
 BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake
 BuildRequires:	bison
+BuildRequires:	babeltrace-devel
 BuildRequires:	expat-devel
-BuildRequires:	flex
-BuildRequires:	gettext-devel
+BuildRequires:	flex >= 2.6.4
+BuildRequires:	gettext-tools
+%{?with_guile:BuildRequires:	guile-devel >= 2.0}
 BuildRequires:	libselinux-devel
 BuildRequires:	libtool
-BuildRequires:	libunwind-devel >= 0.97
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:	pkgconfig
 BuildRequires:	readline-devel
@@ -185,7 +73,7 @@ Obsoletes:	python-gdb
 # for traceback module
 Requires:	python-modules
 %endif
-Requires:	libunwind >= 0.97
+%{?with_guile:Requires:	guile >= 2.0}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -267,15 +155,15 @@ Summary:	GDB in the form of a static library
 Summary(pl.UTF-8):	GDB w postaci biblioteki statycznej
 Group:		Development/Debuggers
 # libraries that needs to be linked to fulfill libgdb.a symbol requirements
-Requires:	binutils-static >= 2.17.50
-Requires:	expat-static
-Requires:	libselinux-static
-Requires:	libsepol-static
-Requires:	ncurses-static
-Requires:	python-static
-Requires:	readline-static
-Requires:	xz-static
-Requires:	zlib-static
+Requires:	binutils-devel >= 2.17.50
+Requires:	expat-devel
+Requires:	libselinux-devel
+Requires:	libsepol-devel
+Requires:	ncurses-devel
+Requires:	python-devel
+Requires:	readline-devel
+Requires:	xz-devel
+Requires:	zlib-devel
 
 %description lib
 GDB in the form of a static library.
@@ -284,137 +172,29 @@ GDB in the form of a static library.
 GDB w postaci biblioteki statycznej.
 
 %prep
-%setup -q -n %{name}-%{version}.%{snap}
+%setup -q
+
+%patch0 -p1
 
 # Files have `# <number> <file>' statements breaking VPATH / find-debuginfo.sh .
 rm -f gdb/ada-exp.c gdb/ada-lex.c gdb/c-exp.c gdb/cp-name-parser.c gdb/f-exp.c
 rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc-exp.c gdb/p-exp.c
 
-# FEDORA PATCHES -- keep them in same order they do
-# Apply patches defined above.
-
-# Match the Fedora's version info.
-%patch2 -p1
-
-%patch349 -p1
-%patch1 -p1
-%patch3 -p1
-
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
 %patch105 -p1
+%patch106 -p1
+%patch110 -p1
 %patch111 -p1
 %patch112 -p1
-%patch118 -p1
-%patch122 -p1
-%patch125 -p1
-%patch133 -p1
-%patch136 -p1
-%patch140 -p1
-%patch145 -p1
-%patch153 -p1
-%patch158 -p1
-%patch160 -p1
-%patch161 -p1
-%patch162 -p1
-%patch163 -p1
-%patch164 -p1
-%patch169 -p1
-%patch188 -p1
-%patch194 -p1
-%patch196 -p1
-%patch199 -p1
-%patch208 -p1
-%patch211 -p1
-%patch213 -p1
-%patch214 -p1
-%patch216 -p1
-%patch217 -p1
-%patch225 -p1
-%patch229 -p1
-%patch231 -p1
-%patch234 -p1
-%patch235 -p1
-%patch245 -p1
-%patch247 -p1
-%patch254 -p1
-%patch258 -p1
-%patch260 -p1
-%patch263 -p1
-%patch271 -p1
-%patch274 -p1
-%patch659 -p1
-%patch353 -p1
-%patch276 -p1
-%patch282 -p1
-%patch284 -p1
-%patch287 -p1
-%patch289 -p1
-%patch290 -p1
-%patch294 -p1
-%patch296 -p1
-%patch298 -p1
-%patch309 -p1
-%patch311 -p1
-%patch315 -p1
-%patch317 -p1
-%patch320 -p1
-%patch329 -p1
-%patch330 -p1
-%patch331 -p1
-%patch343 -p1
-%patch348 -p1
-%patch360 -p1
-%patch381 -p1
-%patch382 -p1
-%patch391 -p1
-%patch392 -p1
-%patch397 -p1
-%patch403 -p1
-%patch404 -p1
-%patch405 -p1
-%patch389 -p1
-%patch394 -p1
-%patch407 -p1
-%patch408 -p1
-%patch417 -p1
-%patch459 -p1
-%patch470 -p1
-%patch475 -p1
-%patch415 -p1
-%patch519 -p1
-%patch490 -p1
-%patch491 -p1
-%patch496 -p1
-%patch504 -p1
-%patch526 -p1
-%patch542 -p1
-%patch547 -p1
-%patch548 -p1
-%patch579 -p1
-%patch618 -p1
-%patch717 -p1
-%patch718 -p1
-%patch719 -p1
-%patch720 -p1
-%patch721 -p1
-%patch722 -p1
-%patch723 -p1
-%patch619 -p1
-%patch627 -p1
-%patch634 -p1
-%patch643 -p1
-%patch653 -p1
-%patch657 -p1
-%patch661 -p1
-%patch690 -p1
-%patch698 -p1
-%patch703 -p1
-%patch716 -p1
-%patch725 -p1
-%patch726 -p1
-%patch728 -p1
-%patch729 -p1
-
-# PLD patches
+%patch113 -p1
+%patch114 -p1
+%patch115 -p1
+%patch116 -p1
+
 %patch1000 -p1
 %patch1001 -p1
 %patch1002 -p1
@@ -455,6 +235,11 @@ cp -f /usr/share/automake/config.* .
 	--with-pythondir=%{py_sitescriptdir} \
 %else
 	--without-python \
+%endif
+%if %{with guile}
+	--with-guile \
+%else
+	--without-guile \
 %endif
 	--disable-gdbtk \
 	--disable-shared \
@@ -473,11 +258,11 @@ cp -f /usr/share/automake/config.* .
 	--without-included-regex \
 	--without-x
 
-%{__make} -j1
+%{__make}
 %{__make} -j1 info
 
 # gdb/ChangeLog: Build gdb directly from *.o files not using libgdb.a.
-%{__make} -j1 -C gdb libgdb.a
+%{__make} -C gdb libgdb.a
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -499,7 +284,7 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/README.gdb-non-english-man-pages
 
 %if %{with python}
 # Temporarily now:
-for LIB in lib lib64; do
+for LIB in lib lib64 libx32; do
 	LIBPATH="$RPM_BUILD_ROOT%{_datadir}/gdb/auto-load%{_prefix}/$LIB"
 	install -d $LIBPATH
 done
@@ -514,14 +299,12 @@ cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man1/gstack.1
 install libdecnumber/libdecnumber.a $RPM_BUILD_ROOT%{_libdir}
 
 # Remove the files that are part of a gdb build but that are owned and provided by other packages.
-# These are part of binutils
-rm -rf $RPM_BUILD_ROOT%{_localedir}
-rm -f $RPM_BUILD_ROOT%{_infodir}/bfd*
-rm -f $RPM_BUILD_ROOT%{_infodir}/standard*
-rm -f $RPM_BUILD_ROOT%{_infodir}/mmalloc*
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure*
-rm -rf $RPM_BUILD_ROOT%{_includedir}
-rm -rf $RPM_BUILD_ROOT%{_libdir}/lib{bfd*,opcodes*,iberty*,mmalloc*}
+# These are part of binutils:
+%{__rm} $RPM_BUILD_ROOT%{_localedir}/*/LC_MESSAGES/{bfd,opcodes}.mo
+%{__rm} $RPM_BUILD_ROOT%{_infodir}/bfd.info*
+%{__rm} $RPM_BUILD_ROOT%{_includedir}/{ansidecl,bfd,bfdlink,dis-asm,symcat,plugin-api}.h
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -539,18 +322,25 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gdbtui
 %attr(755,root,root) %{_bindir}/gdb-add-index
 %attr(755,root,root) %{_bindir}/gstack
+%attr(755,root,root) %{_bindir}/gcore
 %dir %{_datadir}/gdb
 %dir %{_datadir}/gdb/auto-load
 %dir %{_datadir}/gdb/auto-load%{_prefix}
 %dir %{_datadir}/gdb/auto-load%{_prefix}/lib
-%ifarch %{x8664}
+%ifarch %{x8664} x32
 %dir %{_datadir}/gdb/auto-load%{_prefix}/lib64
+%dir %{_datadir}/gdb/auto-load%{_prefix}/libx32
 %endif
+%{?with_guile:%{_datadir}/gdb/guile}
 %{_datadir}/gdb/syscalls
+%{_datadir}/gdb/system-gdbinit
 %{_datadir}/gdb/python
 %{_mandir}/man1/gdb.1*
 %{_mandir}/man1/gdbtui.1*
+%{_mandir}/man1/gdb-add-index.1*
 %{_mandir}/man1/gstack.1*
+%{_mandir}/man1/gcore.1*
+%{_mandir}/man5/gdbinit.5*
 %lang(es) %{_mandir}/es/man1/*
 %lang(fr) %{_mandir}/fr/man1/*
 %lang(hu) %{_mandir}/hu/man1/*
@@ -558,7 +348,6 @@ rm -rf $RPM_BUILD_ROOT
 %lang(pl) %{_mandir}/pl/man1/*
 %{_infodir}/annotate.info*
 %{_infodir}/gdb.info*
-%{_infodir}/gdbint.info*
 %{_infodir}/stabs.info*
 
 %files gdbserver
@@ -571,3 +360,4 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libdecnumber.a
 %{_libdir}/libgdb.a
+%{_includedir}/gdb