diff --git a/packages/recoll/build.sh b/packages/recoll/build.sh index 00c3e2eee85c774..dc8cff33db90ddc 100644 --- a/packages/recoll/build.sh +++ b/packages/recoll/build.sh @@ -7,9 +7,11 @@ TERMUX_PKG_SRCURL=http://www.lesbonscomptes.com/recoll/recoll-${TERMUX_PKG_VERSI TERMUX_PKG_SHA256=025dec0b9745e1ddacd86ee5478f9c52b2da2e5c307f831aaa5b2c7f9d7e8db9 TERMUX_PKG_DEPENDS="aspell, libxapian, libxslt, zlib, python" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-userdoc --disable-python-chm --disable-x11mon --disable-qtgui" - +TERMUX_PKG_REVISION=1 termux_step_pre_configure() { LDFLAGS+=" $($CC -print-libgcc-file-name)" CXXFLAGS+=" -fPIC" + _PYTHON_VERSION=$(source $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION) + CPPFLAGS+=" -I${TERMUX_PREFIX}/include/python${_PYTHON_VERSION}/" } diff --git a/packages/recoll/fix-python-prefix.patch b/packages/recoll/fix-python-prefix.patch deleted file mode 100644 index 65c2fd2912fb70a..000000000000000 --- a/packages/recoll/fix-python-prefix.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git src/python/recoll/pyrclextract.cpp src/python/recoll/pyrclextract.cpp -index 96325856..f6040848 100644 ---- src/python/recoll/pyrclextract.cpp -+++ src/python/recoll/pyrclextract.cpp -@@ -16,9 +16,9 @@ - */ - - --#include --#include --#include -+#include <@TERMUX_PREFIX@/include/python3.10/Python.h> -+#include <@TERMUX_PREFIX@/include/python3.10/structmember.h> -+#include <@TERMUX_PREFIX@/include/python3.10/bytearrayobject.h> - - #include - #include -diff --git src/python/recoll/pyrecoll.cpp src/python/recoll/pyrecoll.cpp -index 18df550b..0cb42b91 100644 ---- src/python/recoll/pyrecoll.cpp -+++ src/python/recoll/pyrecoll.cpp -@@ -15,9 +15,9 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - --#include --#include --#include -+#include <@TERMUX_PREFIX@/include/python3.10/Python.h> -+#include <@TERMUX_PREFIX@/include/python3.10/structmember.h> -+#include <@TERMUX_PREFIX@/include/python3.10/bytesobject.h> - - #include - #include -diff --git src/python/recoll/pyrecoll.h src/python/recoll/pyrecoll.h -index 8d6403f8..8b3cd7a3 100644 ---- src/python/recoll/pyrecoll.h -+++ src/python/recoll/pyrecoll.h -@@ -19,7 +19,7 @@ - - /* Shared definitions for pyrecoll.cpp and pyrclextract.cpp */ - --#include -+#include <@TERMUX_PREFIX@/include/python3.10/Python.h> - - #include - #include -diff --git src/python/recoll/pyresultstore.cpp src/python/recoll/pyresultstore.cpp -index 45ee01a3..b4a77deb 100644 ---- src/python/recoll/pyresultstore.cpp -+++ src/python/recoll/pyresultstore.cpp -@@ -15,9 +15,9 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - --#include --#include --#include -+#include <@TERMUX_PREFIX@/include/python3.10/Python.h> -+#include <@TERMUX_PREFIX@/include/python3.10/structmember.h> -+#include <@TERMUX_PREFIX@/include/python3.10/bytesobject.h> - - #include - #include -diff --git src/python/recoll/setup.py.in src/python/recoll/setup.py.in -index 0409cb9d..7812ebce 100644 ---- src/python/recoll/setup.py.in -+++ src/python/recoll/setup.py.in -@@ -18,7 +18,7 @@ if "CYGWIN" in os.environ: - else: - libraries = ['recoll'] - --extra_compile_args = ['-std=c++11'] -+extra_compile_args = ['-std=c++11', '-fPIC'] - - VERSION = open(os.path.join(top, "RECOLL-VERSION.txt")).read().strip() -