[Pkg-ocaml-maint-commits] r3019 - in
/trunk/packages/mldonkey/trunk/debian: changelog
mldonkey-server.install patches/00list patches/cryptoflags.dpatch
utils/mldonkey_create_chroot
smimram at users.alioth.debian.org
smimram at users.alioth.debian.org
Fri Aug 18 08:33:11 UTC 2006
Author: smimram
Date: Fri Aug 18 08:33:08 2006
New Revision: 3019
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3019
Log:
cryptoflags + mldonkey_create_chroot
Added:
trunk/packages/mldonkey/trunk/debian/patches/cryptoflags.dpatch (with props)
Modified:
trunk/packages/mldonkey/trunk/debian/changelog
trunk/packages/mldonkey/trunk/debian/mldonkey-server.install
trunk/packages/mldonkey/trunk/debian/patches/00list
trunk/packages/mldonkey/trunk/debian/utils/mldonkey_create_chroot
Modified: trunk/packages/mldonkey/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/changelog?rev=3019&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/changelog (original)
+++ trunk/packages/mldonkey/trunk/debian/changelog Fri Aug 18 08:33:08 2006
@@ -1,5 +1,8 @@
-mldonkey (2.7.7-9) UNRELEASED; urgency=low
-
+mldonkey (2.7.7-9) unstable; urgency=low
+
+ * Added cryptoflags.dpatch to use the -mno-omit-leaf-frame-pointer option
+ only where available, closes: #383527.
+ * Not installing mldonkey_create_chroot anymore for now, closes: #380222.
* Correctly use --build and --host in configure.
-- Samuel Mimram <smimram at debian.org> Thu, 17 Aug 2006 17:09:00 +0000
Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-server.install?rev=3019&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.install (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.install Fri Aug 18 08:33:08 2006
@@ -5,5 +5,4 @@
debian/utils/mldonkey_files usr/bin/
debian/utils/mldonkey_command usr/bin/
debian/utils/mldonkey_submit usr/bin/
-debian/utils/mldonkey_create_chroot usr/bin/
debian/images/mlnet.xpm usr/share/pixmaps/
Modified: trunk/packages/mldonkey/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/patches/00list?rev=3019&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/patches/00list (original)
+++ trunk/packages/mldonkey/trunk/debian/patches/00list Fri Aug 18 08:33:08 2006
@@ -1,3 +1,4 @@
cvs_20060815
+cryptoflags
01_see
02_usr_bin
Added: trunk/packages/mldonkey/trunk/debian/patches/cryptoflags.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/patches/cryptoflags.dpatch?rev=3019&op=file
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/patches/cryptoflags.dpatch (added)
+++ trunk/packages/mldonkey/trunk/debian/patches/cryptoflags.dpatch Fri Aug 18 08:33:08 2006
@@ -1,0 +1,117 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## cryptoflags.dpatch by Spiral Voice <spiralvoice at hotmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use the -mno-omit-leaf-frame-pointer option only where available.
+## DP: See #383527.
+
+ at DPATCH@
+diff -urNad mldonkey-2.7.7~/config/Makefile.config.in mldonkey-2.7.7/config/Makefile.config.in
+--- mldonkey-2.7.7~/config/Makefile.config.in 2006-05-15 17:43:09.000000000 +0000
++++ mldonkey-2.7.7/config/Makefile.config.in 2006-08-18 08:20:15.000000000 +0000
+@@ -35,6 +35,7 @@
+ BITTORRENT=@BITTORRENT@
+ DONKEY=@DONKEY@
+ DONKEY_SUI=@DONKEY_SUI@
++CRYPTOPPFLAGS=@CRYPTOPPFLAGS@
+ DONKEY_SERVER=@DONKEY_SERVER@
+ SOULSEEK=@SOULSEEK@
+ OPENFT=@OPENFT@
+diff -urNad mldonkey-2.7.7~/config/Makefile.in mldonkey-2.7.7/config/Makefile.in
+--- mldonkey-2.7.7~/config/Makefile.in 2006-08-18 08:20:09.000000000 +0000
++++ mldonkey-2.7.7/config/Makefile.in 2006-08-18 08:20:15.000000000 +0000
+@@ -293,7 +293,7 @@
+ MAIN_SRCS=$(COMMON)/commonMain.ml
+
+ ifeq ("$(DONKEY_SUI)", "yes")
+- CRYPTOPP_LIBS_flags += -cc '$(CXX) $(CXXFLAGS)' -ccopt -fno-omit-frame-pointer -ccopt -mno-omit-leaf-frame-pointer
++ CRYPTOPP_LIBS_flags += -cc '$(CXX) $(CXXFLAGS)' -ccopt '$(CRYPTOPPFLAGS)'
+ 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 -mno-omit-leaf-frame-pointer -o $*.o "-I$(OCAMLLIB)" -c $<
++ $(CXX) $(CXXFLAGS) $(CRYPTOPPFLAGS) -o $*.o "-I$(OCAMLLIB)" -c $<
+
+ .cmo.byte:
+ $(OCAMLC) -o $*.byte $(LIBS) $<
+diff -urNad mldonkey-2.7.7~/config/aclocal.m4 mldonkey-2.7.7/config/aclocal.m4
+--- mldonkey-2.7.7~/config/aclocal.m4 2005-04-24 19:44:16.000000000 +0000
++++ mldonkey-2.7.7/config/aclocal.m4 2006-08-18 08:20:15.000000000 +0000
+@@ -1131,3 +1131,44 @@
+ AC_LANG_RESTORE
+ ])dnl ACX_PTHREAD
+
++AC_DEFUN(ACX_CHECK_CC_FLAGS,
++[
++AC_REQUIRE([AC_PROG_CC])
++AC_CACHE_CHECK(whether ${CC} accepts $1, ac_$2,
++[echo 'void f(){}' > conftest.c
++if test -z "`${CC} $1 -c conftest.c 2>&1`"; then
++ ac_$2=yes
++else
++ ac_$2=no
++fi
++rm -f conftest*
++])
++if test "$ac_$2" = yes; then
++ :
++ $3
++else
++ :
++ $4
++fi
++])
++
++AC_DEFUN(ACX_CHECK_CXX_FLAGS,
++[
++AC_REQUIRE([AC_PROG_CXX])
++AC_CACHE_CHECK(whether ${CXX} accepts $1, ac_$2,
++[echo 'void f(){}' > conftest.cpp
++if test -z "`${CXX} $1 -c conftest.cpp 2>&1`"; then
++ ac_$2=yes
++else
++ ac_$2=no
++fi
++rm -f conftest*
++])
++if test "$ac_$2" = yes; then
++ :
++ $3
++else
++ :
++ $4
++fi
++])
+\ No newline at end of file
+diff -urNad mldonkey-2.7.7~/config/configure.in mldonkey-2.7.7/config/configure.in
+--- mldonkey-2.7.7~/config/configure.in 2006-08-18 08:20:09.000000000 +0000
++++ mldonkey-2.7.7/config/configure.in 2006-08-18 08:20:15.000000000 +0000
+@@ -896,6 +896,7 @@
+ echo -e "---------------------------------------------\n"
+
+ CXX_VERSION=
++CRYPTOPPFLAGS=
+ echo "--------------------------------------"
+ echo " Checking activated networks."
+ echo "--------------------------------------"
+@@ -916,6 +917,8 @@
+ DONKEY_SUI=no
+ else
+ AC_MSG_RESULT(yes)
++ ACX_CHECK_CXX_FLAGS(-fno-omit-frame-pointer,no_omit_frame_pointer, CRYPTOPPFLAGS="-fno-omit-frame-pointer")
++ ACX_CHECK_CXX_FLAGS(-mno-omit-leaf-frame-pointer,no_omit_leaf_frame_pointer, CRYPTOPPFLAGS="$CRYPTOPPFLAGS -mno-omit-leaf-frame-pointer")
+ CXX=$NEWCXX
+ CXX_VERSION=`$CXX -dumpversion`
+ DONKEY_SUI_FILE=DonkeySui1
+@@ -1264,6 +1267,7 @@
+ AC_SUBST(FASTTRACK)
+ AC_SUBST(DONKEY)
+ AC_SUBST(DONKEY_SUI)
++AC_SUBST(CRYPTOPPFLAGS)
+ AC_SUBST(DONKEY_SUI_FILE)
+ AC_SUBST(DONKEY_SERVER)
+ AC_SUBST(GUI)
Propchange: trunk/packages/mldonkey/trunk/debian/patches/cryptoflags.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/packages/mldonkey/trunk/debian/utils/mldonkey_create_chroot
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/utils/mldonkey_create_chroot?rev=3019&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/utils/mldonkey_create_chroot (original)
+++ trunk/packages/mldonkey/trunk/debian/utils/mldonkey_create_chroot Fri Aug 18 08:33:08 2006
@@ -1,4 +1,4 @@
-#!/bin/bash
+#! /bin/sh
###############################################################################
More information about the Pkg-ocaml-maint-commits
mailing list