[fplll] 01/01: Updated the versioned strategies patch so it doesn't break fpylll

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository fplll.

commit b6cf52c329aa1c929635afd5e10de31e54172fea
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Fri Aug 4 10:01:55 2017 +0200

    Updated the versioned strategies patch so it doesn't break fpylll
---
 debian/changelog                         |  6 ++++
 debian/patches/versioned_strategies_path | 58 +++++++++++++++++++++++++++++++-
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e500c91..91c87fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+fplll (5.1.0-3) UNRELEASED; urgency=medium
+
+  * Improved the strategies patch (Closes: #870698).
+
+ -- Julien Puydt <julien.puydt at laposte.net>  Fri, 04 Aug 2017 10:00:39 +0200
+
 fplll (5.1.0-2) experimental; urgency=medium
 
   * Made the strategies file go in a versioned directory so different
diff --git a/debian/patches/versioned_strategies_path b/debian/patches/versioned_strategies_path
index 51043e0..1f5ea78 100644
--- a/debian/patches/versioned_strategies_path
+++ b/debian/patches/versioned_strategies_path
@@ -10,7 +10,63 @@ Forwarded: no
  pkgconfig_DATA     = fplll.pc
  
 -strategydir        = $(pkgdatadir)/strategies
-+strategydir        = /usr/share/libfplll3/strategies
++strategydir        = @FPLLL_DEFAULT_STRATEGY_PATH@
  dist_strategy_DATA = strategies/default.json
  
  CLANGFORMAT       ?= clang-format
+--- a/configure.ac
++++ b/configure.ac
+@@ -132,6 +132,12 @@
+ AC_DEFINE_UNQUOTED([FPLLL_VERSION],[$FPLLL_VERSION],[full version])
+ AC_DEFINE_UNQUOTED([FPLLL_VERSION_INFO],[$FPLLL_VERSION_INFO],[long version string])
+ 
++FPLLL_DEFAULT_STRATEGY_PATH=\"/usr/share/libfplll$FPLLL_LT_CURRENT/strategies/\"
++AC_DEFINE_UNQUOTED([FPLLL_DEFAULT_STRATEGY_PATH], [$FPLLL_DEFAULT_STRATEGY_PATH], [path to default strategy])
++AC_SUBST(FPLLL_DEFAULT_STRATEGY_PATH)
++AC_DEFINE_UNQUOTED([FPLLL_DEFAULT_STRATEGY], ["default.json"], [name of default strategy])
++AC_SUBST(FPLLL_DEFAULT_STRATEGY)
++
+ AC_CONFIG_HEADERS([fplll/fplll_config.h])
+ 
+ AC_CONFIG_FILES([Makefile
+--- a/fplll/defs.h
++++ b/fplll/defs.h
+@@ -256,14 +256,6 @@
+   HKZ_VERBOSE = 1
+ };
+ 
+-#ifndef FPLLL_DEFAULT_STRATEGY_PATH
+-#define FPLLL_DEFAULT_STRATEGY_PATH ""
+-#endif
+-
+-#ifndef FPLLL_DEFAULT_STRATEGY
+-#define FPLLL_DEFAULT_STRATEGY ""
+-#endif
+-
+ enum PrunerMethod
+ {
+   PRUNER_METHOD_GREEDY   = 0,
+--- a/fplll/fplll_config.h.in
++++ b/fplll/fplll_config.h.in
+@@ -22,6 +22,10 @@
+ /* fplll version info */
+ #define FPLLL_VERSION_INFO @FPLLL_VERSION_INFO@
+ 
++/* fplll default strategy */
++#define FPLLL_DEFAULT_STRATEGY_PATH @FPLLL_DEFAULT_STRATEGY_PATH@
++#define FPLLL_DEFAULT_STRATEGY @FPLLL_DEFAULT_STRATEGY@
++
+ /* Maximum supported enumeration dimension */
+ #define FPLLL_MAX_ENUM_DIMENSION @FPLLL_MAX_ENUM_DIMENSION@
+ 
+--- a/fplll/Makefile.am
++++ b/fplll/Makefile.am
+@@ -2,7 +2,7 @@
+ TOPSRCDIR = $(srcdir)/..
+ strategydir = $(pkgdatadir)/strategies
+ # see https://stackoverflow.com/questions/5867136/autoconf-how-to-get-installation-paths-into-config-h
+-AM_CPPFLAGS = -DFPLLL_DEFAULT_STRATEGY_PATH=\"$(strategydir)\" -DFPLLL_DEFAULT_STRATEGY=\"$(strategydir)/default.json\" -I$(TOPSRCDIR)
++AM_CPPFLAGS = -I$(TOPSRCDIR)
+ EXTRA_DIST = io/json.hpp ballvol.const factorial.const
+ 
+ nobase_include_fplll_HEADERS=defs.h fplll.h \

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