debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't expressly use libkatze in extensions to avoid -fPIC problem

Browse source
This commit is contained in:
Christian Dywan 2009-03-30 00:14:43 +02:00
parent 538ed43165
commit ed2a35d70b
3 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
extensions/wscript_build
View file

@ -26,5 +26,4 @@ for extension in extensions:
obj.includes = '..' obj.includes = '..'
obj.source = source obj.source = source
obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML' obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML'
obj.uselib_local = 'katze'
obj.install_path = '${LIBDIR}/midori' obj.install_path = '${LIBDIR}/midori'

3
katze/wscript_build
View file

@ -12,6 +12,3 @@ obj.find_sources_in_dirs ('.')
obj.add_marshal_file ('marshal.list', 'katze_cclosure_marshal') obj.add_marshal_file ('marshal.list', 'katze_cclosure_marshal')
obj.uselib = 'M GMODULE LIBSOUP GTK LIBXML' obj.uselib = 'M GMODULE LIBSOUP GTK LIBXML'
obj.install_path = None obj.install_path = None
if platform.architecture ()[0] == '64bit':
obj.env.append_value ('CCFLAGS', '-fPIC')

6
midori/wscript_build
View file

@ -14,9 +14,6 @@ obj.uselib = 'UNIQUE LIBSOUP LIBIDN GIO GTK SQLITE WEBKIT LIBXML HILDON'
obj.uselib_local = 'katze' obj.uselib_local = 'katze'
obj.install_path = None obj.install_path = None
if platform.architecture ()[0] == '64bit':
obj.env.append_value ('CCFLAGS', '-fPIC')
obj = bld.new_task_gen ('cc', 'staticlib') obj = bld.new_task_gen ('cc', 'staticlib')
obj.name = 'panels' obj.name = 'panels'
obj.target = 'panels' obj.target = 'panels'
@ -26,9 +23,6 @@ obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML'
obj.uselib_local = 'midori' obj.uselib_local = 'midori'
obj.install_path = None obj.install_path = None
if platform.architecture ()[0] == '64bit':
obj.env.append_value ('CCFLAGS', '-fPIC')
obj = bld.new_task_gen ('cc', 'program') obj = bld.new_task_gen ('cc', 'program')
obj.target = 'midori' obj.target = 'midori'
obj.includes = '. .. ../panels' obj.includes = '. .. ../panels'