[singular] 30/45: merge cf_gmp sanitize patch into master-3-1-5

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master-3-1-5
in repository singular.

commit 8f8882092564f0a6cc7f5985a0e213a90b58b4d2
Merge: 93fc2d9 77dc62e
Author: Felix Salfelder <felix at salfelder.org>
Date:   Tue Aug 20 14:38:00 2013 +0200

    merge cf_gmp sanitize patch into master-3-1-5

 debian/.git-dpm                                    |    4 +-
 .../0011-sanitize-cf_gmp.h-generation.patch        |   44 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 factory/GNUmakefile.in                             |   14 ++++---
 factory/gen_cf_gmp.template                        |    3 --
 5 files changed, 55 insertions(+), 11 deletions(-)

diff --cc debian/.git-dpm
index 5b3a33e,0000000..5172cce
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 89a59f0679fe904fa320156d4411f18d5e106b08
- 89a59f0679fe904fa320156d4411f18d5e106b08
++77dc62e5ef186d11b5d376af96bc0b71471387f0
++77dc62e5ef186d11b5d376af96bc0b71471387f0
 +c2d0b997183a0cc911fdef0861638995bafededc
 +c2d0b997183a0cc911fdef0861638995bafededc
 +singular_3-1-5.dfsg.orig.tar.gz
 +eb6aabf3f389eec6a4605e43e807d946b432c0d9
 +19748109
diff --cc debian/patches/0011-sanitize-cf_gmp.h-generation.patch
index 0000000,0000000..7f9d968
new file mode 100644
--- /dev/null
+++ b/debian/patches/0011-sanitize-cf_gmp.h-generation.patch
@@@ -1,0 -1,0 +1,44 @@@
++From 77dc62e5ef186d11b5d376af96bc0b71471387f0 Mon Sep 17 00:00:00 2001
++From: Felix Salfelder <felix at salfelder.org>
++Date: Tue, 20 Aug 2013 13:52:48 +0200
++Subject: sanitize cf_gmp.h generation
++
++this is similar to
++http://trac.sagemath.org/attachment/ticket/14737/sanitize_gmp_header_hack.patch
++---
++ factory/GNUmakefile.in      | 14 ++++++++------
++ factory/gen_cf_gmp.template |  3 ---
++ 2 files changed, 8 insertions(+), 9 deletions(-)
++ delete mode 100644 factory/gen_cf_gmp.template
++
++diff --git a/factory/GNUmakefile.in b/factory/GNUmakefile.in
++index f2b9c96..0279a51 100644
++--- a/factory/GNUmakefile.in
+++++ b/factory/GNUmakefile.in
++@@ -696,9 +696,11 @@ GNUmakefile:	GNUmakefile.in config.status
++ config.status:	configure
++ 		./config.status --recheck
++ 
++-# create cf_gmp.h
++-cf_gmp.h: gen_cf_gmp.template
++-	echo "#!/bin/sh" >gen_cf_gmp.sh 
++-	echo "GMP_H_T=\"`$(CXX) $(LIBCXXFLAGS) -M gen_cf_gmp.cc|grep gmp.h` \"" >>gen_cf_gmp.sh 
++-	cat gen_cf_gmp.template >>gen_cf_gmp.sh
++-	$(SHELL) gen_cf_gmp.sh
+++GMP_H_ = $(shell echo '\#include <gmp.h>' | $(CXX) $(LIBCXXFLAGS) -E - -M -MP | grep 'gmp\.h:$$' )
+++GMP_H__ = $(GMP_H_:.h:=.h)
+++
+++cf_gmp.h: GNUmakefile $(GMP_H__)
+++	@echo "Generating $@ from $(GMP_H__)...";
+++	test -f "$(GMP_H__)"
+++	grep -v '__GMP_DECLSPEC_XX|std::FILE' $(GMP_H__) > $@T
+++	diff $@T $@ >/dev/null 2>/dev/null && rm $@T || mv $@T $@
++diff --git a/factory/gen_cf_gmp.template b/factory/gen_cf_gmp.template
++deleted file mode 100644
++index 90389ac..0000000
++--- a/factory/gen_cf_gmp.template
+++++ /dev/null
++@@ -1,3 +0,0 @@
++-GMP_H=`echo $GMP_H_T| sed -e 's/^.*gmp.cc//' -e 's/ .$//'`
++-echo generating cf_gmp.h from $GMP_H
++-cat $GMP_H | grep -v __GMP_DECLSPEC_XX |grep -v std::FILE > cf_gmp.h
diff --cc debian/patches/series
index 97877e1,0000000..960f446
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,10 -1,0 +1,11 @@@
 +0001-tag-gfan-using-examples.patch
 +0002-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch
 +0003-add-working-all-target-to-Makefile.in.patch
 +0004-miscellaneous-Makefile.in-patches.patch
 +0005-assert-needs-to-be-defined-after-include-assert.h.patch
 +0006-keep-mod2.h-in-Singular.patch
 +0007-move-libreadline-to-main-binary.patch
 +0008-default-path-settings.patch
 +0009-fix-NTL-negate-namespace-issue.patch
 +0010-install-factory.h-where-libfac-expects-it.patch
++0011-sanitize-cf_gmp.h-generation.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/singular.git