Author: jajcus Date: Thu Apr 28 11:41:15 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- fixes merge from PTLIB_2_8 branch (1.25-1.25.2.2):
---- Files affected:
packages/ptlib:
ptlib-std_allocator.patch (1.1 -> 1.2) , ptlib.spec (1.26 -> 1.27)
---- Diffs:
================================================================
Index: packages/ptlib/ptlib-std_allocator.patch
diff -u packages/ptlib/ptlib-std_allocator.patch:1.1
packages/ptlib/ptlib-std_allocator.patch:1.2
--- packages/ptlib/ptlib-std_allocator.patch:1.1 Thu Apr 28 13:21:03 2011
+++ packages/ptlib/ptlib-std_allocator.patch Thu Apr 28 13:41:10 2011
@@ -1,10 +1,10 @@
---- ptlib-2.8.3/include/ptlib/object.h.orig 2010-12-20 23:39:10.000000000
+0100
-+++ ptlib-2.8.3/include/ptlib/object.h 2011-04-28 13:08:04.000000000 +0200
-@@ -947,7 +947,7 @@
+--- ptlib-2.10.0/include/ptlib/object.h.orig 2011-02-23 05:53:19.000000000
+0100
++++ ptlib-2.10.0/include/ptlib/object.h 2011-04-28 13:27:31.000000000
+0200
+@@ -977,7 +977,7 @@
// Memory pooling allocators
--#if defined(__GNUC__) && __GNUC__ >= 4 && !defined(P_MINGW)
+-#if defined(__GNUC__) && __GNUC__ >= 4 && !defined(P_MINGW) &&
!defined(P_MACOSX)
+#if 0
#include <ext/bitmap_allocator.h>
template <class Type> class PFixedPoolAllocator : public
__gnu_cxx::bitmap_allocator<Type> { };
================================================================
Index: packages/ptlib/ptlib.spec
diff -u packages/ptlib/ptlib.spec:1.26 packages/ptlib/ptlib.spec:1.27
--- packages/ptlib/ptlib.spec:1.26 Fri Mar 4 21:39:44 2011
+++ packages/ptlib/ptlib.spec Thu Apr 28 13:41:10 2011
@@ -1,6 +1,4 @@
# $Revision$, $Date$
-# TODO:
-# IPv6 support disabled ('NULL' undeclared)
#
# Conditional build:
%bcond_without http # Disable http support
@@ -19,6 +17,7 @@
URL: http://www.opalvoip.org/
Source0:
http://downloads.sourceforge.net/opalvoip/%{name}-%{version}.tar.bz2
# Source0-md5: 39d53e09a698bd6099088b4465cfc841
+Patch0: %{name}-std_allocator.patch
License: MPLv1.0
Group: Libraries
%{?with_video:BuildRequires: SDL-devel}
@@ -156,6 +155,7 @@
%prep
%setup -q
+%patch0 -p1
%build
# note: --enable-opal influences most of the remaining enable/disable defaults
@@ -197,9 +197,11 @@
dir=$(pwd)
%{__make} %{?debug:debugshared}%{!?debug:optshared} \
+ V=1 \
PTLIBMAKEDIR="$dir/make" \
PTLIBDIR="$dir" \
- OPTCCFLAGS="%{rpmcflags} %{!?debug:-DNDEBUG}"\
+ CFLAGS="%{rpmcflags} %{!?debug:-DNDEBUG} -DUSE_GCC" \
+ LDFLAGS="%{rpmcflags} %{rpmldflags} %{!?debug:-DNDEBUG}" \
CXX="%{__cxx}"
@@ -210,13 +212,16 @@
dir=$(pwd)
%{__make} install \
+ V=1 \
DESTDIR=$RPM_BUILD_ROOT
-cp -d %{_libdir}/lib*.a $RPM_BUILD_ROOT%{_libdir}
cp version.h $RPM_BUILD_ROOT%{_includedir}/%{name}
sed -i -e 's#PTLIBDIR=.*#PTLIBDIR=%{_datadir}/ptlib#g'
$RPM_BUILD_ROOT%{_datadir}/ptlib/make/plugins.mak
+chmod a+x $RPM_BUILD_ROOT%{_libdir}/lib*.so.*
+find $RPM_BUILD_ROOT%{_libdir}/ptlib-* -name '*.so' | xargs chmod a+x
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -282,8 +287,18 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.26 2011/03/04 20:39:44 arekm
-- up to 2.10
+Revision 1.27 2011/04/28 11:41:10 jajcus
+- fixes merge from PTLIB_2_8 branch (1.25-1.25.2.2):
+
+Revision 1.25.2.2 2011/04/28 11:21:03 jajcus
+- use std:allocator instead of some internal GCC API (which crashes ptlib apps
+ with our GCC/libstdc++)
+
+Revision 1.25.2.1 2011/04/28 11:13:03 jajcus
+- better passing of %{rpmcflags} and %{rpmldflags}
+- use verbose build so the flags used are visible
+- do not include all static libraries from the build system
+- set executable bit on shared libraries, so their debuginfo is extracted
Revision 1.25 2011/01/03 08:57:39 caleb
- Up to 2.8.3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ptlib/ptlib-std_allocator.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ptlib/ptlib.spec?r1=1.26&r2=1.27&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
