From 7e774a9786245ba0a4f0fe2e8ba6457f9d74aa89 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Tue, 30 Nov 2004 02:24:44 +0000 Subject: [PATCH] auto-import boost-1.32.0-1 on branch devel from boost-1.32.0-1.src.rpm --- .cvsignore | 2 +- boost-gcc-tools.patch | 51 ++++++++++++++++++++++++++++--------------- boost.spec | 46 ++++++++++++++++++++------------------ sources | 2 +- 4 files changed, 61 insertions(+), 40 deletions(-) diff --git a/.cvsignore b/.cvsignore index b82765c..7e86a0c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -boost_1_31_0.tar.bz2 +boost_1_32_0.tar.bz2 diff --git a/boost-gcc-tools.patch b/boost-gcc-tools.patch index aba1e1a..e989d8a 100644 --- a/boost-gcc-tools.patch +++ b/boost-gcc-tools.patch @@ -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 static +*** 60,66 **** + flags gcc CFLAGS on : -g ; + flags gcc LINKFLAGS on : -g ; + flags gcc CFLAGS off : -O0 ; +! flags gcc CFLAGS 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 on : -g ; + flags gcc LINKFLAGS on : -g ; + flags gcc CFLAGS off : -O0 ; +! flags gcc CFLAGS 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 diff --git a/boost.spec b/boost.spec index 759fa22..35a3eed 100644 --- a/boost.spec +++ b/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 1" -$BJAM $PYTHON_FLAGS "-sTOOLS=gcc" "-sBUILD=release" +#$BJAM $PYTHON_FLAGS "-sTOOLS=gcc" "-sBUILD=release 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 1.32.0-1 +- Update to 1.32.0 +- (#122817: libboost_*.so symlinks missing) + * Wed Sep 22 2004 Than Ngo 1.31.0-9 - cleanup specfile - fix multiarch problem diff --git a/sources b/sources index 7da5f38..c9bbf73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8cc183538eaa5cfc53d88d0e94bd2fd4 boost_1_31_0.tar.bz2 +e1d1fc7b8fc8c51df4564c2188ca51cb boost_1_32_0.tar.bz2