wok-6.x rev 3771
Add: commoncpp2 (1.7.3)
author | Matthew Sheets <rcx@zoominternet.net> |
---|---|
date | Wed Jul 29 16:43:43 2009 +0000 (2009-07-29) |
parents | fcdd092085ae |
children | 0f710d0f94f4 |
files | commoncpp2-dev/receipt commoncpp2/receipt commoncpp2/stuff/1.7.3-gcc4.4.diff |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/commoncpp2-dev/receipt Wed Jul 29 16:43:43 2009 +0000 1.3 @@ -0,0 +1,22 @@ 1.4 +# SliTaz package receipt. 1.5 + 1.6 +PACKAGE="commoncpp2-dev" 1.7 +VERSION="1.7.3" 1.8 +CATEGORY="development" 1.9 +SHORT_DESC="Devel files for commoncpp2." 1.10 +MAINTAINER="rcx@zoominternet.net" 1.11 +DEPENDS="" 1.12 +BUILD_DEPENDS="" 1.13 +WEB_SITE="http://www.gnu.org/software/commoncpp/" 1.14 +WANTED="commoncpp2" 1.15 + 1.16 +# Rules to gen a SliTaz package suitable for Tazpkg. 1.17 +genpkg_rules() 1.18 +{ 1.19 + mkdir -p $fs/usr/lib $fs/usr/share 1.20 + cp -a $_pkg/usr/lib/*.*a $fs/usr/lib 1.21 + cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib 1.22 + cp -a $_pkg/usr/bin $fs/usr 1.23 + cp -a $_pkg/usr/include $fs/usr 1.24 + cp -a $_pkg/usr/share/aclocal $fs/usr/share 1.25 +}
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/commoncpp2/receipt Wed Jul 29 16:43:43 2009 +0000 2.3 @@ -0,0 +1,42 @@ 2.4 +# SliTaz package receipt. 2.5 + 2.6 +PACKAGE="commoncpp2" 2.7 +VERSION="1.7.3" 2.8 +CATEGORY="development" 2.9 +SHORT_DESC="A very portable and highly optimized class framework for writing C++ applications." 2.10 +MAINTAINER="rcx@zoominternet.net" 2.11 +DEPENDS="" 2.12 +BUILD_DEPENDS="slitaz-toolchain" 2.13 +TARBALL="$PACKAGE-$VERSION.tar.gz" 2.14 +WEB_SITE="http://www.gnu.org/software/commoncpp/" 2.15 +WGET_URL="http://www.gnutelephony.org/dist/tarballs/$TARBALL" 2.16 + 2.17 +# Rules to configure and make the package. 2.18 +compile_rules() 2.19 +{ 2.20 + # Apply patch from http://bugs.gentoo.org/show_bug.cgi?id=279505 2.21 + local commoncpp2_diff 2.22 + commoncpp2_diff=$PWD/stuff/1.7.3-gcc4.4.diff 2.23 + 2.24 + cd $src 2.25 + # Only apply the patch once 2.26 + if [ ! -e $src/1.7.3-gcc4.4.diff ] ; then 2.27 + patch -p1 < $commoncpp2_diff 2.28 + cp $commoncpp2_diff $src/1.7.3-gcc4.4.diff 2.29 + fi 2.30 + 2.31 + ./configure \ 2.32 + --prefix=/usr \ 2.33 + --sysconfdir=/etc \ 2.34 + --mandir=/usr/share/man \ 2.35 + $CONFIGURE_ARGS && 2.36 + make && 2.37 + make DESTDIR=$PWD/_pkg install 2.38 +} 2.39 + 2.40 +# Rules to gen a SliTaz package suitable for Tazpkg. 2.41 +genpkg_rules() 2.42 +{ 2.43 + mkdir -p $fs/usr/lib 2.44 + cp -a $_pkg/usr/lib/*.so* $fs/usr/lib 2.45 +}
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/commoncpp2/stuff/1.7.3-gcc4.4.diff Wed Jul 29 16:43:43 2009 +0000 3.3 @@ -0,0 +1,24 @@ 3.4 +--- commoncpp2-1.7.3.org/src/cidr.cpp 2009-01-16 07:27:00.000000000 -0500 3.5 ++++ commoncpp2-1.7.3/src/cidr.cpp 2009-07-28 15:29:02.881384386 -0400 3.6 +@@ -199,11 +199,7 @@ void IPV4Cidr::set(const char *cp) 3.7 + bitset((bit_t *)&netmask, getMask(cp)); 3.8 + setString(cbuf, sizeof(cbuf), cp); 3.9 + 3.10 +-#if defined(_MSC_VER) && _MSC_VER >= 1500 3.11 +- ep = (char *)strchr(cp, '/'); 3.12 +-#else 3.13 +- ep = strchr(cp, '/'); 3.14 +-#endif 3.15 ++ ep = (char *)strchr(cp, '/'); // see bug #279505 and #275750 3.16 + 3.17 + if(ep) 3.18 + *ep = 0; 3.19 +@@ -332,7 +328,7 @@ void IPV6Cidr::set(const char *cp) 3.20 + memset(&netmask, 0, sizeof(netmask)); 3.21 + bitset((bit_t *)&netmask, getMask(cp)); 3.22 + setString(cbuf, sizeof(cbuf), cp); 3.23 +- ep = strchr(cp, '/'); 3.24 ++ ep = (char *)strchr(cp, '/'); // see bug #279505 and #275750 3.25 + if(ep) 3.26 + *ep = 0; 3.27 +