summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Mizrahi <alan+crux@mizrahi.com.ve>2010-11-05 15:23:30 +0900
committerAlan Mizrahi <alan+crux@mizrahi.com.ve>2010-11-05 15:23:30 +0900
commit91f56fd004734e78cb685cd832c9f65a2dea0be8 (patch)
treee172400173bd88974ed937ae0411e65b32773c7c
parentb62498892ddc5179cf4df05ec5f43966d4acf190 (diff)
downloadcontrib-2.6.tar.gz
contrib-2.6.tar.xz
commoncpp2: Fixed compilation error2.6
-rw-r--r--commoncpp2/.md5sum1
-rw-r--r--commoncpp2/Pkgfile4
-rw-r--r--commoncpp2/cidr-fix.patch20
3 files changed, 24 insertions, 1 deletions
diff --git a/commoncpp2/.md5sum b/commoncpp2/.md5sum
index c85e11e4f..8ebdd904a 100644
--- a/commoncpp2/.md5sum
+++ b/commoncpp2/.md5sum
@@ -1 +1,2 @@
+e37b579c3e50493eb31d160582a190dd cidr-fix.patch
ca741179a728d264eb276ae471ebaf70 commoncpp2-1.7.3.tar.gz
diff --git a/commoncpp2/Pkgfile b/commoncpp2/Pkgfile
index 4f9a1ac42..57da9a1ad 100644
--- a/commoncpp2/Pkgfile
+++ b/commoncpp2/Pkgfile
@@ -7,13 +7,15 @@
name=commoncpp2
version=1.7.3
release=1
-source=(http://ftp.gnu.org/pub/gnu/commoncpp/$name-$version.tar.gz)
+source=(http://ftp.gnu.org/pub/gnu/commoncpp/$name-$version.tar.gz cidr-fix.patch)
build () {
cd $name-$version
# sed -i 's|! grep -q "$(libdir)" /etc/ld.so.conf|false|' Makefile.in
# export CFLAGS="${CFLAGS//-fstack-protector/}"
# export CXXFLAGS="${CXXFLAGS//-fstack-protector/}"
+
+ patch -p1 -i $SRC/cidr-fix.patch
./configure --prefix=/usr
make
make DESTDIR=$PKG install
diff --git a/commoncpp2/cidr-fix.patch b/commoncpp2/cidr-fix.patch
new file mode 100644
index 000000000..a1eadf07d
--- /dev/null
+++ b/commoncpp2/cidr-fix.patch
@@ -0,0 +1,20 @@
+--- commoncpp2-1.7.3/src/cidr.cpp.orig 2010-11-05 15:16:34.745000077 +0900
++++ commoncpp2-1.7.3/src/cidr.cpp 2010-11-05 15:17:37.565000070 +0900
+@@ -202,7 +202,7 @@
+ #if defined(_MSC_VER) && _MSC_VER >= 1500
+ ep = (char *)strchr(cp, '/');
+ #else
+- ep = strchr(cp, '/');
++ ep = (char *)strchr(cp, '/');
+ #endif
+
+ if(ep)
+@@ -332,7 +332,7 @@
+ memset(&netmask, 0, sizeof(netmask));
+ bitset((bit_t *)&netmask, getMask(cp));
+ setString(cbuf, sizeof(cbuf), cp);
+- ep = strchr(cp, '/');
++ ep = (char *)strchr(cp, '/');
+ if(ep)
+ *ep = 0;
+

Generated by cgit