Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8b269eabed1702e0daf313418accf1c028c07da5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8b269eabed1702e0daf313418accf1c028c07da5)
  • Date: Sat, 4 Feb 2012 12:59:40 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

libs/pcre/BUILD | 6 +++---
libs/pcre/CONFIGURE | 8 +++++---
libs/pcre/DETAILS | 2 +-
libs/pcre/HISTORY | 8 ++++++++
libs/pcre/INSTALL | 2 ++
libs/pcre/PRE_INSTALL | 4 ++++
libs/pcre/PRE_SUB_DEPENDS | 4 +++-
libs/pcre/SUB_DEPENDS | 6 ++++--
8 files changed, 30 insertions(+), 10 deletions(-)

New commits:
commit 8b269eabed1702e0daf313418accf1c028c07da5
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

pcre: => 8.30

diff --git a/libs/pcre/BUILD b/libs/pcre/BUILD
index 8ce5b4b..5f9466f 100755
--- a/libs/pcre/BUILD
+++ b/libs/pcre/BUILD
@@ -1,6 +1,6 @@
-OPTS+=" --disable-static $JIT" &&
-if [[ $BUILDUTF8 == y ]]; then
- OPTS="$OPTS --enable-utf8"
+OPTS+=" --disable-static $JIT $PCRE8 $PCRE16" &&
+if [[ $BUILDUTF == y ]]; then
+ OPTS="$OPTS --enable-utf"
if [[ $UTFPROPERTIES == y ]]; then
OPTS="$OPTS --enable-unicode-properties"
fi
diff --git a/libs/pcre/CONFIGURE b/libs/pcre/CONFIGURE
index d6ed96a..c558c09 100755
--- a/libs/pcre/CONFIGURE
+++ b/libs/pcre/CONFIGURE
@@ -1,6 +1,8 @@
-config_query BUILDUTF8 "Enable UTF-8 support?" y
+config_query BUILDUTF "Enable UTF support?" y

-if [[ $BUILDUTF8 == y ]]; then
- config_query UTFPROPERTIES "Enable UTF-8 properties?" n
+if [[ $BUILDUTF == y ]]; then
+ config_query UTFPROPERTIES "Enable UTF properties?" n
fi
config_query_option JIT "Enable JustInTime support" y "--enable-jit" ""
+config_query_option PCRE8 "build 8-bit support" y "--enable-pcre8"
"--disable-pcre8"
+config_query_option PCRE16 "build 16-bit support" n "--enable-pcre16"
"--disable-pcre16"
diff --git a/libs/pcre/DETAILS b/libs/pcre/DETAILS
index 4d44ac7..12f0beb 100755
--- a/libs/pcre/DETAILS
+++ b/libs/pcre/DETAILS
@@ -1,5 +1,5 @@
SPELL=pcre
- VERSION=8.21
+ VERSION=8.30
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/pcre/HISTORY b/libs/pcre/HISTORY
index b9a1a51..8848e4c 100644
--- a/libs/pcre/HISTORY
+++ b/libs/pcre/HISTORY
@@ -1,3 +1,11 @@
+2012-02-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 8.30
+ * BUILD, CONFIGURE: support 16-bit characters
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: utf now means UTF-{8,16}
+ * INSTALL: added, need a symlink to fake old libpcre,
+ otherwise grep and sorcery are broken
+ * PRE_INSTALL: added, save old libraries, else grep is broken and
dispel fails
+
2012-01-27 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add zlib, bzip2, readline
* BUILD: disable-static
diff --git a/libs/pcre/INSTALL b/libs/pcre/INSTALL
new file mode 100755
index 0000000..ebccaa8
--- /dev/null
+++ b/libs/pcre/INSTALL
@@ -0,0 +1,2 @@
+default_install &&
+ln -sf $TRACK_ROOT/usr/lib/libpcre.so.1.0.0
$INSTALL_ROOT/usr/lib/libpcre.so.0
diff --git a/libs/pcre/PRE_INSTALL b/libs/pcre/PRE_INSTALL
new file mode 100755
index 0000000..de4da9a
--- /dev/null
+++ b/libs/pcre/PRE_INSTALL
@@ -0,0 +1,4 @@
+mkdir $SOURCE_DIRECTORY/svlib &&
+cp -a $INSTALL_ROOT/usr/lib/libpcre* $SOURCE_DIRECTORY/svlib &&
+LD_LIBRARY_PATH=$SOURCE_DIRECTORY/svlib
+default_pre_install
diff --git a/libs/pcre/PRE_SUB_DEPENDS b/libs/pcre/PRE_SUB_DEPENDS
index 3e15cf5..7236d16 100755
--- a/libs/pcre/PRE_SUB_DEPENDS
+++ b/libs/pcre/PRE_SUB_DEPENDS
@@ -1,5 +1,7 @@
case "$THIS_SUB_DEPENDS" in
- UTFPROP) if [[ $BUILDUTF8 == y ]] &&
+ PCRE16) if [[ $PCRE16 == "--enable-pcre16" ]];
+ then return 0; else return 1; fi ;;
+ UTFPROP) if [[ $BUILDUTF == y ]] &&
[[ $UTFPROPERTIES == y ]]; then return 0; else return 1; fi ;;
CPP) is_depends_enabled $SPELL g++ ;;
*) echo "bogus sub_depends: pcre $THIS_SUB_DEPENDS"; return 1;;
diff --git a/libs/pcre/SUB_DEPENDS b/libs/pcre/SUB_DEPENDS
index 62900e3..0d72a16 100755
--- a/libs/pcre/SUB_DEPENDS
+++ b/libs/pcre/SUB_DEPENDS
@@ -1,6 +1,8 @@
case "$THIS_SUB_DEPENDS" in
- UTFPROP) message "pcre with UTF-8 properties requested, forcing support" &&
- BUILDUTF8=y &&
+ PCRE16) message "pcre with 16-bit requested, forcing support" &&
+ PCRE16="--enable-pcre16";;
+ UTFPROP) message "pcre with UTF properties requested, forcing support" &&
+ BUILDUTF=y &&
UTFPROPERTIES=y &&
persistent_add UTFPROPERTIES ;;
CPP) depends g++ "--enable-cpp" ;;



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8b269eabed1702e0daf313418accf1c028c07da5), Treeve Jelbert, 02/04/2012

Archive powered by MHonArc 2.6.24.

Top of Page