[Mldonkey-commits] mldonkey config/Makefile.in distrib/ChangeLog

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/08/15 12:37:19

Modified files:
        config         : Makefile.in 
        distrib        : ChangeLog 

Log message:
        patch #5307

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/Makefile.in?cvsroot=mldonkey&r1=1.167&r2=1.168
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.959&r2=1.960

Patches:
Index: config/Makefile.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/Makefile.in,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -b -r1.167 -r1.168
--- config/Makefile.in  24 Jul 2006 20:15:15 -0000      1.167
+++ config/Makefile.in  15 Aug 2006 12:37:18 -0000      1.168
@@ -293,7 +293,7 @@
 MAIN_SRCS=$(COMMON)/commonMain.ml
 
 ifeq ("$(DONKEY_SUI)", "yes")
-  CRYPTOPP_LIBS_flags += -cc '$(CXX) $(CXXFLAGS)' -ccopt 
-fno-omit-frame-pointer
+  CRYPTOPP_LIBS_flags += -cc '$(CXX) $(CXXFLAGS)' -ccopt 
-fno-omit-frame-pointer -ccopt -mno-omit-leaf-frame-pointer
   DONKEY_SRCS += $(LIB)/CryptoPP.cc $(LIB)/CryptoPP_stubs.c 
$(SRC_DONKEY)/donkeySui1.ml $(SRC_DONKEY)/donkeySui.ml
 else
   DONKEY_SRCS += $(SRC_DONKEY)/donkeySui2.ml $(SRC_DONKEY)/donkeySui.ml
@@ -1952,7 +1952,7 @@
        $(OCAMLC) -verbose -ccopt "-I $(OCAML_SRC)/byterun -o $*.o" -ccopt 
"$(CFLAGS)" $(LIBS_flags) -c $<
 
 .cc.o :
-       $(CXX) $(CXXFLAGS) -fno-omit-frame-pointer -o $*.o "-I$(OCAMLLIB)" -c $<
+       $(CXX) $(CXXFLAGS) -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer 
-o $*.o "-I$(OCAMLLIB)" -c $<
 
 .cmo.byte:
        $(OCAMLC) -o $*.byte $(LIBS) $<

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.959
retrieving revision 1.960
diff -u -b -r1.959 -r1.960
--- distrib/ChangeLog   15 Aug 2006 11:35:12 -0000      1.959
+++ distrib/ChangeLog   15 Aug 2006 12:37:18 -0000      1.960
@@ -15,6 +15,7 @@
 =========
 
 2006/08/15
+5307: CryptoPP: Deactivate compiler option -momit-leaf-frame-pointer
 5300: Fix iconv compile bug on Eisfair
 5299: Support magicdb in $MLDONKEY_DIR/magic/magic if present
       this location is used in addition to the defaults of libmagic