Compare commits
4 Commits
Author | SHA1 | Date |
---|---|---|
Fedora Release Engineering | 92f09c3f1a | |
Bill Nottingham | b48c83f313 | |
Petr Machata | 5be7ea0e30 | |
Jesse Keating | be21cbc34e |
21
Makefile
21
Makefile
|
@ -1,21 +0,0 @@
|
|||
# Makefile for source rpm: boost
|
||||
# $Id: Makefile,v 1.3 2005/08/19 17:39:58 bkoz Exp $
|
||||
NAME := boost
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attempt a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
|
@ -0,0 +1,40 @@
|
|||
*** boost/regex/v4/basic_regex_parser.hpp.orig 2008-01-14 12:53:01.000000000 -0600
|
||||
--- boost/regex/v4/basic_regex_parser.hpp 2008-01-14 12:57:25.000000000 -0600
|
||||
*************** bool basic_regex_parser<charT, traits>::
|
||||
*** 777,782 ****
|
||||
--- 777,783 ----
|
||||
case syntax_element_restart_continue:
|
||||
case syntax_element_jump:
|
||||
case syntax_element_startmark:
|
||||
+ case syntax_element_backstep:
|
||||
// can't legally repeat any of the above:
|
||||
fail(regex_constants::error_badrepeat, m_position - m_base);
|
||||
return false;
|
||||
*************** bool basic_regex_parser<charT, traits>::
|
||||
*** 1862,1867 ****
|
||||
--- 1863,1869 ----
|
||||
if(markid == -4)
|
||||
{
|
||||
re_syntax_base* b = this->getaddress(expected_alt_point);
|
||||
+ // Make sure we have exactly one alternative following this state:
|
||||
if(b->type != syntax_element_alt)
|
||||
{
|
||||
re_alt* alt = static_cast<re_alt*>(this->insert_state(expected_alt_point, syntax_element_alt, sizeof(re_alt)));
|
||||
*************** bool basic_regex_parser<charT, traits>::
|
||||
*** 1872,1877 ****
|
||||
--- 1874,1888 ----
|
||||
fail(regex_constants::error_bad_pattern, m_position - m_base);
|
||||
return false;
|
||||
}
|
||||
+ // check for invalid repetition of next state:
|
||||
+ b = this->getaddress(expected_alt_point);
|
||||
+ b = this->getaddress(static_cast<re_alt*>(b)->next.i, b);
|
||||
+ if((b->type != syntax_element_assert_backref)
|
||||
+ && (b->type != syntax_element_startmark))
|
||||
+ {
|
||||
+ fail(regex_constants::error_badrepeat, m_position - m_base);
|
||||
+ return false;
|
||||
+ }
|
||||
}
|
||||
//
|
||||
// append closing parenthesis state:
|
|
@ -1,7 +1,7 @@
|
|||
Name: boost
|
||||
Summary: The Boost C++ Libraries
|
||||
Version: 1.34.1
|
||||
Release: 5%{?dist}
|
||||
Release: 7%{?dist}
|
||||
License: Boost Software License (GPL-Compatible, Free Software License)
|
||||
URL: http://www.boost.org/
|
||||
Group: System Environment/Libraries
|
||||
|
@ -25,6 +25,7 @@ Patch0: boost-configure.patch
|
|||
Patch1: boost-gcc-soname.patch
|
||||
Patch2: boost-use-rpm-optflags.patch
|
||||
Patch3: boost-run-tests.patch
|
||||
Patch4: boost-regex.patch
|
||||
|
||||
%description
|
||||
Boost provides free peer-reviewed portable C++ source libraries. The
|
||||
|
@ -69,6 +70,7 @@ rm -rf %{buildroot}
|
|||
%patch1 -p0
|
||||
%patch2 -p0
|
||||
%patch3 -p0
|
||||
%patch4 -p0
|
||||
|
||||
%build
|
||||
BOOST_ROOT=`pwd`
|
||||
|
@ -199,6 +201,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%doc %{_docdir}/boost-%{version}
|
||||
|
||||
%changelog
|
||||
* Wed Jan 16 2008 Petr Machata <pmachata@redhat.com> 1.34.1-7
|
||||
- Fixes for boost.regex (rev 42674).
|
||||
|
||||
* Wed Sep 19 2007 Benjamin Kosnik <bkoz@redhat.com> 1.34.1-5
|
||||
- (#283771: Linking against boost libraries fails).
|
||||
|
||||
|
|
Loading…
Reference in New Issue