Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Robin Cook (56c12a55b4e7747bf500095ac0e42ce89cf2dffd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (56c12a55b4e7747bf500095ac0e42ce89cf2dffd)
  • Date: Sat, 12 Nov 2011 10:46:21 -0600

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

e-17/eet/BUILD | 5 +++++
e-17/eet/CONFIGURE | 2 ++
e-17/eet/DEPENDS | 16 ++++++++++------
e-17/eet/HISTORY | 5 +++++
e-17/eina/DEPENDS | 2 ++
5 files changed, 24 insertions(+), 6 deletions(-)

New commits:
commit 56c12a55b4e7747bf500095ac0e42ce89cf2dffd
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

eet: added depends and option to choose crypto library

commit 13e06c33c4fc48dd38f0e4a202afaeba1f5ee8e8
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

eina: missed optional_depends

diff --git a/e-17/eet/BUILD b/e-17/eet/BUILD
new file mode 100755
index 0000000..0bb21d9
--- /dev/null
+++ b/e-17/eet/BUILD
@@ -0,0 +1,5 @@
+if [ "$EET_CRYPTO" == "none" ]; then
+ OPTS="--disable-gnutls --disable-openssl --disable-cipher
--disable-signature $OPTS"
+fi &&
+
+default_build
diff --git a/e-17/eet/CONFIGURE b/e-17/eet/CONFIGURE
new file mode 100755
index 0000000..d27a16d
--- /dev/null
+++ b/e-17/eet/CONFIGURE
@@ -0,0 +1,2 @@
+config_query_list EET_CRYPTO "Which crypto library to use?" \
+ gnutls openssl none
diff --git a/e-17/eet/DEPENDS b/e-17/eet/DEPENDS
index d15bea8..525f615 100755
--- a/e-17/eet/DEPENDS
+++ b/e-17/eet/DEPENDS
@@ -1,11 +1,15 @@
-depends eina &&
-depends JPEG &&
+depends eina &&
+depends JPEG &&
+depends zlib &&
+depends libgcrypt &&

if [[ $EET_BRANCH == scm ]]; then
depends subversion
fi &&

-optional_depends openssl \
- '--enable-openssl --enable-cypher --enable-signature' \
- '--disable-openssl --disable-cypher --disable-signature' \
- 'for SSL signature support'
+if [ "$EET_CRYPTO" == "gnutls" ]; then
+ depends gnutls "--enable-gnutls --disable-openssl --enable-cipher
--enable-signature"
+elif [ "$EET_CRYPTO" == "openssl" ]; then
+ depends openssl "--enable-openssl --disable-gnutls --enable-cipher
--enable-signature"
+fi
+
diff --git a/e-17/eet/HISTORY b/e-17/eet/HISTORY
index 3d2d6ff..2f51014 100644
--- a/e-17/eet/HISTORY
+++ b/e-17/eet/HISTORY
@@ -1,3 +1,8 @@
+2011-11-12 Robin Cook <rcook AT wyrms.net>
+ * CONFIGURE: added to ask which crypto library to use
+ * DEPENDS: added depends and modifed crypto depends
+ * BUILD: added to apply if crypto library was none
+
2011-11-03 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.4.1

diff --git a/e-17/eina/DEPENDS b/e-17/eina/DEPENDS
index 683342e..a2cabd3 100755
--- a/e-17/eina/DEPENDS
+++ b/e-17/eina/DEPENDS
@@ -9,6 +9,8 @@ optional_depends valgrind \

optional_depends doxygen "" "" "Enable doxygen use?" &&

+optional_depends psiconv "" "" "Enable iconv use?" &&
+
if [[ "$EINA_BENCHMARK" == "--enable-benchmark" ]]; then
optional_depends "glib" "" "" "for Glib benchmarks" &&
optional_depends "evas" "" "" "for Evas benchmarks" &&



  • [SM-Commit] GIT changes to master grimoire by Robin Cook (56c12a55b4e7747bf500095ac0e42ce89cf2dffd), Robin Cook, 11/12/2011

Archive powered by MHonArc 2.6.24.

Top of Page