auto-import boost-1.32.0-1 on branch devel from boost-1.32.0-1.src.rpm
This commit is contained in:
Benjamin Kosnik
parent
e178341fd7
commit
7e774a9786
|
|
@ -1 +1 @@
|
|||
boost_1_31_0.tar.bz2
|
||||
boost_1_32_0.tar.bz2
|
||||
|
|
|
|||
|
|
@ -1,19 +1,36 @@
|
|||
*** tools/build/v1/gcc-tools.jam.orig 2004-04-01 20:08:47.000000000 -0600
|
||||
--- tools/build/v1/gcc-tools.jam 2004-04-01 20:11:02.000000000 -0600
|
||||
*************** actions gcc-Link-action bind NEEDLIBS NE
|
||||
*** 430,436 ****
|
||||
{
|
||||
$(SHELL_SET)$(gSHELL_LIBPATH)=$(LINK_LIBPATH)$(gAPPEND_LD_LIBRARY_PATH)
|
||||
$(SHELL_EXPORT)$(gSHELL_LIBPATH)
|
||||
! $(.GXX[1]:R=$(GCC_BIN_DIR)) $(.GXX[2-]) $(IMPLIB_COMMAND)$(<[2]) $(LINKFLAGS) -o "$(<[1])$(OUTTAG)" -L"$(LIBPATH:T)" -L"$(STDLIBPATH:T)" "$(>)" "$(NEEDLIBS)" "$(NEEDLIBS)" "$(IMPLIB_FLAGS)$(NEEDIMPS)" -l$(FINDLIBS) $(LNOPT)$(RPATH_LINK). $(LNOPT)$(SONAME)$(<[1]:D=)$(SOTAG)
|
||||
$(ACTION_1)$(LN)$(_)-fs$(_)"$(<[1]:D=)$(OUTTAG)"$(_)"$(<[1])"
|
||||
}
|
||||
*** tools/build/v1/gcc-tools.jam 2004-11-29 17:38:40.295847046 -0600
|
||||
--- tools/build/v1/gcc-tools.jam.new 2004-11-29 17:39:37.962664115 -0600
|
||||
*************** flags gcc LINKFLAGS <runtime-link>static
|
||||
*** 60,66 ****
|
||||
flags gcc CFLAGS <debug-symbols>on : -g ;
|
||||
flags gcc LINKFLAGS <debug-symbols>on : -g ;
|
||||
flags gcc CFLAGS <optimization>off : -O0 ;
|
||||
! flags gcc CFLAGS <optimization>speed : -O3 ;
|
||||
|
||||
--- 430,436 ----
|
||||
{
|
||||
$(SHELL_SET)$(gSHELL_LIBPATH)=$(LINK_LIBPATH)$(gAPPEND_LD_LIBRARY_PATH)
|
||||
$(SHELL_EXPORT)$(gSHELL_LIBPATH)
|
||||
! $(.GXX[1]:R=$(GCC_BIN_DIR)) $(.GXX[2-]) $(IMPLIB_COMMAND)$(<[2]) $(LINKFLAGS) -o "$(<[1])$(OUTTAG)" -L"$(LIBPATH:T)" -L"$(STDLIBPATH:T)" "$(>)" "$(NEEDLIBS)" "$(NEEDLIBS)" "$(IMPLIB_FLAGS)$(NEEDIMPS)" -l$(FINDLIBS) $(LNOPT)$(RPATH_LINK). $(LNOPT)$(SONAME)$(<[1]:D=).1
|
||||
$(ACTION_1)$(LN)$(_)-fs$(_)"$(<[1]:D=)$(OUTTAG)"$(_)"$(<[1])"
|
||||
}
|
||||
# Other optimizations we might want for GCC
|
||||
# -fforce-mem -fomit-frame-pointer
|
||||
--- 60,66 ----
|
||||
flags gcc CFLAGS <debug-symbols>on : -g ;
|
||||
flags gcc LINKFLAGS <debug-symbols>on : -g ;
|
||||
flags gcc CFLAGS <optimization>off : -O0 ;
|
||||
! flags gcc CFLAGS <optimization>speed : -O2 ;
|
||||
|
||||
# Other optimizations we might want for GCC
|
||||
# -fforce-mem -fomit-frame-pointer
|
||||
*************** rule Link-action
|
||||
*** 387,393 ****
|
||||
if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = LINUX || $(OS) = OPENBSD ) && ! $(NO_GNU_LN)
|
||||
{
|
||||
OUTTAG on $(<) = ".$(DLLVERSION)" ;
|
||||
! SOTAG on $(<) = ".$(DLLVERSION)" ;
|
||||
ACTION_1 on $(<) = "" ;
|
||||
}
|
||||
else
|
||||
--- 387,393 ----
|
||||
if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = LINUX || $(OS) = OPENBSD ) && ! $(NO_GNU_LN)
|
||||
{
|
||||
OUTTAG on $(<) = ".$(DLLVERSION)" ;
|
||||
! SOTAG on $(<) = ".1" ;
|
||||
ACTION_1 on $(<) = "" ;
|
||||
}
|
||||
else
|
||||
|
|
|
|||
46
boost.spec
46
boost.spec
|
|
@ -1,9 +1,9 @@
|
|||
%define tarball_name boost_1_31_0
|
||||
%define tarball_name boost_1_32_0
|
||||
|
||||
Name: boost
|
||||
Summary: The Boost C++ Libraries
|
||||
Version: 1.31.0
|
||||
Release: 9
|
||||
Version: 1.32.0
|
||||
Release: 1
|
||||
License: Boost Software License
|
||||
URL: http://www.boost.org/
|
||||
Group: System Environment/Libraries
|
||||
|
|
@ -11,12 +11,12 @@ Source: %{tarball_name}.tar.bz2
|
|||
BuildRoot: %{_tmppath}/boost-%{version}-root
|
||||
Prereq: /sbin/ldconfig
|
||||
BuildRequires: libstdc++-devel python
|
||||
Obsoletes: boost <= 1.31.0
|
||||
Obsoletes: boost-devel <= 1.31.0
|
||||
Obsoletes: boost-doc <= 1.30.2
|
||||
Obsoletes: boost-python <= 1.30.2
|
||||
Patch0: boost-compiler.patch
|
||||
Patch1: boost-base.patch
|
||||
Patch2: boost-gcc-tools.patch
|
||||
Patch3: boost-lambda.patch
|
||||
Patch0: boost-base.patch
|
||||
Patch1: boost-gcc-tools.patch
|
||||
|
||||
%description
|
||||
Boost provides free peer-reviewed portable C++ source libraries. The
|
||||
|
|
@ -43,8 +43,6 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%setup -n %{tarball_name} -q
|
||||
%patch0 -p0
|
||||
%patch1 -p0
|
||||
%patch2 -p0
|
||||
%patch3 -p0
|
||||
|
||||
%build
|
||||
#build bjam
|
||||
|
|
@ -53,37 +51,39 @@ rm -rf $RPM_BUILD_ROOT
|
|||
BJAM=`find tools/build/jam_src/ -name bjam -a -type f`
|
||||
PYTHON_VERSION=`python -V 2>&1 |sed 's,.* \([0-9]\.[0-9]\)\(\.[0-9]\)\?.*,\1,'`
|
||||
PYTHON_FLAGS="-sPYTHON_ROOT=/usr -sPYTHON_VERSION=$PYTHON_VERSION"
|
||||
#$BJAM $PYTHON_FLAGS "-sTOOLS=gcc" "-sBUILD=release <dllversion>1"
|
||||
$BJAM $PYTHON_FLAGS "-sTOOLS=gcc" "-sBUILD=release"
|
||||
#$BJAM $PYTHON_FLAGS "-sTOOLS=gcc" "-sBUILD=release <dllversion>1" stage
|
||||
$BJAM $PYTHON_FLAGS "-sTOOLS=gcc" "-sBUILD=release" stage
|
||||
|
||||
%install
|
||||
mkdir -p $RPM_BUILD_ROOT%{_libdir}
|
||||
mkdir -p $RPM_BUILD_ROOT%{_includedir}
|
||||
|
||||
# install lib
|
||||
for i in `find bin -type f -name \*.a`; do
|
||||
NAME=`basename $i | sed 's,-gcc,,' | sed 's,-mt,,' | sed 's,-1_31,,'`;
|
||||
install -m 644 $i $RPM_BUILD_ROOT%{_libdir}/$NAME;
|
||||
for i in `find stage -type f -name \*.a`; do
|
||||
NAME=`basename $i`;
|
||||
install -m 755 $i $RPM_BUILD_ROOT%{_libdir}/$NAME;
|
||||
done;
|
||||
for i in `find bin -type f -name \*.so.1.31.0`; do
|
||||
NAME=`basename $i | sed 's,-gcc,,' | sed 's,-mt,,' | sed 's,-1_31,,'`;
|
||||
install -m 644 $i $RPM_BUILD_ROOT%{_libdir}/$NAME;
|
||||
for i in `find stage -type f -name \*.so.*`; do
|
||||
NAME=`basename $i`;
|
||||
install -m 755 $i $RPM_BUILD_ROOT%{_libdir}/$NAME;
|
||||
done;
|
||||
|
||||
# install include files
|
||||
for i in `find boost -type d`; do
|
||||
mkdir -p $RPM_BUILD_ROOT%{_includedir}/$i
|
||||
mkdir -p $RPM_BUILD_ROOT%{_includedir}/$i
|
||||
done
|
||||
for i in `find boost -type f`; do
|
||||
install -m 644 $i $RPM_BUILD_ROOT%{_includedir}/$i
|
||||
install -m 644 $i $RPM_BUILD_ROOT%{_includedir}/$i
|
||||
done
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-, root, root)
|
||||
|
|
@ -95,6 +95,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%{_libdir}/*.a
|
||||
|
||||
%changelog
|
||||
* Mon Nov 29 2004 Benjamin Kosnik <bkoz@redhat.com> 1.32.0-1
|
||||
- Update to 1.32.0
|
||||
- (#122817: libboost_*.so symlinks missing)
|
||||
|
||||
* Wed Sep 22 2004 Than Ngo <than@redhat.com> 1.31.0-9
|
||||
- cleanup specfile
|
||||
- fix multiarch problem
|
||||
|
|
|
|||
Loading…
Reference in New Issue