[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey config/Makefile.config.in config/Makef...
|
From: |
mldonkey-commits |
|
Subject: |
[Mldonkey-commits] mldonkey config/Makefile.config.in config/Makef... |
|
Date: |
Sun, 29 Aug 2010 20:11:20 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 10/08/29 20:11:20
Modified files:
config : Makefile.config.in Makefile.in configure.in
distrib : ChangeLog
Removed files:
patches : lablgtk-2.10.0.patch ocaml-3.08.3.patch
ocaml-3.09.1.patch
Log message:
patch #7289
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/Makefile.config.in?cvsroot=mldonkey&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/Makefile.in?cvsroot=mldonkey&r1=1.188&r2=1.189
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.336&r2=1.337
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1463&r2=1.1464
http://cvs.savannah.gnu.org/viewcvs/mldonkey/patches/lablgtk-2.10.0.patch?cvsroot=mldonkey&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/mldonkey/patches/ocaml-3.08.3.patch?cvsroot=mldonkey&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/mldonkey/patches/ocaml-3.09.1.patch?cvsroot=mldonkey&r1=1.1&r2=0
Patches:
Index: config/Makefile.config.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/Makefile.config.in,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- config/Makefile.config.in 3 Feb 2008 23:06:30 -0000 1.64
+++ config/Makefile.config.in 29 Aug 2010 20:11:20 -0000 1.65
@@ -17,6 +17,9 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
Index: config/Makefile.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/Makefile.in,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -b -r1.188 -r1.189
--- config/Makefile.in 23 May 2010 09:12:14 -0000 1.188
+++ config/Makefile.in 29 Aug 2010 20:11:20 -0000 1.189
@@ -91,7 +91,7 @@
SUBDIRS=$(CDK) $(LIB) $(RSS) $(XML) $(NET) tools \
$(COMMON) $(DRIVER) $(MP3) src/config/$(OS_FILES)
-INCLUDES += $(foreach file, $(SUBDIRS), -I $(file))
+INCLUDES += $(foreach file, $(SUBDIRS), -I $(file)) -I +camlp4
CFLAGS:=$(CFLAGS) $(CONFIG_INCLUDES) $(GTKCFLAGS) $(GD_CFLAGS)
@@ -1460,7 +1460,7 @@
PA_ZOG_FILES=tools/zoggy/zog_types.ml tools/zoggy/zog_messages.ml
tools/zoggy/zog_misc.ml tools/zoggy/pa_zog.ml
pa_zog.cma: $(PA_ZOG_FILES)
- $(OCAMLC) -I tools/zoggy -I +camlp4 -pp "$(CAMLP4) pa_o.cmo pr_dump.cmo
-loc loc" -a -o pa_zog.cma $(PA_ZOG_FILES)
+ $(OCAMLC) -I tools/zoggy -I +camlp4 -pp "$(CAMLP4OF) -loc loc" -a -o
pa_zog.cma $(PA_ZOG_FILES)
OCAMLPP=./ocamlpp.byte
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -b -r1.336 -r1.337
--- config/configure.in 16 Aug 2010 19:17:21 -0000 1.336
+++ config/configure.in 29 Aug 2010 20:11:20 -0000 1.337
@@ -379,7 +379,7 @@
AC_ARG_ENABLE(batch, [ --enable-batch reply YES to all
queries in this script], [BATCH="$enableval"])
AC_ARG_ENABLE(force-ocaml, [ --enable-force-ocaml force usage of
self-compiled Ocaml], [FORCE_OCAML="$enableval"])
-AC_ARG_ENABLE(ocamlver, [ --enable-ocamlver=VER force usage of
specific Ocaml version (3.08.1|CVS), ], [REQUIRED_OCAML="$enableval"])
+AC_ARG_ENABLE(ocamlver, [ --enable-ocamlver=VER force usage of
specific Ocaml version (3.10.1|CVS), ], [REQUIRED_OCAML="$enableval"])
AC_ARG_ENABLE(mingw, [ --enable-mingw forces compilation
with MINGW on Cygwin], [FORCE_MINGW="$enableval"])
AC_ARG_ENABLE(checks, [ --enable-checks force mldonkey to
perform bound checks on array/string access], [CHECKBOUNDS="$enableval"])
if test "$CHECKBOUNDS" = "yes"; then
@@ -492,14 +492,20 @@
else
OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
case "$OCAMLVERSION" in
- "$REQUIRED_OCAML"*|3.12.*|3.11.*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;;
+ "$REQUIRED_OCAML"*|3.12.*|3.11.*|3.10.1*|3.10.2*) ;;
*)
echo "Need build"
BUILD_OCAML=yes
;;
esac
fi
-
+case "$REQUIRED_OCAML" in
+ 3.10.0|3.0*)
+ echo "Need build"
+ REQUIRED_OCAML=3.12.0
+ BUILD_OCAML=yes
+ ;;
+esac
if [ test "$BUILD_OCAML" = "yes" ] || [ test "$FORCE_OCAML" = "yes" ]; then
if [ test "$SYSTEM" = "mingw" ]; then
@@ -544,12 +550,6 @@
$WGET
http://caml.inria.fr/pub/distrib/ocaml-3.10/ocaml-"$REQUIRED_OCAML".tar.gz
fi
if test ! -f ocaml-"$REQUIRED_OCAML".tar.gz; then
- $WGET
http://caml.inria.fr/pub/distrib/ocaml-3.09/ocaml-"$REQUIRED_OCAML".tar.gz
- fi
- if test ! -f ocaml-"$REQUIRED_OCAML".tar.gz; then
- $WGET
http://caml.inria.fr/pub/distrib/ocaml-3.08/ocaml-"$REQUIRED_OCAML".tar.gz
- fi
- if test ! -f ocaml-"$REQUIRED_OCAML".tar.gz; then
echo "******** download Ocaml $REQUIRED_OCAML not successful,
try do download it manually *********" 1>&2;
echo "******** from http://caml.inria.fr/pub/distrib/
*********" 1>&2;
echo "******** and copy the tar.gz into $PATCH_DIR
*********" 1>&2;
@@ -618,6 +618,7 @@
OCAMLLEX=$LOCAL_OCAML/ocamllex.opt
OCAMLYACC=$LOCAL_OCAML/ocamlyacc
CAMLP4=$LOCAL_OCAML/camlp4
+ CAMLP4OF=$LOCAL_OCAML/camlp4of
else
if test "$OCAMLC" = "$LOCAL_OCAML"/ocamlc ; then
OCAML_PATH="$LOCAL_OCAML"/
@@ -632,6 +633,7 @@
OCAMLLEX=$LOCAL_OCAML/ocamllex
OCAMLYACC=$LOCAL_OCAML/ocamlyacc
CAMLP4=$LOCAL_OCAML/camlp4
+ CAMLP4OF=$LOCAL_OCAML/camlp4of
else
AC_CHECK_PROG(OCAMLOPT, ocamlopt.opt, ocamlopt.opt)
AC_CHECK_PROG(OCAMLOPT, ocamlopt, ocamlopt, no)
@@ -642,31 +644,34 @@
AC_CHECK_PROG(OCAMLDOC, ocamldoc, ocamldoc)
AC_CHECK_PROG(OCAMLMKTOP, ocamlmktop, ocamlmktop)
AC_CHECK_PROG(CAMLP4, camlp4, camlp4)
+ AC_CHECK_PROG(CAMLP4OF, camlp4of, camlp4of, no)
fi
fi
OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
OCAMLLIB=`$OCAMLC -where`
-REBUILD_OCAML=no
+
+# check if native dynlink is supported and therefore needed for linking
+CAMLP4LIB_OPT="camlp4lib.cmxa"
+CAMLP4LIB_BYTE="camlp4lib.cma"
+if test -f $OCAMLLIB/dynlink.cma; then
+ CAMLP4LIB_BYTE="dynlink.cma $CAMLP4LIB_BYTE"
+fi
+if test -f $OCAMLLIB/dynlink.cmxa; then
+ CAMLP4LIB_OPT="dynlink.cmxa $CAMLP4LIB_OPT"
+fi
+
+# force usage of supported Ocaml versions
case "$OCAMLVERSION" in
- 3.1*)
- if test "$GUI" = "oldgui"; then
- OLDGUI_NO_31=yes
- GUI=no
- fi
- ;;
- "$REQUIRED_OCAML"*|3.09.*|3.08.4*|3.08.3*) ;;
+ 3.10.1*|3.10.2*|3.1*) ;;
*)
if [ test "$REQUIRED_OCAML" != "CVS" ]; then
- REBUILD_OCAML=yes
+ echo "******** Version $REQUIRED_OCAML of Objective-Caml is required
*********" 1>&2;
+ echo "******* Check http://caml.inria.fr/ ********" 1>&2;
+ exit 1
fi
;;
esac
-if test "$REBUILD_OCAML" = "yes"; then
- echo "******** Version $REQUIRED_OCAML of Objective-Caml is required
*********" 1>&2;
- echo "******* Check http://caml.inria.fr/ ********" 1>&2;
- exit 1;
-fi
if test "$OCAMLOPT" = "no"; then
TARGET_TYPE=byte
@@ -1164,8 +1169,6 @@
echo " Checking activated networks finished."
echo "-----------------------------------------------"
-OCAMLLIB=`$OCAMLC -where`
-
if test -f $OCAMLLIB/lablgl.cma; then
LABLGL_CMA=lablgl.cma
fi
@@ -1190,14 +1193,7 @@
AC_MSG_CHECKING(for librsvg - version >= $REQUIRED_RSVG)
if pkg-config --atleast-version $REQUIRED_RSVG $PKG_RSVG; then
GTK_CONFIG="pkg-config $PKG_GTK $PKG_RSVG"
- case "$OCAMLVERSION" in
- 3.08*|3.09*)
- REQUIRED_LABLGTK=2.12.0
- ;;
- *)
REQUIRED_LABLGTK=2.14.1
- ;;
- esac
LABLGTK_NAME=lablgtk2
AC_MSG_RESULT(yes)
else
@@ -1236,15 +1232,15 @@
LABLGTK_CONFIG=no
else
AC_MSG_CHECKING(for native code $LABLGTK_NAME)
- if test -f `$OCAMLC -where`/$LABLGTK_NAME/lablgtk.$OCAMLLIB_EXT; then
+ if test -f $OCAMLLIB/$LABLGTK_NAME/lablgtk.$OCAMLLIB_EXT; then
if test "$GUI" = "newgui2"; then
- if test -f `$OCAMLC -where`/$LABLGTK_NAME/lablrsvg.$OCAMLLIB_EXT; then
+ if test -f $OCAMLLIB/$LABLGTK_NAME/lablrsvg.$OCAMLLIB_EXT; then
AC_MSG_RESULT(yes)
LABLGTK_CONFIG=yes
else
AC_MSG_RESULT(no)
LABLGTK_CONFIG=no
- if test -f `$OCAMLC -where`/$LABLGTK_NAME/lablrsvg.cma; then
+ if test -f $OCAMLLIB/$LABLGTK_NAME/lablrsvg.cma; then
echo "---------------------------------------------------------"
echo "lablrsvg is not installed properly. See the INSTALL.txt"
echo "file of mldonkey to see how to compile $LABLGTK_NAME. You"
@@ -1265,7 +1261,7 @@
else
AC_MSG_RESULT(no)
LABLGTK_CONFIG=no
- if test -f `$OCAMLC -where`/$LABLGTK_NAME/lablgtk.cma; then
+ if test -f $OCAMLLIB/$LABLGTK_NAME/lablgtk.cma; then
echo "-------------------------------------------------------------"
echo "$LABLGTK_NAME is not installed properly. See the INSTALL.txt"
echo "file of mldonkey to see how to compile $LABLGTK_NAME. You"
@@ -1314,7 +1310,7 @@
rm -rf lablgtk-"$REQUIRED_LABLGTK"
)
cd $CONFIG_DIR
- if test -f `$OCAMLC -where`/$LABLGTK_NAME/lablgtk.$OCAMLLIB_EXT; then
+ if test -f $OCAMLLIB/$LABLGTK_NAME/lablgtk.$OCAMLLIB_EXT; then
LABLGTK_CONFIG=yes
else
echo "Installation of $LABLGTK_NAME failed"
@@ -1341,8 +1337,7 @@
else
MORE_TARGETS="$MORE_TARGETS $GUIS"
AC_MSG_CHECKING(GToolbox.popup_menu args)
- OCAML_LIB_DIR="`$OCAMLC -where`"
- GTOOLBOX="$OCAML_LIB_DIR/$LABLGTK_NAME/gToolbox.mli"
+ GTOOLBOX="$OCAMLLIB/$LABLGTK_NAME/gToolbox.mli"
grep popup $GTOOLBOX | grep -i button 2> /dev/null && GTOOLBOX_ARGS=new
if test "$GTOOLBOX_ARGS" = "new"; then
GTOOLBOX_POPUPMENU=' ~button: button ~time: time '
@@ -1378,6 +1373,9 @@
AC_SUBST(OCAMLDEP)
AC_SUBST(OCAMLDEP_OPTIONS)
AC_SUBST(CAMLP4)
+AC_SUBST(CAMLP4OF)
+AC_SUBST(CAMLP4LIB_OPT)
+AC_SUBST(CAMLP4LIB_BYTE)
AC_SUBST(PERL)
AC_SUBST(OCAMLDOC)
AC_SUBST(OCAMLMKTOP)
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1463
retrieving revision 1.1464
diff -u -b -r1.1463 -r1.1464
--- distrib/ChangeLog 16 Aug 2010 19:19:23 -0000 1.1463
+++ distrib/ChangeLog 29 Aug 2010 20:11:20 -0000 1.1464
@@ -14,6 +14,9 @@
ChangeLog
=========
+2010/08/29
+7289: Raise minimum required Ocaml version to 3.10.1
+
2010/08/16
7267: Fix compilation error in GTK2 GUI
7282: Fix configure warning
Index: patches/lablgtk-2.10.0.patch
===================================================================
RCS file: patches/lablgtk-2.10.0.patch
diff -N patches/lablgtk-2.10.0.patch
--- patches/lablgtk-2.10.0.patch 7 Oct 2007 21:15:19 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- ./src/gtkMain.ml 2007-08-17 05:24:07.000000000 +0200
-+++ ./src/gtkMain.ml 2007-10-03 21:59:06.000000000 +0200
-@@ -43,6 +43,7 @@
- with Error err ->
- raise (Error ("GtkMain.init: initialization failed\n" ^ err))
- in
-+ if setlocale then ignore (Glib.Main.setlocale `NUMERIC (Some "C"));
- Array.blit ~src:argv ~dst:Sys.argv ~len:(Array.length argv)
- ~src_pos:0 ~dst_pos:0;
- Obj.truncate (Obj.repr Sys.argv) (Array.length argv);
Index: patches/ocaml-3.08.3.patch
===================================================================
RCS file: patches/ocaml-3.08.3.patch
diff -N patches/ocaml-3.08.3.patch
--- patches/ocaml-3.08.3.patch 23 May 2007 12:05:36 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
---- ./otherlibs/num/bng_ia32.c 2003-10-26 10:51:11.000000000 +0100
-+++ ./otherlibs/num/bng_ia32.c 2007-05-23 12:44:56.000000000 +0200
-@@ -121,8 +121,8 @@
- "leal 4(%1), %1 \n\t"
- "decl %2 \n\t"
- "jnz 1b"
-- : "+&r" (a), "+&r" (b), "+&rm" (blen), "+&r" (out)
-- : "rm" (d)
-+ : "+&r" (a), "+&r" (b), "+&r" (blen), "=m" (out)
-+ : "m" (d)
- : "eax", "edx");
- }
- if (alen == 0) return out;
-@@ -164,8 +164,8 @@
- "leal 4(%1), %1 \n\t"
- "decl %2 \n\t"
- "jnz 1b"
-- : "+&r" (a), "+&r" (b), "+&rm" (blen), "+&rm" (out), "=&r" (tmp)
-- : "rm" (d)
-+ : "+&r" (a), "+&r" (b), "=m" (blen), "=m" (out), "=&r" (tmp)
-+ : "m" (d)
- : "eax", "edx");
- }
- if (alen == 0) return out;
Index: patches/ocaml-3.09.1.patch
===================================================================
RCS file: patches/ocaml-3.09.1.patch
diff -N patches/ocaml-3.09.1.patch
--- patches/ocaml-3.09.1.patch 5 Jan 2006 01:27:02 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-diff -uwNr ./ocaml-3.09.1/camlp4/etc/pr_o.ml
./ocaml-3.09.1_new/camlp4/etc/pr_o.ml
---- ./camlp4/etc/pr_o.ml 2006-01-03 19:12:30.000000000 +0100
-+++ ./camlp4/etc/pr_o.ml 2005-08-13 22:59:37.000000000 +0200
-@@ -1407,9 +1407,7 @@
- <:expr< for $_$ = $_$ $to:_$ $_$ do { $list:_$ } >> |
- <:expr< while $_$ do { $list:_$ } >> | <:expr< ($list: _$) >> |
- <:expr< let $opt:_$ $list:_$ in $_$ >> |
-- <:expr< let module $_$ = $_$ in $_$ >> |
-- <:expr< new $list:_$ >> |
-- <:expr< assert $_$ >> | <:expr< lazy $_$ >> as e ->
-+ <:expr< let module $_$ = $_$ in $_$ >> as e ->
- fun curr next dg k ->
- [: `S LO "("; `expr e "" [: `HVbox [: `S RO ")"; k :] :] :]
- | e -> fun curr next _ k -> [: `not_impl "expr" e :] ]}];
-diff -uwNr ./ocaml-3.09.1/camlp4/etc/pr_r.ml
./ocaml-3.09.1_new/camlp4/etc/pr_r.ml
---- ./camlp4/etc/pr_r.ml 2006-01-03 19:12:30.000000000 +0100
-+++ ./camlp4/etc/pr_r.ml 2005-08-13 22:59:37.000000000 +0200
-@@ -1315,8 +1315,7 @@
- <:expr< while $_$ do { $list:_$ } >> |
- <:expr< let $opt:_$ $list:_$ in $_$ >> |
- <:expr< let module $_$ = $_$ in $_$ >> |
-- <:expr< new $list:_$ >> |
-- <:expr< assert $_$ >> | <:expr< lazy $_$ >> as e ->
-+ <:expr< new $list:_$ >> as e ->
- fun curr next _ k ->
- [: `S LO "("; `expr e [: `HVbox [: `S RO ")"; k :] :] :]
- | e -> fun curr next _ k -> [: `not_impl "expr" e :] ]}];
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Mldonkey-commits] mldonkey config/Makefile.config.in config/Makef...,
mldonkey-commits <=