From 1ac7c4f375acd331fa8e98eb61c5dfec4abcd6e98cb0db75bbb3026f3c492d03 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Thu, 16 Jun 2011 15:21:24 +0000 Subject: [PATCH] Accepting request 72837 from devel:tools:compiler - Update to version 2.5 - Fixes GCC 4.6 warnings - Changelist too long to fit here, see NEWS. (forwarded request 72835 from elvigia) OBS-URL: https://build.opensuse.org/request/show/72837 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bison?expand=0&rev=13 --- bison-2.3-subpipe.diff | 11 ----------- bison-2.4.1-28169bab1f6f2fc | 34 ---------------------------------- bison-2.4.1-7439c5c0f949408 | 33 --------------------------------- bison-2.4.1.tar.bz2 | 3 --- bison-2.5.tar.bz2 | 3 +++ bison.changes | 7 +++++++ bison.spec | 27 ++++++--------------------- 7 files changed, 16 insertions(+), 102 deletions(-) delete mode 100644 bison-2.3-subpipe.diff delete mode 100644 bison-2.4.1-28169bab1f6f2fc delete mode 100644 bison-2.4.1-7439c5c0f949408 delete mode 100644 bison-2.4.1.tar.bz2 create mode 100644 bison-2.5.tar.bz2 diff --git a/bison-2.3-subpipe.diff b/bison-2.3-subpipe.diff deleted file mode 100644 index b5628fa..0000000 --- a/bison-2.3-subpipe.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/subpipe.c -+++ lib/subpipe.c -@@ -130,7 +130,7 @@ - for execvp. */ - execvp (argv[0], (char **) argv); - -- _exit (errno == ENOENT ? 127 : 126); -+ error((errno == ENOENT ? 127 : 126), errno, "cannot run %s", argv[0]); - } - - /* Parent. */ diff --git a/bison-2.4.1-28169bab1f6f2fc b/bison-2.4.1-28169bab1f6f2fc deleted file mode 100644 index d5d1dc5..0000000 --- a/bison-2.4.1-28169bab1f6f2fc +++ /dev/null @@ -1,34 +0,0 @@ -From 28169bab1f6f2fc9d682118703f6267c63583720 Mon Sep 17 00:00:00 2001 -From: Akim Demaille -Date: Wed, 12 Aug 2009 14:18:12 +0000 -Subject: tests: GCC 4.5 compliance. - - * tests/synclines.at (AT_SYNCLINES_COMPILE): Adjust to GCC 4.5's - messages about #error. ---- -diff --git a/tests/synclines.at b/tests/synclines.at -index 8653b46..56efdac 100644 ---- a/tests/synclines.at -+++ b/tests/synclines.at -@@ -34,7 +34,18 @@ m4_define([AT_SYNCLINES_COMPILE], - # => - # input.y:4: #error "4" - # --AT_CHECK([[sed -e 's/^\([^:]*:[^:.]*\)[.:][^:]*:\(.*\)$/\1:\2/' -e 's/^\([^:]*:[^:]*:\)[^@%:@]*\( @%:@error\)/\1\2/' stderr]], 0, [stdout]) -+# It may also issue more context information: -+# -+# input.y: In function 'yyparse': -+# input.y:8: #error "8" -+# => -+# input.y:4: #error "8" -+# -+AT_CHECK([[sed -e 's/^\([^:]*:[^:.]*\)[.:][^:]*:\(.*\)$/\1:\2/' \ -+ -e 's/^\([^:]*:[^:]*:\)[^@%:@]*\( @%:@error\)/\1\2/' \ -+ -e "/^[^:]*: In function '[^\']*':$/d" \ -+ stderr]], -+ 0, [stdout]) - ]) - - # AT_TEST_SYNCLINE(TITLE, INPUT, ERROR-MSG) --- -cgit v0.8.2.1 diff --git a/bison-2.4.1-7439c5c0f949408 b/bison-2.4.1-7439c5c0f949408 deleted file mode 100644 index cfffdea..0000000 --- a/bison-2.4.1-7439c5c0f949408 +++ /dev/null @@ -1,33 +0,0 @@ -From 7439c5c0f94940884e998c06b910476c6f6145b5 Mon Sep 17 00:00:00 2001 -From: Joel E. Denny -Date: Mon, 05 Oct 2009 02:59:18 +0000 -Subject: tests: skip tests of file names that platform does not support. - -Reported by Michael Raskin at -. -* THANKS (Michael Raskin): Add. -* tests/output.at (AT_CHECK_OUTPUT_FILE_NAME): Fix. Cygwin used -to fail at least for file names containing ":" or "\". -(cherry picked from commit 2ceb8c617cac934b45f101ab44508d72239c894b) - -Conflicts: - - THANKS ---- -diff --git a/tests/output.at b/tests/output.at -index 971df1e..31298d7 100644 ---- a/tests/output.at -+++ b/tests/output.at -@@ -175,6 +175,10 @@ AT_CHECK_CONFLICTING_OUTPUT([foo.y], [], [-o foo.y], - m4_define([AT_CHECK_OUTPUT_FILE_NAME], - [AT_SETUP([Output file name: $1]) - -+# Skip if platform doesn't support file name. For example, Cygwin -+# doesn't support file names containing ":" or "\". -+AT_CHECK([[touch "]AS_ESCAPE([$1[.tmp]])[" || exit 77]]) -+ - AT_DATA_GRAMMAR([glr.y], - [[%glr-parser - %code { --- -cgit v0.8.2.1 diff --git a/bison-2.4.1.tar.bz2 b/bison-2.4.1.tar.bz2 deleted file mode 100644 index 4c05cab..0000000 --- a/bison-2.4.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2354469782149e36c644ae7c3e5105895424ed21cda5c05b591cb3dc17068e6b -size 1467784 diff --git a/bison-2.5.tar.bz2 b/bison-2.5.tar.bz2 new file mode 100644 index 0000000..be23756 --- /dev/null +++ b/bison-2.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a370df6ee2b23e9ec3043e1ab78878241aa008ec424926294dd4cb3475439b8 +size 2030863 diff --git a/bison.changes b/bison.changes index 68de097..73abb51 100644 --- a/bison.changes +++ b/bison.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jun 7 03:06:12 UTC 2011 - crrodriguez@opensuse.org + +- Update to version 2.5 +- Fixes GCC 4.6 warnings +- Changelist too long to fit here, see NEWS. + ------------------------------------------------------------------- Wed Feb 10 16:57:10 CET 2010 - rguenther@suse.de diff --git a/bison.spec b/bison.spec index 3b2d741..78e0b09 100644 --- a/bison.spec +++ b/bison.spec @@ -20,7 +20,7 @@ Name: bison BuildRequires: gcc-c++ -License: GPLv2+ +License: GPLv3+ Group: Development/Languages/C and C++ PreReq: %install_info_prereq AutoReqProv: on @@ -30,15 +30,12 @@ Obsoletes: bison-64bit %endif # Requires: m4 -Version: 2.4.1 +Version: 2.5 Release: 1 Summary: The GNU Parser Generator Url: http://www.gnu.org/software/bison/bison.html Source: bison-%{version}.tar.bz2 Source2: baselibs.conf -Patch1: bison-2.3-subpipe.diff -Patch2: bison-2.4.1-28169bab1f6f2fc -Patch3: bison-2.4.1-7439c5c0f949408 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -46,29 +43,17 @@ Bison is a parser generator similar to yacc(1). %prep %setup -q -%patch1 -%patch2 -p1 -%patch3 -p1 %build -# CXXFLAGS is for c++ examples / test cases -# these are not installed, but building them with $RPM_OPT_FLAGS could -# catch possible problems in bison-generated C++ sources -CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure \ - --prefix=%{_prefix} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --libdir=%{_libdir} +%configure make %{_smp_mflags} + +%check make %{_smp_mflags} check %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -%find_lang %{name} -# FIXME: this should probably go to separate subpackage (see PACKAGING) -%find_lang %{name}-runtime -cat %{name}-runtime.lang >>%{name}.lang +%find_lang %{name} --all-name %clean rm -rf $RPM_BUILD_ROOT