This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository hyphy.
commit cdf4d5b5374949f8b3c03f53d63f76d58aa0363a Author: Andreas Tille <[email protected]> Date: Fri Jul 10 08:02:30 2015 +0200 Make sure Python module will be linked against Debian packaged sqlite --- debian/patches/use_debian_sqlite.patch | 42 ++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/debian/patches/use_debian_sqlite.patch b/debian/patches/use_debian_sqlite.patch index 6e4cd7c..a57a1bd 100644 --- a/debian/patches/use_debian_sqlite.patch +++ b/debian/patches/use_debian_sqlite.patch @@ -1,6 +1,8 @@ Author: Andreas Tille <[email protected]> Last-Update: Mon, 29 Jun 2015 11:13:57 +0200 Description: Use Debian packaged sqlite3 + - in CMake + - in src/lib/setup.py --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,3 +108,43 @@ Description: Use Debian packaged sqlite3 ${RES_MACGUI} ) +--- a/src/lib/setup.py ++++ b/src/lib/setup.py +@@ -21,7 +21,7 @@ hyphyPath, srcDir = path.split(srcPath) + # resFiles = [(f, path.join(*(['..'] * 5 + f.split('/')))) for f in fh.read().split('\n') if f != ''] + + contribPath = path.join(hyphyPath, 'contrib') +-sqlitePath = path.join(contribPath, 'SQLite-3.8.2') ++#sqlitePath = path.join(contribPath, 'SQLite-3.8.2') + + linkPath = path.join(scriptPath, 'Link') + coreSrcPath = path.join(srcPath, 'core') +@@ -35,14 +35,16 @@ else: + + coreSrcFiles = glob(path.join(coreSrcPath, '*.cpp')) + newSrcFiles = glob(path.join(newSrcPath, '*.cpp')) +-sqliteFiles = glob(path.join(sqlitePath, '*.c')) ++#sqliteFiles = glob(path.join(sqlitePath, '*.c')) + linkFiles = glob(path.join(linkPath, '*.cpp')) # + glob(path.join(linkPath, '*.cxx')) + utilFiles = glob(path.join(srcPath, 'utils', '*.cpp')) + +-sourceFiles = coreSrcFiles + newSrcFiles + sqliteFiles + prefFile + linkFiles + swigFile + utilFiles ++# sourceFiles = coreSrcFiles + newSrcFiles + sqliteFiles + prefFile + linkFiles + swigFile + utilFiles ++sourceFiles = coreSrcFiles + newSrcFiles + prefFile + linkFiles + swigFile + utilFiles + + includePaths = [path.join(p, 'include') for p in [coreSrcPath, newSrcPath, guiSrcPath]] +-includePaths += [linkPath, contribPath, sqlitePath] ++# includePaths += [linkPath, contribPath, sqlitePath] ++includePaths += [linkPath, contribPath] + + # check for 64bit and define as such + define_macros = [('__HYPHY_64__', None)] if '64' in architecture()[0] else [] +@@ -72,7 +74,7 @@ setup( + ('__AFYP_REWRITE_BGM__', None), + ('__HEADLESS__', None), + ('_HYPHY_LIBDIRECTORY_', '"/usr/local/lib/hyphy"')] + define_macros, +- libraries = ['pthread', 'ssl', 'crypto', 'curl'], ++ libraries = ['pthread', 'ssl', 'crypto', 'curl', 'sqlite3'], + extra_compile_args = [ + '-Wno-int-to-pointer-cast', + # '-Wno-pointer-to-int-cast', -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/hyphy.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
