Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (5566f04275f032d30f4a768c37abeafe6871aaa0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (5566f04275f032d30f4a768c37abeafe6871aaa0)
  • Date: Mon, 25 May 2015 09:09:45 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

ChangeLog | 4 ++++
FUNCTIONS | 37 +++++++++++++++++++++++++++++++++++++
gnu/gcc/DETAILS | 3 ++-
gnu/gcc/HISTORY | 4 ++++
graphics/openexr/CONFLICTS | 3 +++
graphics/openexr/HISTORY | 5 +++++
graphics/openexr/UP_TRIGGERS | 4 ++++
7 files changed, 59 insertions(+), 1 deletion(-)

New commits:
commit 5566f04275f032d30f4a768c37abeafe6871aaa0
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

gcc: use ecj-4.9 as that exists

commit 2d79a69ba438f3acd96da296c7345e67ca07fda4
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

openexr: self-conflicting build and incompatible upgrade (making the
former visible)

commit 74e2401667207a74e72fccf34a394b3d7e8ed7e0
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

FUNCTIONS: added check_dependees_on_update()

diff --git a/ChangeLog b/ChangeLog
index 4a6b804..84970a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
+ * FUNCTIONS: added check_dependees_on_update() for use in
+ UP_TRIGGERS
+
2015-05-21 Vlad Glagolev <stealth AT sourcemage.org>
* http/ziproxy: new spell, compressing non-caching HTTP proxy

diff --git a/FUNCTIONS b/FUNCTIONS
index 87f66c1..da8ed70 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -790,6 +790,43 @@ function get_spell_provider_file(){
| grep "$3" | sort | head -n 1
}

+#---
+## Trigger check_self on spells depending on the one at hand if it
+## is being updated from an old version.
+## Purpose of the optional version filter parameters is to limit the
+## triggering to cases of significant difference, like 1.2.x -> 1.3.y
instead of
+## the smaller difference 1.2.x -> 1.2.y .
+## @params $1 - spell at hand
+## @params $2 - new version
+## @params $3 - command to filter versions with
+## @params $4 - and following: arguments to the filter command
+##
+## Example: check_dependees_on_update $SPELL $VERSION cut -d . -f 1,2
+## This will compare only x.y out of version x.y.z-betaY.
+#---
+function check_dependees_on_update()
+{
+ local spell=$1; shift;
+ local version=$1; shift;
+ if spell_ok $spell; then
+ local old_version=$(installed_version $spell)
+ local new_version=$version
+ if [[ $# -gt 0 ]]; then
+ old_version=$(echo "$old_version" | "$@")
+ new_version=$(echo "$new_version" | "$@")
+ fi &&
+ if [[ "$new_version" != "$old_version" ]]; then
+ message "${MESSAGE_COLOR}This is a possibly incompatible update of
$SPELL." &&
+ message "Figuring out what spells need to be checked for
sanity...${DEFAULT_COLOR}" &&
+
+ for each in $(show_up_depends $SPELL 1); do
+ up_trigger $each check_self
+ done
+ fi
+ fi
+}
+
+#---

. $GRIMOIRE/glselect.function
. $GRIMOIRE/bzr_download.function
diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS
index 2614a22..162f78f 100755
--- a/gnu/gcc/DETAILS
+++ b/gnu/gcc/DETAILS
@@ -19,7 +19,8 @@ if [[ "$GCC_CLOOG" == "y" ]]; then
fi

if list_find "$GCC_COMPILER" "java"; then
- SOURCE5=ecj-$(echo $VERSION|cut -f1,2 -d.).jar
+# SOURCE5=ecj-$(echo $VERSION|cut -f1,2 -d.).jar
+ SOURCE5=ecj-4.9.jar
SOURCE5_URL[0]=ftp://sourceware.org/pub/java/${SOURCE5}

SOURCE5_HASH=sha512:28f8c6fdbcb19e950b1d0bafb3bcc7a8cba87bc673aa6027cece116599cdee80f0cf5e95a1440544890239f5c754e8a93ab46d9daedd937faef445d7ea33b226
fi
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index c588a02..686d8be 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,7 @@
+2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: There is no ecj-5.1, trying ecj-4.9.
+ I can compile a hello world example at least.
+
2015-05-03 Pavel Vinogradov <public AT sourcemage.org>
* UP_TRIGGERS: improved the major release change check, fixed
syntax error
diff --git a/graphics/openexr/CONFLICTS b/graphics/openexr/CONFLICTS
new file mode 100755
index 0000000..39a7966
--- /dev/null
+++ b/graphics/openexr/CONFLICTS
@@ -0,0 +1,3 @@
+# Uses installed headers in build, breaking on version updates.
+# Stupid.
+conflicts $SPELL y
diff --git a/graphics/openexr/HISTORY b/graphics/openexr/HISTORY
index aad91ee..84129b5 100644
--- a/graphics/openexr/HISTORY
+++ b/graphics/openexr/HISTORY
@@ -1,3 +1,8 @@
+2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
+ * UP_TRIGGERS: binary incompatible update, check dependees
+ * CONFLICTS: 2.2 build fails if 2.1 installed, so add this
+ to the list of braindead builds
+
2015-04-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.2.0
* DEPENDS: depend on gcc with CXX
diff --git a/graphics/openexr/UP_TRIGGERS b/graphics/openexr/UP_TRIGGERS
new file mode 100755
index 0000000..a977652
--- /dev/null
+++ b/graphics/openexr/UP_TRIGGERS
@@ -0,0 +1,4 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+# 2.1.x -> 2.2.0 changes ABI
+# Be prepared for that on any non-bugfix change.
+check_dependees_on_update $SPELL $VERSION cut -d . -f 1,2



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (5566f04275f032d30f4a768c37abeafe6871aaa0), Thomas Orgis, 05/25/2015

Archive powered by MHonArc 2.6.24.

Top of Page