SHA256
1
0
forked from pool/lilv
lilv/lilv-0.4.2-sordlib.patch
2011-06-06 18:19:50 +00:00

63 lines
2.8 KiB
Diff

Index: sord-0.4.2/wscript
===================================================================
--- sord-0.4.2/wscript.orig 2011-05-26 02:20:19.000000000 +0200
+++ sord-0.4.2/wscript 2011-06-06 15:23:51.975953812 +0200
@@ -7,7 +7,7 @@ import waflib.Logs as Logs, waflib.Optio
# Version of this package (even if built as a child)
SORD_VERSION = '0.4.2'
-SORD_MAJOR_VERSION = '0'
+SORD_MAJOR_VERSION = ''
# Library version (UNIX style major, minor, micro)
# major increment <=> incompatible changes
@@ -42,7 +42,7 @@ def configure(conf):
autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB',
atleast_version='2.0.0', mandatory=True)
- autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD',
+ autowaf.check_pkg(conf, 'serd', uselib_store='SERD',
atleast_version='0.4.0', mandatory=True)
conf.env['BUILD_TESTS'] = Options.options.build_tests
@@ -66,15 +66,15 @@ def configure(conf):
conf.env['INCLUDES_SORD'] = ['${includedir}/sord-%s' % SORD_MAJOR_VERSION]
if not conf.env['INCLUDES_SERD']:
- fallback('INCLUDES_SERD', ['${includedir}/serd-0'])
+ fallback('INCLUDES_SERD', ['${includedir}/serd'])
conf.env['LIBPATH_SORD'] = [conf.env['LIBDIR']]
if not conf.env['LIBPATH_SERD']:
fallback('LIBPATH_SERD', conf.env['LIBPATH_SORD'])
- conf.env['LIB_SORD'] = ['sord-%s' % SORD_MAJOR_VERSION];
+ conf.env['LIB_SORD'] = ['sord%s' % SORD_MAJOR_VERSION];
if not conf.env['LIB_SERD']:
- fallback('LIB_SERD', 'serd-0')
+ fallback('LIB_SERD', 'serd')
autowaf.display_msg(conf, "Utilities", bool(conf.env['BUILD_UTILS']))
autowaf.display_msg(conf, "Unit tests", bool(conf.env['BUILD_TESTS']))
@@ -97,7 +97,7 @@ def build(bld):
includes = ['.', './src'],
export_includes = ['.'],
name = 'libsord',
- target = 'sord-%s' % SORD_MAJOR_VERSION,
+ target = 'sord%s' % SORD_MAJOR_VERSION,
vnum = SORD_LIB_VERSION,
install_path = '${LIBDIR}',
libs = [ 'm' ],
Index: sord-0.4.2/sord.pc.in
===================================================================
--- sord-0.4.2/sord.pc.in.orig 2011-05-26 01:46:00.000000000 +0200
+++ sord-0.4.2/sord.pc.in 2011-06-06 15:27:52.597953776 +0200
@@ -6,5 +6,5 @@ includedir=@includedir@
Name: Sord
Version: @SORD_VERSION@
Description: A lightweight C library for storing RDF statements in memory.
-Libs: -L@LIBPATH_SERD@ -l@LIB_SERD@ -L${libdir} -lsord-@SORD_MAJOR_VERSION@
-Cflags: -I@INCLUDES_SERD@ -I${includedir}/sord-@SORD_MAJOR_VERSION@
+Libs: -L${libdir} -l@LIB_SERD@ -L${libdir} -lsord
+Cflags: -I${includedir}/serd-/ -I${includedir}/sord-/