From 51536c814ae073a2b5d0c62f6377594da1ccad3c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 31 Jul 2009 14:51:43 +0100 Subject: opensync: Remove further old code Signed-off-by: Richard Purdie --- meta/packages/opensync/libopensync/fix-attr.patch | 13 ---------- meta/packages/opensync/libopensync/gcc.patch | 29 ---------------------- meta/packages/opensync/libopensync/no-werror.patch | 13 ---------- meta/packages/opensync/libopensync/zlib.patch | 13 ---------- 4 files changed, 68 deletions(-) delete mode 100644 meta/packages/opensync/libopensync/fix-attr.patch delete mode 100644 meta/packages/opensync/libopensync/gcc.patch delete mode 100644 meta/packages/opensync/libopensync/no-werror.patch delete mode 100644 meta/packages/opensync/libopensync/zlib.patch (limited to 'meta/packages/opensync/libopensync') diff --git a/meta/packages/opensync/libopensync/fix-attr.patch b/meta/packages/opensync/libopensync/fix-attr.patch deleted file mode 100644 index 7a2e5441c..000000000 --- a/meta/packages/opensync/libopensync/fix-attr.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: trunk/opensync/merger/opensync_xmlfield.c -=================================================================== ---- trunk.orig/opensync/merger/opensync_xmlfield.c 2007-04-12 16:40:07.000000000 +0200 -+++ trunk/opensync/merger/opensync_xmlfield.c 2007-04-12 16:40:11.000000000 +0200 -@@ -298,7 +298,7 @@ - int count; - xmlAttrPtr attr = xmlfield->node->properties; - -- for(count=0; attribute != NULL; count++) { -+ for(count=0; attr != NULL; count++) { - if(count == nth) - return (const char *)attr->name; - attr = attr->next; diff --git a/meta/packages/opensync/libopensync/gcc.patch b/meta/packages/opensync/libopensync/gcc.patch deleted file mode 100644 index 3eee01433..000000000 --- a/meta/packages/opensync/libopensync/gcc.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: trunk/SConstruct -=================================================================== ---- trunk.orig/SConstruct 2007-04-25 13:20:13.000000000 +0200 -+++ trunk/SConstruct 2007-04-25 14:00:02.000000000 +0200 -@@ -36,7 +36,11 @@ - opts.Add(BoolOption('enable_python', 'Build python wrapper? (swig required)', 0)) - opts.Add(BoolOption('debug_modules', 'Should unloading of shared modules be avoided (DEBUGGING ONLY!)', 0)) - opts.Add(BoolOption('enable_doxygen', 'Generating OpenSync API with doxygen?', 0)) -- -+opts.AddOptions( -+('CC', 'Path to Custom c compiler', 'gcc'), -+('CXX', 'Path to Custom c++ compiler flags', 'g++'), -+('LDFLAGS', 'Linker flags', ''), -+) - - target_dir = SelectBuildDir('build') - sys.path.append(target_dir) -@@ -63,6 +67,11 @@ - env.Append(CCFLAGS = r'-DENABLE_TOOLS=$enable_tools') - env.Append(CCFLAGS = r'-DENABLE_PROFILING=$enable_profiling') - -+env.Replace( -+ CC = env['CC'], -+ CXX = env['CXX'], -+ LDFLAGS = env['LDFLAGS'] -+) - - # pkg config files - 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 523ceaaeb..000000000 --- a/meta/packages/opensync/libopensync/no-werror.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: trunk/build/linux/osync_build.py -=================================================================== ---- trunk.orig/build/linux/osync_build.py 2007-04-25 13:28:44.000000000 +0200 -+++ trunk/build/linux/osync_build.py 2007-04-25 13:28:54.000000000 +0200 -@@ -48,7 +48,7 @@ - env.ParseConfig('pkg-config --cflags --libs libxml-2.0') - env.ParseConfig('pkg-config --cflags --libs sqlite3') - env.Append(CCFLAGS = r'-I.') -- env.Append(CCFLAGS = [r'-Wall', r'-Werror']) -+ env.Append(CCFLAGS = [r'-Wall']) - - testenv = env.Copy() - 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 89c10a85b..000000000 --- a/meta/packages/opensync/libopensync/zlib.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: trunk/opensync/SConscript -=================================================================== ---- trunk.orig/opensync/SConscript 2007-04-25 14:08:21.000000000 +0200 -+++ trunk/opensync/SConscript 2007-04-25 14:08:40.000000000 +0200 -@@ -149,6 +149,8 @@ - gmodule-2.0 - libxml2 - sqlite3 -+z -+m - """ - - libopensync = env.SharedLibrary('opensync', Split(sources), LIBS = Split(Libraries)) -- cgit v1.2.3