1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00

libopensync: make SVN version buildable (disabled by default)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1556 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Marcin Juszkiewicz
2007-04-25 12:39:49 +00:00
parent caf3b5b1bc
commit b6e43a2e89
5 changed files with 167 additions and 4 deletions
@@ -0,0 +1,13 @@
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;
@@ -0,0 +1,29 @@
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',
@@ -0,0 +1,13 @@
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')
@@ -0,0 +1,13 @@
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))