summaryrefslogtreecommitdiffstats
path: root/meta/packages/opensync/libopensync
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/opensync/libopensync')
-rw-r--r--meta/packages/opensync/libopensync/fix-attr.patch13
-rw-r--r--meta/packages/opensync/libopensync/gcc.patch29
-rw-r--r--meta/packages/opensync/libopensync/no-werror.patch13
-rw-r--r--meta/packages/opensync/libopensync/zlib.patch13
4 files changed, 0 insertions, 68 deletions
diff --git a/meta/packages/opensync/libopensync/fix-attr.patch b/meta/packages/opensync/libopensync/fix-attr.patch
deleted file mode 100644
index 7a2e5441c8..0000000000
--- a/meta/packages/opensync/libopensync/fix-attr.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: trunk/opensync/merger/opensync_xmlfield.c
2===================================================================
3--- trunk.orig/opensync/merger/opensync_xmlfield.c 2007-04-12 16:40:07.000000000 +0200
4+++ trunk/opensync/merger/opensync_xmlfield.c 2007-04-12 16:40:11.000000000 +0200
5@@ -298,7 +298,7 @@
6 int count;
7 xmlAttrPtr attr = xmlfield->node->properties;
8
9- for(count=0; attribute != NULL; count++) {
10+ for(count=0; attr != NULL; count++) {
11 if(count == nth)
12 return (const char *)attr->name;
13 attr = attr->next;
diff --git a/meta/packages/opensync/libopensync/gcc.patch b/meta/packages/opensync/libopensync/gcc.patch
deleted file mode 100644
index 3eee014339..0000000000
--- a/meta/packages/opensync/libopensync/gcc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Index: trunk/SConstruct
2===================================================================
3--- trunk.orig/SConstruct 2007-04-25 13:20:13.000000000 +0200
4+++ trunk/SConstruct 2007-04-25 14:00:02.000000000 +0200
5@@ -36,7 +36,11 @@
6 opts.Add(BoolOption('enable_python', 'Build python wrapper? (swig required)', 0))
7 opts.Add(BoolOption('debug_modules', 'Should unloading of shared modules be avoided (DEBUGGING ONLY!)', 0))
8 opts.Add(BoolOption('enable_doxygen', 'Generating OpenSync API with doxygen?', 0))
9-
10+opts.AddOptions(
11+('CC', 'Path to Custom c compiler', 'gcc'),
12+('CXX', 'Path to Custom c++ compiler flags', 'g++'),
13+('LDFLAGS', 'Linker flags', ''),
14+)
15
16 target_dir = SelectBuildDir('build')
17 sys.path.append(target_dir)
18@@ -63,6 +67,11 @@
19 env.Append(CCFLAGS = r'-DENABLE_TOOLS=$enable_tools')
20 env.Append(CCFLAGS = r'-DENABLE_PROFILING=$enable_profiling')
21
22+env.Replace(
23+ CC = env['CC'],
24+ CXX = env['CXX'],
25+ LDFLAGS = env['LDFLAGS']
26+)
27
28 # pkg config files
29 subst_dict={'@prefix@': '$prefix',
diff --git a/meta/packages/opensync/libopensync/no-werror.patch b/meta/packages/opensync/libopensync/no-werror.patch
deleted file mode 100644
index 523ceaaeb5..0000000000
--- a/meta/packages/opensync/libopensync/no-werror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: trunk/build/linux/osync_build.py
2===================================================================
3--- trunk.orig/build/linux/osync_build.py 2007-04-25 13:28:44.000000000 +0200
4+++ trunk/build/linux/osync_build.py 2007-04-25 13:28:54.000000000 +0200
5@@ -48,7 +48,7 @@
6 env.ParseConfig('pkg-config --cflags --libs libxml-2.0')
7 env.ParseConfig('pkg-config --cflags --libs sqlite3')
8 env.Append(CCFLAGS = r'-I.')
9- env.Append(CCFLAGS = [r'-Wall', r'-Werror'])
10+ env.Append(CCFLAGS = [r'-Wall'])
11
12 testenv = env.Copy()
13 testenv.Append(CCFLAGS = r'-I' + testenv.GetLaunchDir() + '/tests')
diff --git a/meta/packages/opensync/libopensync/zlib.patch b/meta/packages/opensync/libopensync/zlib.patch
deleted file mode 100644
index 89c10a85bc..0000000000
--- a/meta/packages/opensync/libopensync/zlib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: trunk/opensync/SConscript
2===================================================================
3--- trunk.orig/opensync/SConscript 2007-04-25 14:08:21.000000000 +0200
4+++ trunk/opensync/SConscript 2007-04-25 14:08:40.000000000 +0200
5@@ -149,6 +149,8 @@
6 gmodule-2.0
7 libxml2
8 sqlite3
9+z
10+m
11 """
12
13 libopensync = env.SharedLibrary('opensync', Split(sources), LIBS = Split(Libraries))