Author: glen Date: Wed Jan 10 23:52:57 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use %{__cc}, %{__cxx}
- enable icu
- install subshell optimize
- sane python version extraction
- built on ac-i686
---- Files affected:
SPECS:
boost.spec (1.73 -> 1.74)
---- Diffs:
================================================================
Index: SPECS/boost.spec
diff -u SPECS/boost.spec:1.73 SPECS/boost.spec:1.74
--- SPECS/boost.spec:1.73 Fri Jan 5 22:40:30 2007
+++ SPECS/boost.spec Thu Jan 11 00:52:52 2007
@@ -18,6 +18,7 @@
URL: http://www.boost.org/
BuildRequires: boost-jam >= 3.1.3
BuildRequires: bzip2-devel
+BuildRequires: libicu-devel
BuildRequires: libstdc++-devel
BuildRequires: perl-base
%{?with_python:BuildRequires: python-devel >= 2.2}
@@ -414,8 +415,8 @@
%description program_options -l pl
Biblioteka program_options umożliwia uzyskanie od użytkownika opcji
-programu, czyli par (nazwa, wartość), za pomocą typowych metod,
-takich jak linia poleceń, czy plik konfiguracyjny.
+programu, czyli par (nazwa, wartość), za pomocą typowych metod, takich
+jak linia poleceń, czy plik konfiguracyjny.
%package program_options-devel
Summary: Header files for boost::program_options
@@ -667,7 +668,7 @@
%build
%if %{with python}
-PYTHON_VERSION=`python -V 2>&1 | sed 's,.*
\([0-9]\.[0-9]\)\(\.[0-9]\)\?.*,\1,'`
+PYTHON_VERSION=$(%{__python} -c 'import sys; print sys.version[0:3]')
PYTHON_ROOT=%{_prefix}
%else
PYTHON_ROOT=
@@ -675,6 +676,9 @@
%endif
bjam \
-d2 \
+ -sGXX="%{__cc}" \
+ -sGCC="%{__cxx}" \
+ -sHAVE_ICU=1 -sICU_PATH=/usr \
-sBUILD="release <threading>multi <shared-linkable>true <inlining>on" \
-sPYTHON_ROOT=$PYTHON_ROOT \
-sPYTHON_VERSION=$PYTHON_VERSION
@@ -714,10 +718,11 @@
# own, we need to find out ourselves... this looks for HTML files and
# then collects everything linked from those. this is certainly quite
# unoptimized wrt mkdir calls, but does it really matter?
-for i in `find -type f -name '*.htm*'`; do
+installdocs() {
+for i in $(find -type f -name '*.htm*'); do
# bjam docu is included in the boost-jam RPM
if test "`echo $i | sed 's,jam_src,,'`" = "$i"; then
- install -d $RPM_BUILD_ROOT%{_docdir}/boost-%{version}/`dirname
$i`
+ install -d $RPM_BUILD_ROOT%{_docdir}/boost-%{version}/${i%/*}
for LINKED in `%{__perl} - $i
$RPM_BUILD_ROOT%{_docdir}/boost-%{version}/$i <<'EOT'
sub rewrite_link
{
@@ -743,15 +748,15 @@
$in_link = /href|src=\s*$/;
}
EOT`; do
- TARGET=`dirname $i`/$LINKED
+ TARGET=${i%/*}/$LINKED
# ignore non-existant linked files
if test -f $TARGET; then
- install -d
$RPM_BUILD_ROOT%{_docdir}/boost-%{version}/`dirname $TARGET`
- install -m 644 $TARGET
$RPM_BUILD_ROOT%{_docdir}/boost-%{version}/$TARGET
+ install -D -m 644 $TARGET
$RPM_BUILD_ROOT%{_docdir}/boost-%{version}/$TARGET
fi
done
fi
done
+}; installdocs
%clean
rm -rf $RPM_BUILD_ROOT
@@ -1123,6 +1128,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.74 2007/01/10 23:52:52 glen
+- use %{__cc}, %{__cxx}
+- enable icu
+- install subshell optimize
+- sane python version extraction
+- built on ac-i686
+
Revision 1.73 2007/01/05 21:40:30 arekm
- rel 6
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/boost.spec?r1=1.73&r2=1.74&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
