Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (8e7525052457d604da92aeb5d9e1cef18c704042)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (8e7525052457d604da92aeb5d9e1cef18c704042)
  • Date: Sun, 12 Sep 2010 15:24:37 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

libs/glibc/HISTORY | 3 +++
libs/glibc/PRE_BUILD | 4 +++-
utils/unison/DEPENDS | 11 +++++++++--
utils/unison/HISTORY | 4 ++++
utils/unison/PRE_BUILD | 3 +++
utils/unison/ocaml-3.12.patch | 11 +++++++++++
6 files changed, 33 insertions(+), 3 deletions(-)

New commits:
commit 528e0008422329e00fc88ea09a20d2c41260835c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/glibc: fixed build with make 3.82

commit db5bc842b45e140f31018dfb193e475df351c228
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/unison: fixed build error with ocaml 3.12

commit 1d935686ae00d0f720e0dba2ff44790625cfca0f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/unison: added missing dependencies

diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 8b172d2..762a99d 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,6 @@
+2010-09-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD: fixed build with make 3.82
+
2010-08-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.12.1, HEADERS_VERSION=2.6.35, gnu.gpg -> glibc.gpg
* PRE_BUILD, binutils-2.20.patch: removed patch
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 5c94952..8d99f5d 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -81,5 +81,7 @@ mk_source_dir $SOURCE_DIRECTORY.bld &&
# fix #11832 - linking in /tmp doesn't work with grsecurity so do it
elsewhere
local test_path=$SOURCE_DIRECTORY.bld/test-installation &&
mkdir $test_path &&
-sed -i "s,/tmp,$test_path,g" scripts/test-installation.pl
+sed -i "s,/tmp,$test_path,g" scripts/test-installation.pl &&
+sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile
+

diff --git a/utils/unison/DEPENDS b/utils/unison/DEPENDS
index 8111651..c319d26 100755
--- a/utils/unison/DEPENDS
+++ b/utils/unison/DEPENDS
@@ -1,10 +1,17 @@
depends ocaml &&

if [ "$UI" = "gtk" ] ; then
- depends lablgtk
+ depends lablgtk || return 1
fi &&

if [ "$UI" = "gtk2" ] ; then
- depends lablgtk2
+ depends lablgtk2 &&
+ depends atk &&
+ depends cairo &&
+ depends fontconfig &&
+ depends freetype2 &&
+ depends glib2 &&
+ depends gtk+2 &&
+ depends pango || return 1
fi

diff --git a/utils/unison/HISTORY b/utils/unison/HISTORY
index d2c0d01..2e4d651 100644
--- a/utils/unison/HISTORY
+++ b/utils/unison/HISTORY
@@ -1,3 +1,7 @@
+2010-09-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: added missing dependencies
+ * PRE_BUILD, ocaml-3.12.patch: fixed build error with ocaml 3.12
+
2010-05-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: beta -> version 2.40.16

diff --git a/utils/unison/PRE_BUILD b/utils/unison/PRE_BUILD
new file mode 100755
index 0000000..8c19edf
--- /dev/null
+++ b/utils/unison/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < $SCRIPT_DIRECTORY/ocaml-3.12.patch
diff --git a/utils/unison/ocaml-3.12.patch b/utils/unison/ocaml-3.12.patch
new file mode 100644
index 0000000..072c2a0
--- /dev/null
+++ b/utils/unison/ocaml-3.12.patch
@@ -0,0 +1,11 @@
+--- unison-2.32.52/update.mli.orig 2010-09-12 11:19:54.000000000 +0200
++++ unison-2.32.52/update.mli 2010-09-12 11:20:35.000000000 +0200
+@@ -1,7 +1,7 @@
+ (* Unison file synchronizer: src/update.mli *)
+ (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
+
+-module NameMap : Map.S with type key = Name.t
++module NameMap : MyMap.S with type key = Name.t
+
+ type archive =
+ ArchiveDir of Props.t * archive NameMap.t



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (8e7525052457d604da92aeb5d9e1cef18c704042), Florian Franzmann, 09/12/2010

Archive powered by MHonArc 2.6.24.

Top of Page