Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d9f6be882500d6e0d318783f6d86185f24958360)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d9f6be882500d6e0d318783f6d86185f24958360)
  • Date: Mon, 9 Oct 2017 13:50:18 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

libs/pcre2/HISTORY | 3 +++
libs/pcre2/PRE_SUB_DEPENDS | 4 +++-
libs/pcre2/SUB_DEPENDS | 2 ++
shell-term-fm/fish/DEPENDS | 8 ++++----
shell-term-fm/fish/HISTORY | 3 +++
5 files changed, 15 insertions(+), 5 deletions(-)

New commits:
commit d9f6be882500d6e0d318783f6d86185f24958360
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

fish: correct pcre2 dependency

commit e46ac9bf46e09b721dc272db315163538bcdad68
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pcre2: add PCRE32 subdependency

diff --git a/libs/pcre2/HISTORY b/libs/pcre2/HISTORY
index f9920ca..5aa883f 100644
--- a/libs/pcre2/HISTORY
+++ b/libs/pcre2/HISTORY
@@ -1,3 +1,6 @@
+2017-10-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * {PRE_,}SUB_DEPENDS: added PCRE32 subdependency
+
2017-09-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 10.30

diff --git a/libs/pcre2/PRE_SUB_DEPENDS b/libs/pcre2/PRE_SUB_DEPENDS
index b3822f5..2ba8976 100755
--- a/libs/pcre2/PRE_SUB_DEPENDS
+++ b/libs/pcre2/PRE_SUB_DEPENDS
@@ -1,5 +1,7 @@
case "$THIS_SUB_DEPENDS" in
- PCRE16) if [[ $PCRE16 == "--enable-pcre2-16" ]];
+ PCRE16) if [[ $PCRE16 == "--enable-pcre2-16" ]];
+ then return 0; else return 1; fi ;;
+ PCRE32) if [[ $PCRE32 == "--enable-pcre2-32" ]];
then return 0; else return 1; fi ;;
CPP) is_depends_enabled $SPELL gcc ;;
*) echo "bogus sub_depends: pcre $THIS_SUB_DEPENDS"; return 1;;
diff --git a/libs/pcre2/SUB_DEPENDS b/libs/pcre2/SUB_DEPENDS
index 351c732..025c8f1 100755
--- a/libs/pcre2/SUB_DEPENDS
+++ b/libs/pcre2/SUB_DEPENDS
@@ -1,6 +1,8 @@
case "$THIS_SUB_DEPENDS" in
PCRE16) message "pcre with 16-bit requested, forcing support" &&
PCRE16="--enable-pcre2-16";;
+ PCRE32) message "pcre with 32-bit requested, forcing support" &&
+ PCRE32="--enable-pcre2-32";;
CPP) depends -sub CXX gcc "--enable-cpp" ;;
*) echo "bogus sub_depends: pcre $THIS_SUB_DEPENDS"; return 1;;
esac
diff --git a/shell-term-fm/fish/DEPENDS b/shell-term-fm/fish/DEPENDS
index 6169947..4819e13 100755
--- a/shell-term-fm/fish/DEPENDS
+++ b/shell-term-fm/fish/DEPENDS
@@ -6,10 +6,10 @@ depends ncurses &&

runtime_depends bc &&

-optional_depends pcre2 \
- "--without-included-pcre2" \
- "--with-included-pcre2" \
- "to use system pcre2 library" &&
+optional_depends -sub PCRE32 pcre2 \
+ "--without-included-pcre2" \
+ "--with-included-pcre2" \
+ "to use system pcre2 library" &&

optional_depends gettext \
"--with-gettext" \
diff --git a/shell-term-fm/fish/HISTORY b/shell-term-fm/fish/HISTORY
index a0e0cf7..e546712 100644
--- a/shell-term-fm/fish/HISTORY
+++ b/shell-term-fm/fish/HISTORY
@@ -1,3 +1,6 @@
+2017-10-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: correct pcre2 dependency
+
2017-10-08 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: correct version detection for release tarballs




  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d9f6be882500d6e0d318783f6d86185f24958360), Vlad Glagolev, 10/09/2017

Archive powered by MHonArc 2.6.24.

Top of Page