[Pkg-ocaml-maint-commits] r3213 - in
/trunk/packages/demexp/trunk/debian/patches:
configure-ocamlfind-for-config-file-lib.dpatch fix-static-compilation.dpatch
tpetazzo-guest at users.alioth.debian.org
tpetazzo-guest at users.alioth.debian.org
Tue Oct 3 17:57:49 UTC 2006
Author: tpetazzo-guest
Date: Tue Oct 3 17:57:48 2006
New Revision: 3213
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3213
Log:
New Debian patches for upstream version 0.8.0
Added:
trunk/packages/demexp/trunk/debian/patches/configure-ocamlfind-for-config-file-lib.dpatch (with props)
trunk/packages/demexp/trunk/debian/patches/fix-static-compilation.dpatch (with props)
Added: trunk/packages/demexp/trunk/debian/patches/configure-ocamlfind-for-config-file-lib.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/demexp/trunk/debian/patches/configure-ocamlfind-for-config-file-lib.dpatch?rev=3213&op=file
==============================================================================
--- trunk/packages/demexp/trunk/debian/patches/configure-ocamlfind-for-config-file-lib.dpatch (added)
+++ trunk/packages/demexp/trunk/debian/patches/configure-ocamlfind-for-config-file-lib.dpatch Tue Oct 3 17:57:48 2006
@@ -1,0 +1,606 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## configure-ocamlfind-for-config-file-lib.dpatch by <thomas at localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/configure trunk/configure
+--- trunk~/configure 2006-10-01 16:21:14.000000000 +0200
++++ trunk/configure 2006-10-03 19:54:53.000000000 +0200
+@@ -417,28 +417,26 @@
+ # find independent config_file
+
+ echo -n "Looking for config_file library... "
+-ocamlstdlib=`ocamlc -v|sed -re '2!{d};2{s/^.*: (.*)/\1/}'`
+-ocamllocallib=`echo $ocamlstdlib|sed 's|/usr/lib|/usr/local/lib|'`
+-if test -f "$ocamlstdlib/config_file/config_file.cmx"; then
+- echo "$ocamlstdlib/config_file/config_file.cmx";
+- external_include="$external_include -I $ocamlstdlib/config_file";
+- external_cmxa="$external_cmxa config_file.cmx";
++configfileinc=`ocamlfind query -i-format -recursive -separator ' ' cameleon.config_file`
++configfilecmxa=cameleon.config_file
++if test -n "$configfileinc"; then
++ echo "$configfileinc";
++ external_include="$external_include $configfileinc";
++ external_package="$external_package $configfilecmxa";
+ else
+- if test -f "$ocamllocallib/config_file/config_file.cmx"; then
+- echo "$ocamllocallib/config_file/config_file.cmx";
+- external_include="$external_include -I $ocamllocallib/config_file";
+- external_cmxa="$external_cmxa config_file.cmx";
+- else
+- echo "not found, not in $ocamlstdlib/config_file/"
+- echo " neither in $ocamllocallib/config_file/";
+- echo "*** This tool is required to build demexp";
+- echo "*** Please install the package or compile following instructions found";
+- echo "*** in README. Source archive available at:";
+- echo "*** http://download.gna.org/cameleon/";
+- exit 2;
+- fi
++ echo "*** This tool is required to build demexp";
++ echo "*** Please install the package or compile following instructions found";
++ echo "*** in README. Source archive available at:";
++ echo "*** http://download.gna.org/cameleon/";
++ exit 2;
+ fi
+
++# find needed .cmxa for ocamlfind package name
++
++external_cmxa=`ocamlfind query -predicates native -a-format -recursive -separator ' ' $external_package`
++# remove spurious '+'
++external_cmxa=`echo $external_cmxa | sed -e "s|+||g"`
++
+ # remove -I /usr/lib/ocaml/VERSION otherwise ocamldep will introduce
+ # unneeded dependencies on standard modules (e.g. thread.cmi)
+ standard_include=`ocamlfind query -i-format stdlib`
+diff -urNad trunk~/configure.orig trunk/configure.orig
+--- trunk~/configure.orig 1970-01-01 01:00:00.000000000 +0100
++++ trunk/configure.orig 2006-10-01 16:21:14.000000000 +0200
+@@ -0,0 +1,546 @@
++#!/bin/sh
++
++# Configure shell script for demexp
++# copyright 2005 David MENTRE
++
++# This software is under GNU GPL. See COPYING.GPL file for details
++
++# Code inspired by OCaml configure script with following copyright:
++# Copyright 1999 Institut National de Recherche en Informatique et #
++# en Automatique. All rights reserved. This file is distributed #
++# under the terms of the GNU Library General Public License, with #
++# the special exception on linking described in file LICENSE. #
++
++
++configure_options="$*"
++prefix=/usr/local
++server_target=yes
++client_target=yes
++web_target=yes
++dvi_target=yes
++pdf_target=yes
++test_target=no
++for_developer=no
++bindir=''
++mandir=''
++sharedir=''
++manext=1
++
++# Try to turn internationalization off, can cause config.guess to malfunction!
++unset LANG
++unset LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
++
++# Turn off some MacOS X debugging stuff, same reason
++unset RC_TRACE_ARCHIVES RC_TRACE_DYLIBS RC_TRACE_PREBINDING_DISABLED
++
++# Parse command-line arguments
++
++while : ; do
++ case "$1" in
++ "") break;;
++ --help)
++ cat << _EOF
++ --prefix path prefix for installation (default: /usr/local)
++
++ --bindir path where to install binaries (default: /usr/local/bin)
++
++ --sharedir path where to install documentation
++ (default: /usr/local/share/demexp)
++
++ --mandir path where to install man pages (default: /usr/local/man/man1)
++
++ --no-client do not compile the client (default: compile client)
++
++ --no-server do not compile the server (default: compile server)
++
++ --no-web do not compile the web interface (default: compile web)
++
++ --no-dvi do not produce .dvi and .pdf files (default: dvi & pdf)
++
++ --no-pdf do not produce .pdf files (default: dvi & pdf)
++
++ --for-developer developer features: include autotests and do 'make test'
++ by default (default: no)
++
++ --help display this list
++_EOF
++ exit 1;;
++ --prefix)
++ prefix=$2; shift;;
++ --bindir)
++ bindir=$2; shift;;
++ --sharedir)
++ sharedir=$2; shift;;
++ --mandir)
++ case "$2" in
++ */man[1-9ln])
++ mandir=`echo $2 | sed -e 's|^\(.*\)/man.$|\1|'`
++ manext=`echo $2 | sed -e 's/^.*\(.\)$/\1/'`;;
++ *)
++ mandir=$2
++ manext=1;;
++ esac
++ shift;;
++ --no-server)
++ server_target=no;;
++ --no-client)
++ client_target=no;;
++ --no-web)
++ web_target=no;;
++ --no-dvi)
++ dvi_target=no; pdf_target=no;;
++ --no-pdf)
++ pdf_target=no;;
++ --for-developer)
++ for_developer=yes; test_target=yes;;
++ *) echo "Unknown option \"$1\"." 1>&2; exit 2;;
++ esac
++ shift
++done
++
++# Sanity checks
++
++case "$prefix" in
++ /*) ;;
++ *) echo "The --prefix directory must be absolute." 1>&2; exit 2;;
++esac
++case "$bindir" in
++ /*) ;;
++ "") ;;
++ *) echo "The --bindir directory must be absolute." 1>&2; exit 2;;
++esac
++case "$sharedir" in
++ /*) ;;
++ "") ;;
++ *) echo "The --sharedir directory must be absolute." 1>&2; exit 2;;
++esac
++case "$mandir" in
++ /*) ;;
++ "") ;;
++ *) echo "The --mandir directory must be absolute." 1>&2; exit 2;;
++esac
++
++# Generate the files
++
++cd config/
++rm -f Makefile
++touch Makefile
++
++# Write options to Makefile
++
++echo "# generated by ./configure $configure_options" >> Makefile
++
++# Platform
++PLATFORM="None"
++case "$OSTYPE" in
++ *linux*) PLATFORM="linux" ;;
++ *msys*|*cygwin*) PLATFORM="win32" ;;
++ *) echo "Unknown platform $OSTYPE" ;;
++esac
++echo "PLATFORM=$PLATFORM" >> Makefile
++
++# Where to install
++
++echo "PREFIX=$prefix" >> Makefile
++case "$bindir" in
++ "") echo 'BINDIR=$(PREFIX)/bin' >> Makefile
++ bindir="$prefix/bin";;
++ *) echo "BINDIR=$bindir" >> Makefile;;
++esac
++case "$sharedir" in
++ "") echo 'SHAREDIR=$(PREFIX)/share' >> Makefile
++ sharedir="$prefix/share";;
++ *) echo "SHAREDIR=$sharedir" >> Makefile;;
++esac
++echo 'SHARE_DEMEXP_DIR=$(SHAREDIR)/demexp' >> Makefile
++case "$mandir" in
++ "") echo 'MANDIR=$(PREFIX)/man' >> Makefile
++ mandir="$prefix/man";;
++ *) echo "MANDIR=$mandir" >> Makefile;;
++esac
++echo "MANEXT=$manext" >> Makefile
++
++# do system specific settings
++
++system=`uname -s`
++echo "System: $system"
++case "$system" in
++ "Darwin")
++ # MacOS X does not support static linking by default
++ echo " You are under MacOS X, binaries won't be compiled statically"
++ echo 'STATIC:=' >> Makefile
++ ;;
++
++ *)
++ echo " Cool, your system support static binaries"
++ echo 'STATIC:=-static' >> Makefile
++ ;;
++esac
++
++
++# do we have ocaml?
++
++echo -n "Looking for ocamlc... "
++if sh ./searchpath ocamlc; then
++ echo "found";
++else
++ echo "not found";
++ echo "*** OCaml compiler is required for compilation";
++ echo "*** Please install the package or compile following instructions found";
++ echo "*** in README. Source archive available at";
++ echo "*** http://caml.inria.fr/ocaml/distrib.html";
++ exit 2;
++fi
++
++echo -n "Looking for ocamlopt... "
++if sh ./searchpath ocamlopt; then
++ echo "found";
++else
++ echo "not found"; exit 2;
++fi
++
++echo -n "Looking for ocamldep... "
++if sh ./searchpath ocamldep; then
++ echo "found";
++else
++ echo "not found"; exit 2;
++fi
++
++# do we have noweb?
++
++echo -n "Looking for noweb's notangle... "
++if sh ./searchpath notangle; then
++ echo "found";
++else
++ echo "not found";
++ echo "*** This tool is required for compilation";
++ echo "*** Please install the package or compile following instructions found";
++ echo "*** in README. Source archive available at";
++ echo "*** http://www.eecs.harvard.edu/~nr/noweb/";
++ exit 2;
++fi
++
++echo -n "Looking for noweb's noweave... "
++if sh ./searchpath noweave; then
++ echo "found";
++else
++ echo "not found";
++ echo "*** This tool is required for compilation";
++ echo "*** Please install the package or compile following instructions found";
++ echo "*** in README. Source archive available at";
++ echo "*** http://www.eecs.harvard.edu/~nr/noweb/";
++ exit 2;
++fi
++
++# do we have ocamlrpcgen?
++
++echo -n "Looking for ocamlrpcgen... "
++if sh ./searchpath ocamlrpcgen; then
++ echo "found";
++else
++ echo "not found";
++ echo "*** This tool is required for compilation";
++ echo "*** Please install the package or compile following instructions found";
++ echo "*** in README. Source archive available at";
++ echo "*** http://www.ocaml-programming.de/programming/rpc.html";
++ exit 2;
++fi
++
++# do we have latex and pdflatex?
++
++if test "$dvi_target" = "yes"; then
++ echo -n "Looking for latex... "
++ if sh ./searchpath latex; then
++ echo "found";
++ else
++ echo "not found";
++ echo "*** This non-essential tool is needed to generate documentation";
++ echo "*** You can disable it by using option --no-dvi";
++ exit 2;
++ fi
++fi
++
++if test "$pdf_target" = "yes"; then
++ echo -n "Looking for pdflatex... "
++ if sh ./searchpath pdflatex; then
++ echo "found";
++ else
++ echo "not found";
++ echo "*** This non-essential tool is needed to generate documentation";
++ echo "*** You can disable it by using option --no-pdf";
++ exit 2;
++ fi
++fi
++
++# do we have ocamlfind?
++
++echo -n "Looking for ocamlfind... "
++if sh ./searchpath ocamlfind; then
++ echo "found";
++else
++ echo "not found";
++ echo "*** This tool is required for compilation.";
++ echo "*** Please install the package or compile following instructions found";
++ echo "*** in README. Source archive is available at:";
++ echo "*** http://www.ocaml-programming.de/programming/findlib.html";
++ exit 2;
++fi
++
++# do we have wd-xmlcompile?
++
++if test "$web_target" = "yes"; then
++ echo -n "Looking for wd-xmlcompile... "
++ if ocamlfind query wd-xmlcompiler; then
++ echo -n
++ else
++ echo "not found";
++ echo "*** This tool is required to build the web interface.";
++ echo "*** Please disable web interface using option --no-web";
++ echo "*** or install the package or compile it following instructions found";
++ echo "*** in README. Source archive available at:";
++ echo "*** http://wdialog.sourceforge.net/";
++ exit 2;
++ fi
++fi
++
++# do we have xgettext?
++
++echo -n "Looking for xgettext... "
++if sh ./searchpath xgettext; then
++ echo "found";
++else
++ echo "not found";
++ echo "*** This tool is required for compilation";
++ echo "*** Please install the package or compile following instructions found";
++ echo "*** in README. Source archive available at";
++ echo "*** http://www.gnu.org/software/gettext/gettext.html#TOCdownloading";
++ exit 2;
++fi
++
++# find needed external lib using ocamlfind
++
++external_include=''
++external_package=''
++
++echo -n "Looking for rpc and dependencies directory lib... "
++rpcinc=`ocamlfind query -i-format -recursive -separator ' ' rpc`
++rpccmxa=rpc
++if test -n "$rpcinc"; then
++ echo "$rpcinc";
++ external_include="$external_include $rpcinc";
++ external_package="$external_package $rpccmxa";
++else
++ echo "not found";
++ echo "*** This tool is required to build the server";
++ echo "*** Please install the package or compile following instructions found";
++ echo "*** in README. Source archive available at:";
++ echo "*** http://www.ocaml-programming.de/programming/rpc.html";
++ exit 2;
++fi
++
++echo -n "Looking for gz directory lib... "
++gzinc=`ocamlfind query -i-format -recursive -separator ' ' gz`
++gzcmxa=gz
++if test -n "$gzinc"; then
++ echo "$gzinc";
++ external_include="$external_include $gzinc";
++ external_package="$external_package $gzcmxa";
++else
++ echo "not found";
++ echo "*** This tool is required to build the server.";
++ echo "*** Please install the package or compile following instructions found";
++ echo "*** in README. Source archive available at:";
++ echo "*** http://ocamlplot.sourceforge.net/#gz";
++ exit 2;
++fi
++
++if test "$server_target" = "yes"; then
++ echo -n "Looking for cduce and its dependencies directory lib... "
++ cduceinc=`ocamlfind query -i-format -recursive -separator ' ' cduce`
++ cducecmxa=cduce
++ if test -n "$cduceinc"; then
++ echo "$cduceinc";
++ external_include="$external_include $cduceinc";
++ external_package="$external_package $cducecmxa";
++ else
++ echo "*** This tool is required to build the server.";
++ echo "*** Please disable server using option --no-server";
++ echo "*** or install the package";
++ echo "*** or compile following instructions found in README.";
++ echo "*** Source archive available at:";
++ echo "*** http://www.cduce.org/download.html";
++ exit 2;
++ fi
++fi
++
++if test "$web_target" = "yes"; then
++ echo -n "Look for wdialog and its dependencies directory lib... "
++ wdialoginc=`ocamlfind query -i-format -recursive -separator ' ' wdialog`
++ wdialogcmxa=wdialog
++ if test -n "$wdialoginc"; then
++ echo "$wdialoginc";
++ external_include="$external_include $wdialoginc";
++ external_package="$external_package $wdialogcmxa";
++ else
++ echo "not found";
++ echo "*** This tool is required to build the web interface.";
++ echo "*** Please disable web interface using option --no-web";
++ echo "*** or install the package or compile following instructions found";
++ echo "*** in README. Source archive available at:";
++ echo "*** http://wdialog.sourceforge.net/";
++ exit 2;
++ fi
++fi
++
++echo -n "Looking for gettext-stub and dependencies directory lib... "
++gettextinc=`ocamlfind query -i-format -recursive -separator ' ' gettext-stub`
++gettextcmxa=gettext-stub
++if test -n "$gettextinc"; then
++ echo "$gettextinc";
++ external_include="$external_include $gettextinc";
++ external_package="$external_package $gettextcmxa";
++else
++ echo "not found";
++ echo "*** This tool is required to build demexp";
++ echo "*** Please install the package or compile following instructions found";
++ echo "*** in README. Source archive available at:";
++ echo "*** http://sylvain.le-gall.net/ocaml-gettext.html";
++ exit 2;
++fi
++
++# find needed .cmxa for ocamlfind package name
++
++external_cmxa=`ocamlfind query -predicates native -a-format -recursive -separator ' ' $external_package`
++# remove spurious '+'
++external_cmxa=`echo $external_cmxa | sed -e "s|+||g"`
++
++# find independent config_file
++
++echo -n "Looking for config_file library... "
++ocamlstdlib=`ocamlc -v|sed -re '2!{d};2{s/^.*: (.*)/\1/}'`
++ocamllocallib=`echo $ocamlstdlib|sed 's|/usr/lib|/usr/local/lib|'`
++if test -f "$ocamlstdlib/config_file/config_file.cmx"; then
++ echo "$ocamlstdlib/config_file/config_file.cmx";
++ external_include="$external_include -I $ocamlstdlib/config_file";
++ external_cmxa="$external_cmxa config_file.cmx";
++else
++ if test -f "$ocamllocallib/config_file/config_file.cmx"; then
++ echo "$ocamllocallib/config_file/config_file.cmx";
++ external_include="$external_include -I $ocamllocallib/config_file";
++ external_cmxa="$external_cmxa config_file.cmx";
++ else
++ echo "not found, not in $ocamlstdlib/config_file/"
++ echo " neither in $ocamllocallib/config_file/";
++ echo "*** This tool is required to build demexp";
++ echo "*** Please install the package or compile following instructions found";
++ echo "*** in README. Source archive available at:";
++ echo "*** http://download.gna.org/cameleon/";
++ exit 2;
++ fi
++fi
++
++# remove -I /usr/lib/ocaml/VERSION otherwise ocamldep will introduce
++# unneeded dependencies on standard modules (e.g. thread.cmi)
++standard_include=`ocamlfind query -i-format stdlib`
++external_include=`echo $external_include | sed -e "s|$standard_include ||g"`
++
++# output to Makefile
++
++echo "EXTERNAL_INC=$external_include" >> Makefile
++echo "EXTERNAL_CMXA=$external_cmxa" >> Makefile
++
++# compute default targets and finish Makefile
++
++default=''
++
++if test "$client_target" = "yes"; then
++ default="$default client"
++fi
++if test "$server_target" = "yes"; then
++ default="$default server"
++fi
++if test "$web_target" = "yes"; then
++ default="$default web"
++fi
++if test "$test_target" = "yes"; then
++ default="$default test"
++fi
++if test "$dvi_target" = "yes"; then
++ default="$default dvi"
++fi
++if test "$pdf_target" = "yes"; then
++ default="$default pdf"
++fi
++
++echo ".PHONY: default" >> Makefile
++echo "default: $default" >> Makefile
++echo "include config/Makefile.inc" >> Makefile
++
++# produce config.ml
++
++rm -f config.ml
++touch config.ml
++
++echo "(* generated by ./configure $configure_options *)" >> config.ml
++
++echo
++echo "(* if do_autotest is true, some automatic tests will be automatically" \
++ >> config.ml
++echo " done when a software is started *)" >> config.ml
++if test "$for_developer" = "yes"; then
++ echo "let do_autotests = true" >> config.ml
++else
++ echo "let do_autotests = false" >> config.ml
++fi
++
++echo
++echo "(* if check_invariants is true, invariants on bases are checked at" \
++ >> config.ml
++echo " each base modification. Can be costly. *) " >> config.ml
++if test "$for_developer" = "yes"; then
++ echo "let check_invariants = true" >> config.ml
++else
++ echo "let check_invariants = false" >> config.ml
++fi
++
++cat config.inc.ml >> config.ml
++
++# and then produce final Makefile and config.ml
++
++if test -f ../Makefile; then
++ rm ../Makefile
++fi
++mv Makefile ..
++
++if test -f ../config.ml; then
++ rm ../config.ml
++fi
++mv config.ml ..
++
++
++# print summary
++
++echo
++echo "** Configuration summary **"
++echo
++echo "Directories where demexp will be installed:"
++echo " binaries.................. $bindir"
++echo " documentations............ $sharedir/demexp"
++echo " manual pages.............. $mandir (with extension .$manext)"
++
++echo
++echo "Compilation options:"
++echo " developer features........ $for_developer"
++echo " make tests................ $test_target"
++
++echo
++echo "Things to produce:"
++echo " server.................... $server_target"
++echo " client.................... $client_target"
++echo " web interface............. $web_target"
++echo " DVI documentation......... $dvi_target"
++echo " PDF documentation......... $pdf_target"
++
++echo
++echo "** demexp configuration completed successfully **"
++echo
Propchange: trunk/packages/demexp/trunk/debian/patches/configure-ocamlfind-for-config-file-lib.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: trunk/packages/demexp/trunk/debian/patches/fix-static-compilation.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/demexp/trunk/debian/patches/fix-static-compilation.dpatch?rev=3213&op=file
==============================================================================
--- trunk/packages/demexp/trunk/debian/patches/fix-static-compilation.dpatch (added)
+++ trunk/packages/demexp/trunk/debian/patches/fix-static-compilation.dpatch Tue Oct 3 17:57:48 2006
@@ -1,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-static-compilation.dpatch by <thomas at localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/config/Makefile.inc trunk/config/Makefile.inc
+--- trunk~/config/Makefile.inc 2006-10-01 16:21:14.000000000 +0200
++++ trunk/config/Makefile.inc 2006-10-03 19:55:26.000000000 +0200
+@@ -369,12 +369,12 @@
+ $(OCAMLOPT) $(SRV_OCAMLOPTFLAGS) -o $@ $(SRV_CMXALIBS) $^
+
+ srv/demexp-server.static: $(SRVOBJ)
+- $(OCAMLOPT) $(SRV_OCAMLOPTFLAGS) -ccopt $(STATIC) \
++ $(OCAMLOPT) -verbose -cclib "-lgcrypt -ltasn1 -lgpg-error" $(SRV_OCAMLOPTFLAGS) -ccopt $(STATIC) \
+ -o $@ $(SRV_CMXALIBS) $^
+
+ ## bytecode
+ srv/demexp-server.bc: $(SRVCMO)
+- $(OCAMLC) -custom -dllib pcre_stubs -ccopt $(STATIC) -cclib -lpcre \
++ $(OCAMLC) -custom -dllib pcre_stubs -ccopt $(STATIC) -cclib "-lpcre -lgcrypt -ltasn1 -lgpg-error" \
+ $(SRV_OCAMLCFLAGS) -o $@ $(SRV_CMALIBS) $^
+
+ ## gtk2 client
Propchange: trunk/packages/demexp/trunk/debian/patches/fix-static-compilation.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-ocaml-maint-commits
mailing list