cscope: Some minor updates

- Change default include directory.
- Avoid accidental linking to libfl.so.
- Avoid defining errno at all on Android.

diff --git a/packages/cscope/build.sh b/packages/cscope/build.sh
index 44eb2d9fbba592c24c87081f54b949fac22585a8..562ff970f492be7f7d66471d44ec825050531f86 100644 (file)
--- a/packages/cscope/build.sh
+++ b/packages/cscope/build.sh
@@ -5,3 +5,7 @@ TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/cscope/cscope/${TERM
 TERMUX_PKG_SHA256=4889d091f05aa0845384b1e4965aa31d2b20911fb2c001b2cdcffbcb7212d3af
 TERMUX_PKG_DEPENDS="ncurses"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ncurses=$TERMUX_PREFIX"
 TERMUX_PKG_SHA256=4889d091f05aa0845384b1e4965aa31d2b20911fb2c001b2cdcffbcb7212d3af
 TERMUX_PKG_DEPENDS="ncurses"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ncurses=$TERMUX_PREFIX"

+
+termux_step_pre_configure() {
+       export LEXLIB=""
+}

diff --git a/packages/cscope/errno.patch b/packages/cscope/errno.patch
index 6e5bcb6c7933773bb741e60b1a909251394c81e2..c538863728058f1ca553482a9566a32345b0e61c 100644 (file)
--- a/packages/cscope/errno.patch
+++ b/packages/cscope/errno.patch
@@ -1,12 +1,10 @@
 --- src/src/snprintf.c 2009-04-10 13:39:23.000000000 +0000
 +++ patches/snprintf.c 2017-05-19 07:45:08.926751318 +0000
 --- src/src/snprintf.c 2009-04-10 13:39:23.000000000 +0000
 +++ patches/snprintf.c 2017-05-19 07:45:08.926751318 +0000

-@@ -522,7 +522,11 @@
+@@ -522,7 +522,9 @@

  static UINTMAX_T myround(LDOUBLE);
  static LDOUBLE mypow10(int);
  
  static UINTMAX_T myround(LDOUBLE);
  static LDOUBLE mypow10(int);
  

-+#ifdef __ANDROID__
-+extern volatile int errno;
-+#else
++#ifndef __ANDROID__

  extern int errno;
 +#endif
  
  extern int errno;
 +#endif
  

diff --git a/packages/cscope/src-main.c.patch b/packages/cscope/src-main.c.patch
new file mode 100644 (file)
index 0000000..e5544f4
--- /dev/null
+++ b/packages/cscope/src-main.c.patch
@@ -0,0 +1,15 @@
+diff -u -r ../cscope-15.8b/src/main.c ./src/main.c
+--- ../cscope-15.8b/src/main.c 2014-11-20 22:12:54.000000000 +0100
++++ ./src/main.c       2017-05-22 14:30:00.303282400 +0200
+@@ -62,9 +62,9 @@
+ #define HOME  "/"     /* no $HOME --> use root directory */
+ #define       SHELL   "sh"
+ #define LINEFLAG "+%s"        /* default: used by vi and emacs */
+-#define TMPDIR        "/tmp"
++#define TMPDIR        "@TERMUX_PREFIX@/tmp"
+ #ifndef DFLT_INCDIR
+-#define DFLT_INCDIR "/usr/include"
++#define DFLT_INCDIR "@TERMUX_PREFIX@/include"
+ #endif
+ 
+ static char const rcsid[] = "$Id: main.c,v 1.57 2014/11/20 21:12:54 broeker Exp $";