From 18b754fd715a199d28cb54155efc88f9bc7c6a58 Mon Sep 17 00:00:00 2001
From: MCApollo <34170230+MCApollo@users.noreply.github.com>
Date: Sun, 12 May 2019 04:05:06 -0500
Subject: Some fixes (onig,joe,jq,lightppd,php,xslt)

---
 data/_libxslt/make.sh          | 2 +-
 data/_oniguruma/make.sh        | 1 +
 data/joe/_metadata/ncurses.dep | 1 +
 data/joe/make.sh               | 1 +
 data/jq/make.sh                | 1 +
 data/lighttpd/make.sh          | 2 +-
 data/php/make.sh               | 2 ++
 7 files changed, 8 insertions(+), 2 deletions(-)
 create mode 120000 data/joe/_metadata/ncurses.dep

diff --git a/data/_libxslt/make.sh b/data/_libxslt/make.sh
index 8a73a1fff..a8549d654 100644
--- a/data/_libxslt/make.sh
+++ b/data/_libxslt/make.sh
@@ -2,7 +2,7 @@ pkg:setup
 cd libxslt
 NOCONFIGURE=1 ./autogen.sh
 # XXX: fix libgcrypt-config call to add --prefix
-pkg:configure --with-python=no --with-libxml-prefix="$(PKG_DEST_ _libxml2)/usr" --with-libxml-include-prefix="$(PKG_DEST_ _libxml2)/usr/include/libxml2" ac_cv_path_LIBGCRYPT_CONFIG=no
+LDFLAGS="-lxml2" pkg:configure --with-python=no --with-libxml-prefix="$(PKG_DEST_ _libxml2)/usr" --with-libxml-include-prefix="$(PKG_DEST_ _libxml2)/usr/include/libxml2" ac_cv_path_LIBGCRYPT_CONFIG=no
 pkg:make
 cp "../Pregenerated Files/xslt-config" xslt-config
 pkg:install
diff --git a/data/_oniguruma/make.sh b/data/_oniguruma/make.sh
index b78ddd2d2..87a084e25 100644
--- a/data/_oniguruma/make.sh
+++ b/data/_oniguruma/make.sh
@@ -1,4 +1,5 @@
 pkg:setup
+sed -i 's/-I$(includedir)//' $(grep -rl '\-I\$(includedir)')
 pkg:configure
 pkg:make
 pkg:install
diff --git a/data/joe/_metadata/ncurses.dep b/data/joe/_metadata/ncurses.dep
new file mode 120000
index 000000000..a395fad08
--- /dev/null
+++ b/data/joe/_metadata/ncurses.dep
@@ -0,0 +1 @@
+../../ncurses
\ No newline at end of file
diff --git a/data/joe/make.sh b/data/joe/make.sh
index b78ddd2d2..6fb4f47c5 100644
--- a/data/joe/make.sh
+++ b/data/joe/make.sh
@@ -1,4 +1,5 @@
 pkg:setup
+CFLAGS="-include util.h" #  -> For HAVE_LOGIN_TTY
 pkg:configure
 pkg:make
 pkg:install
diff --git a/data/jq/make.sh b/data/jq/make.sh
index b78ddd2d2..ac2ab5c7f 100644
--- a/data/jq/make.sh
+++ b/data/jq/make.sh
@@ -1,4 +1,5 @@
 pkg:setup
+CFLAGS="-D_REENTRANT"
 pkg:configure
 pkg:make
 pkg:install
diff --git a/data/lighttpd/make.sh b/data/lighttpd/make.sh
index 79b771967..a38ffae33 100644
--- a/data/lighttpd/make.sh
+++ b/data/lighttpd/make.sh
@@ -1,6 +1,6 @@
 pkg:setup
 ./autogen.sh
-ac_cv_func_sendfile=no ac_cv_search_sendfilev=no pkg:configure --libdir=${PKG_TAPF}/lib/lighttpd --with-openssl --with-zlib --with-webdav-props
+PCRECONFIG="$(PKG_DEST_ pcre)/${PKG_TAPF}/bin/pcre-config" ac_cv_func_sendfile=no ac_cv_search_sendfilev=no pkg:configure --libdir=${PKG_TAPF}/lib/lighttpd --with-openssl --with-zlib --with-webdav-props
 # Mac: sendfile causes crashes.
 pkg:make
 pkg:install
diff --git a/data/php/make.sh b/data/php/make.sh
index 96bf37bd5..98bf338bb 100644
--- a/data/php/make.sh
+++ b/data/php/make.sh
@@ -15,6 +15,8 @@ pkg:configure --enable-fastcgi --enable-opcache=yes		\
 	--with-pcre-regex="$(PKG_DEST_ pcre2)/${PKG_TAPF}"	\
 	--with-pcre-jit						\
 	--with-bz2="${PKG_ROOT}/usr"				\
+	--without-pear						\
 	LDFLAGS="-liconv -lresolv" EXTRA_LIBS="-liconv -lresolv"
+
 pkg:make
 pkg:install INSTALL_ROOT="${PKG_DEST}"
-- 
cgit v1.2.3