gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-17 14:49:30 -07:00
Code Issues Projects Releases Wiki Activity

app-misc/tracker: fix underlinking build failure (bug #581288)

Browse Source 
Thanks to Maxim Sheviakov for reporting.
Upstream bug: https://bugzilla.gnome.org/show_bug.cgi?id=766487

Package-Manager: portage-2.2.28
This commit is contained in:
Alexandre Rostovtsev
2016-05-15 15:56:51 -04:00
parent 55b0e3802d
commit d2ccfbbc1a
2 changed files with 61 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
app-misc/tracker/files/tracker-1.6.2-sqlite-underlinking.patch Normal file
View File

@@ -0,0 +1,58 @@
From f69ece17fd3d6414ef2634336c7e780207b0f4a7 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Sun, 15 May 2016 15:15:50 -0400
Subject: [PATCH] build: embedded copy of SQLite requires -ldl and -pthread
https://bugzilla.gnome.org/show_bug.cgi?id=766487
---
configure.ac | 8 ++++++++
src/sqlite/Makefile.am | 9 +++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 2ccda7a..b6c978a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -719,6 +719,14 @@ if test "x$enable_journal" = "xno" ; then
AC_DEFINE(DISABLE_JOURNAL, 1, [Define if we disable the journal])
fi
+####################################################################
+# Check for SQLite
+####################################################################
+
+# Our copy of sqlite requires libdl on some platforms
+AC_CHECK_LIB(dl, dlsym, [LIBDL=-ldl], [LIBDL=])
+AC_SUBST(LIBDL)
+
##################################################################
# Check for libtracker-common, make sure libstemmer exists
##################################################################
diff --git a/src/sqlite/Makefile.am b/src/sqlite/Makefile.am
index 8b0ac18..354f054 100644
--- a/src/sqlite/Makefile.am
+++ b/src/sqlite/Makefile.am
@@ -3,7 +3,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-DSQLITE_THREADSAFE=1 \
-DSQLITE_ENABLE_FTS4 \
- -DSQLITE_ENABLE_FTS3_TOKENIZER
+ -DSQLITE_ENABLE_FTS3_TOKENIZER \
+ -pthread
noinst_LTLIBRARIES = libtracker-sqlite.la
@@ -12,5 +13,9 @@ libtracker_sqlite_la_SOURCES = \
sqlite3.h \
sqlite3ext.h
+libtracker_sqlite_la_LDFLAGS = \
+ -pthread
+
libtracker_sqlite_la_LIBADD = \
- $(BUILD_LIBS)
+ $(BUILD_LIBS) \
+ $(LIBDL)
--
2.8.2

3
app-misc/tracker/tracker-1.6.2.ebuild
View File

@@ -141,6 +141,9 @@ src_prepare() {
# Ensure embedded sqlite.h is in the include path (from 1.6 branch)
epatch "${FILESDIR}"/${P}-include-path.patch
# embedded sqlite underlinking, https://bugzilla.gnome.org/show_bug.cgi?id=766487
epatch "${FILESDIR}"/${P}-sqlite-underlinking.patch
eautoreconf # See bug #367975
gnome2_src_prepare
vala_src_prepare