Permalink
Browse files

some, but not all fedora 17 compiler issues

  • Loading branch information...
1 parent 0e2066b commit cf08c81a2fdc203b54c2ad0ad1dbaa0fd0dc0028 @ezuce-admin ezuce-admin committed Sep 18, 2012
View
@@ -59,11 +59,26 @@ lib_common = \
v8 \
oss_core
+# broken : ruby-postgres, v8, oss_core only because of v8
+lib_fedora_17 = \
+ resiprocate \
+ rubygem-file-tail \
+ freeswitch \
+ hiredis \
+ js \
+ net-snmp \
+ homer \
+ OpenACD \
+ openfire \
+ erlmongo \
+ ruby-dbi \
+ cfengine
+
lib_fedora_16 = \
$(lib_common) \
sec
-$(foreach V,17 18 19 20,$(eval lib_fedora_$(V) = $(lib_common)))
+$(foreach V,17 18 19 20,$(eval lib_fedora_$(V) = $(lib_fedora_17)))
lib_centos_6 = \
epel-release \
@@ -660,13 +660,13 @@ protected static String compress(String orig) {
String normal = orig.toUpperCase();
// Brute force conversion of diacriticals
- normal = normal.replaceAll("[ÂÀÄÁÃ]", "A");
- normal = normal.replaceAll("[ÊÈËÉ]", "E");
- normal = normal.replaceAll("[ÎÌÏÍ]", "I");
- normal = normal.replaceAll("[ÔÒÖÓÕ]", "O");
- normal = normal.replaceAll("[ÛÙÜÚ]", "U");
- normal = normal.replaceAll("Ç", "C");
- normal = normal.replaceAll("Ñ", "N");
+ normal = normal.replaceAll("[\u00C0\u00C1\u00C2\u00C3\u00C4]", "A");
+ normal = normal.replaceAll("[\u00C8\u00C9\u00CA\u00CB]", "E");
+ normal = normal.replaceAll("[\u00CC\u00CD\u00CE\u00CF]", "I");
+ normal = normal.replaceAll("[\u00D2\u00D3\u00D4\u00D5\u00D6]", "O");
+ normal = normal.replaceAll("[\u00D9\u00DA\u00DB\u00DC]", "U");
+ normal = normal.replaceAll("\u00C7", "C");
+ normal = normal.replaceAll("\u00D1", "N");
// Remove non letters
normal = normal.replaceAll("[^A-Z]", "");
@@ -18,7 +18,7 @@ public void testCompress() {
assertEquals("WOOF", ValidUsers.compress("Woof!"));
assertEquals("WOOFWASHERE", ValidUsers.compress("Woof! was here."));
assertEquals("SPYDERTROBINSONRD", ValidUsers.compress("Spyder T. Robinson 3rd"));
- assertEquals("FRAUBRUCHER", ValidUsers.compress("Fräu BrÜcher"));
+ assertEquals("FRAUBRUCHER", ValidUsers.compress("Fr\u00E4u Br\u00DCcher"));
}
public void testMapDTMF() {
@@ -19,7 +19,14 @@ libsipdb_la_LDFLAGS = \
-shared \
@ODBC_LDFLAGS@
+# Fedora 17 port - Permissive compiler to get around
+# MongoDB.cpp:68:1: required from here
+# /usr/include/boost/program_options/detail/config_file.hpp:163:13: error: 'to_internal' was not
+# declared in this scope, and no declarations were found by argument-dependent lookup at the
+# point of instantiation [-fpermissive]
+#
libsipdb_la_CXXFLAGS = \
+ -fpermissive \
-DSIPX_CONFDIR=\"@SIPX_CONFDIR@\" \
-DSIPX_LOGDIR=\"@SIPX_LOGDIR@\" \
-DSIPX_RUNDIR=\"@SIPX_RUNDIR@\" \
@@ -19,6 +19,7 @@
#include <sstream>
#include <map>
#include <vector>
+#include <boost/version.hpp>
#include <boost/noncopyable.hpp>
#include <boost/filesystem.hpp>
#include <boost/thread.hpp>
@@ -323,7 +324,13 @@ namespace Os
bool filter(int facility, int priority, const std::string& task, std::ostringstream& headers, std::string& message)
{
+#if (BOOST_VERSION < 104800)
+ // CentOS 6
headers << boost::interprocess::detail::atomic_inc32(&_counter) + 1 << ":";
+#else
+ //Fedora 17 or greater
+ headers << boost::interprocess::ipcdetail::atomic_inc32(&_counter) + 1 << ":";
+#endif
return true;
}

0 comments on commit cf08c81

Please sign in to comment.