[ppl] 60/68: Imported Debian patch 1:1.1-2
Andreas Tille
tille at debian.org
Sat Nov 12 08:42:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository ppl.
commit 4c8341dd5bf24f5c8bbb1c449de88226e26d4c88
Author: Matthias Klose <doko at debian.org>
Date: Fri Mar 21 16:37:04 2014 +0100
Imported Debian patch 1:1.1-2
---
debian/changelog | 13 +-
debian/control | 5 +-
debian/patches/gcc-4.9.diff | 305 --------------------------------------
debian/patches/link-tests.diff | 171 ---------------------
debian/patches/local_changes.diff | 48 ------
debian/patches/series | 4 +-
debian/rules | 37 ++---
7 files changed, 25 insertions(+), 558 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7b26bb0..fa9bc95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
+ppl (1:1.1-2) unstable; urgency=medium
+
+ * Work around GCC PR target/60609 to avoid the build failure
+ of the SWI Prolog bindings on armhf.
+
+ -- Matthias Klose <doko at debian.org> Fri, 21 Mar 2014 16:37:04 +0100
+
ppl (1:1.1-1) unstable; urgency=medium
- * New upstream version.
- * Build using dh-autoreconf.
- * Fix build failures with GCC 4.9.
+ * PPL 1.1 release.
- -- Matthias Klose <doko at debian.org> Wed, 19 Mar 2014 15:27:52 +0100
+ -- Matthias Klose <doko at debian..org> Mon, 23 Dec 2013 21:46:33 +0100
ppl (1:1.1~pre8-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index d1a17d9..f768759 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,8 @@ Priority: optional
Maintainer: Debian GCC Maintainers <debian-gcc at lists.debian.org>
Uploaders: Michael Tautschnig <mt at debian.org>, Arthur Loiret <aloiret at debian.org>, Matthias Klose <doko at debian.org>
Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 6.0.7~), libmpc-dev, libgmp-dev, autoconf, libtool, dh-autoreconf,
- swi-prolog [!hurd-i386],
- chrpath, libncurses5-dev, libncursesw5-dev
+Build-Depends: debhelper (>= 6.0.7~), libgmp-dev, autoconf, libtool, autotools-dev, swi-prolog [!hurd-i386], chrpath,
+ libncurses5-dev, libncursesw5-dev
Build-Depends-Indep: doxygen-latex, graphviz, poppler-utils, ghostscript, texlive-math-extra
Homepage: http://www.cs.unipr.it/ppl/
diff --git a/debian/patches/gcc-4.9.diff b/debian/patches/gcc-4.9.diff
deleted file mode 100644
index 3ed4cca..0000000
--- a/debian/patches/gcc-4.9.diff
+++ /dev/null
@@ -1,305 +0,0 @@
-Index: b/src/CO_Tree_inlines.hh
-===================================================================
---- a/src/CO_Tree_inlines.hh
-+++ b/src/CO_Tree_inlines.hh
-@@ -31,7 +31,7 @@
- PPL_ASSERT(itr.current_index != 0);
- PPL_ASSERT(itr.current_index >= indexes + 1);
- PPL_ASSERT(itr.current_index <= indexes + reserved_size);
-- const ptrdiff_t index = itr.current_index - indexes;
-+ const std::ptrdiff_t index = itr.current_index - indexes;
- return static_cast<dimension_type>(index);
- }
-
-@@ -40,7 +40,7 @@
- PPL_ASSERT(itr.current_index != 0);
- PPL_ASSERT(itr.current_index >= indexes + 1);
- PPL_ASSERT(itr.current_index <= indexes + reserved_size);
-- const ptrdiff_t index = itr.current_index - indexes;
-+ const std::ptrdiff_t index = itr.current_index - indexes;
- return static_cast<dimension_type>(index);
- }
-
-@@ -772,7 +772,7 @@
- p -= (offset - 1);
- while (*p == unused_index)
- ++p;
-- const ptrdiff_t distance = p - tree.indexes;
-+ const std::ptrdiff_t distance = p - tree.indexes;
- PPL_ASSERT(distance >= 0);
- i = static_cast<dimension_type>(distance);
- offset = least_significant_one_mask(i);
-@@ -787,7 +787,7 @@
- p += (offset - 1);
- while (*p == unused_index)
- --p;
-- const ptrdiff_t distance = p - tree.indexes;
-+ const std::ptrdiff_t distance = p - tree.indexes;
- PPL_ASSERT(distance >= 0);
- i = static_cast<dimension_type>(distance);
- offset = least_significant_one_mask(i);
-Index: b/src/CO_Tree.cc
-===================================================================
---- a/src/CO_Tree.cc
-+++ b/src/CO_Tree.cc
-@@ -954,7 +954,7 @@
- --subtree_size;
- }
-
-- const ptrdiff_t distance = first_unused_index - indexes;
-+ const std::ptrdiff_t distance = first_unused_index - indexes;
- PPL_ASSERT(distance >= 0);
- return static_cast<dimension_type>(distance);
- }
-Index: b/src/CO_Tree_defs.hh
-===================================================================
---- a/src/CO_Tree_defs.hh
-+++ b/src/CO_Tree_defs.hh
-@@ -159,7 +159,7 @@
-
- typedef std::bidirectional_iterator_tag iterator_category;
- typedef const data_type value_type;
-- typedef ptrdiff_t difference_type;
-+ typedef std::ptrdiff_t difference_type;
- typedef value_type* pointer;
- typedef data_type_const_reference reference;
-
-@@ -314,7 +314,7 @@
-
- typedef std::bidirectional_iterator_tag iterator_category;
- typedef data_type value_type;
-- typedef ptrdiff_t difference_type;
-+ typedef std::ptrdiff_t difference_type;
- typedef value_type* pointer;
- typedef value_type& reference;
-
-Index: b/src/Constraint_System_defs.hh
-===================================================================
---- a/src/Constraint_System_defs.hh
-+++ b/src/Constraint_System_defs.hh
-@@ -609,7 +609,7 @@
- class Parma_Polyhedra_Library::Constraint_System_const_iterator
- : public std::iterator<std::forward_iterator_tag,
- Constraint,
-- ptrdiff_t,
-+ std::ptrdiff_t,
- const Constraint*,
- const Constraint&> {
- public:
-Index: b/src/Dense_Row_defs.hh
-===================================================================
---- a/src/Dense_Row_defs.hh
-+++ b/src/Dense_Row_defs.hh
-@@ -433,7 +433,7 @@
-
- typedef std::bidirectional_iterator_tag iterator_category;
- typedef Coefficient value_type;
-- typedef ptrdiff_t difference_type;
-+ typedef std::ptrdiff_t difference_type;
- typedef value_type* pointer;
- typedef value_type& reference;
-
-@@ -474,7 +474,7 @@
- public:
-
- typedef const Coefficient value_type;
-- typedef ptrdiff_t difference_type;
-+ typedef std::ptrdiff_t difference_type;
- typedef value_type* pointer;
- typedef Coefficient_traits::const_reference reference;
-
-Index: b/src/Generator_System_defs.hh
-===================================================================
---- a/src/Generator_System_defs.hh
-+++ b/src/Generator_System_defs.hh
-@@ -679,7 +679,7 @@
- class Parma_Polyhedra_Library::Generator_System_const_iterator
- : public std::iterator<std::forward_iterator_tag,
- Generator,
-- ptrdiff_t,
-+ std::ptrdiff_t,
- const Generator*,
- const Generator&> {
- public:
-Index: b/src/Grid_Generator_System_defs.hh
-===================================================================
---- a/src/Grid_Generator_System_defs.hh
-+++ b/src/Grid_Generator_System_defs.hh
-@@ -277,7 +277,7 @@
- class const_iterator
- : public std::iterator<std::forward_iterator_tag,
- Grid_Generator,
-- ptrdiff_t,
-+ std::ptrdiff_t,
- const Grid_Generator*,
- const Grid_Generator&> {
- public:
-Index: b/src/Linear_Expression_Interface_defs.hh
-===================================================================
---- a/src/Linear_Expression_Interface_defs.hh
-+++ b/src/Linear_Expression_Interface_defs.hh
-@@ -65,7 +65,7 @@
- public:
- typedef std::bidirectional_iterator_tag iterator_category;
- typedef const Coefficient value_type;
-- typedef ptrdiff_t difference_type;
-+ typedef std::ptrdiff_t difference_type;
- typedef value_type* pointer;
- typedef Coefficient_traits::const_reference reference;
-
-Index: b/src/Linear_Expression_defs.hh
-===================================================================
---- a/src/Linear_Expression_defs.hh
-+++ b/src/Linear_Expression_defs.hh
-@@ -381,7 +381,7 @@
- public:
- typedef std::bidirectional_iterator_tag iterator_category;
- typedef const Coefficient value_type;
-- typedef ptrdiff_t difference_type;
-+ typedef std::ptrdiff_t difference_type;
- typedef value_type* pointer;
- typedef Coefficient_traits::const_reference reference;
-
-Index: b/src/ppl.hh.dist
-===================================================================
---- a/src/ppl.hh.dist
-+++ b/src/ppl.hh.dist
-@@ -20190,7 +20190,7 @@
-
- typedef std::bidirectional_iterator_tag iterator_category;
- typedef Coefficient value_type;
-- typedef ptrdiff_t difference_type;
-+ typedef std::ptrdiff_t difference_type;
- typedef value_type* pointer;
- typedef value_type& reference;
-
-@@ -20231,7 +20231,7 @@
- public:
-
- typedef const Coefficient value_type;
-- typedef ptrdiff_t difference_type;
-+ typedef std::ptrdiff_t difference_type;
- typedef value_type* pointer;
- typedef Coefficient_traits::const_reference reference;
-
-@@ -21013,7 +21013,7 @@
-
- typedef std::bidirectional_iterator_tag iterator_category;
- typedef const data_type value_type;
-- typedef ptrdiff_t difference_type;
-+ typedef std::ptrdiff_t difference_type;
- typedef value_type* pointer;
- typedef data_type_const_reference reference;
-
-@@ -21168,7 +21168,7 @@
-
- typedef std::bidirectional_iterator_tag iterator_category;
- typedef data_type value_type;
-- typedef ptrdiff_t difference_type;
-+ typedef std::ptrdiff_t difference_type;
- typedef value_type* pointer;
- typedef value_type& reference;
-
-@@ -22419,7 +22419,7 @@
- PPL_ASSERT(itr.current_index != 0);
- PPL_ASSERT(itr.current_index >= indexes + 1);
- PPL_ASSERT(itr.current_index <= indexes + reserved_size);
-- const ptrdiff_t index = itr.current_index - indexes;
-+ const std::ptrdiff_t index = itr.current_index - indexes;
- return static_cast<dimension_type>(index);
- }
-
-@@ -22428,7 +22428,7 @@
- PPL_ASSERT(itr.current_index != 0);
- PPL_ASSERT(itr.current_index >= indexes + 1);
- PPL_ASSERT(itr.current_index <= indexes + reserved_size);
-- const ptrdiff_t index = itr.current_index - indexes;
-+ const std::ptrdiff_t index = itr.current_index - indexes;
- return static_cast<dimension_type>(index);
- }
-
-@@ -23160,7 +23160,7 @@
- p -= (offset - 1);
- while (*p == unused_index)
- ++p;
-- const ptrdiff_t distance = p - tree.indexes;
-+ const std::ptrdiff_t distance = p - tree.indexes;
- PPL_ASSERT(distance >= 0);
- i = static_cast<dimension_type>(distance);
- offset = least_significant_one_mask(i);
-@@ -23175,7 +23175,7 @@
- p += (offset - 1);
- while (*p == unused_index)
- --p;
-- const ptrdiff_t distance = p - tree.indexes;
-+ const std::ptrdiff_t distance = p - tree.indexes;
- PPL_ASSERT(distance >= 0);
- i = static_cast<dimension_type>(distance);
- offset = least_significant_one_mask(i);
-@@ -24811,7 +24811,7 @@
- public:
- typedef std::bidirectional_iterator_tag iterator_category;
- typedef const Coefficient value_type;
-- typedef ptrdiff_t difference_type;
-+ typedef std::ptrdiff_t difference_type;
- typedef value_type* pointer;
- typedef Coefficient_traits::const_reference reference;
-
-@@ -27513,7 +27513,7 @@
- public:
- typedef std::bidirectional_iterator_tag iterator_category;
- typedef const Coefficient value_type;
-- typedef ptrdiff_t difference_type;
-+ typedef std::ptrdiff_t difference_type;
- typedef value_type* pointer;
- typedef Coefficient_traits::const_reference reference;
-
-@@ -42687,7 +42687,7 @@
- class Parma_Polyhedra_Library::Constraint_System_const_iterator
- : public std::iterator<std::forward_iterator_tag,
- Constraint,
-- ptrdiff_t,
-+ std::ptrdiff_t,
- const Constraint*,
- const Constraint&> {
- public:
-@@ -43402,7 +43402,7 @@
- class const_iterator
- : public std::iterator<std::forward_iterator_tag,
- Congruence,
-- ptrdiff_t,
-+ std::ptrdiff_t,
- const Congruence*,
- const Congruence&> {
- public:
-@@ -45485,7 +45485,7 @@
- class Parma_Polyhedra_Library::Generator_System_const_iterator
- : public std::iterator<std::forward_iterator_tag,
- Generator,
-- ptrdiff_t,
-+ std::ptrdiff_t,
- const Generator*,
- const Generator&> {
- public:
-@@ -54708,7 +54708,7 @@
- class const_iterator
- : public std::iterator<std::forward_iterator_tag,
- Grid_Generator,
-- ptrdiff_t,
-+ std::ptrdiff_t,
- const Grid_Generator*,
- const Grid_Generator&> {
- public:
-Index: b/src/Congruence_System_defs.hh
-===================================================================
---- a/src/Congruence_System_defs.hh
-+++ b/src/Congruence_System_defs.hh
-@@ -249,7 +249,7 @@ public:
- class const_iterator
- : public std::iterator<std::forward_iterator_tag,
- Congruence,
-- ptrdiff_t,
-+ std::ptrdiff_t,
- const Congruence*,
- const Congruence&> {
- public:
diff --git a/debian/patches/link-tests.diff b/debian/patches/link-tests.diff
deleted file mode 100644
index a02ef9e..0000000
--- a/debian/patches/link-tests.diff
+++ /dev/null
@@ -1,171 +0,0 @@
-Index: b/tests/Makefile.am
-===================================================================
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -48,6 +48,7 @@
- LDADD = \
- $(top_builddir)/src/libppl.la \
- libppl_tests.a \
-+-lmpc \
- @extra_libraries@
-
- noinst_HEADERS = \
-Index: b/tests/BD_Shape/Makefile.am
-===================================================================
---- a/tests/BD_Shape/Makefile.am
-+++ b/tests/BD_Shape/Makefile.am
-@@ -50,7 +50,7 @@
-
- LDADD = \
- $(top_builddir)/utils/libppl_utils.a \
--$(top_builddir)/tests/libppl_tests.a \
-+$(top_builddir)/tests/libppl_tests.a -lmpc \
- $(top_builddir)/src/libppl.la \
- @extra_libraries@
-
-Index: b/tests/Box/Makefile.am
-===================================================================
---- a/tests/Box/Makefile.am
-+++ b/tests/Box/Makefile.am
-@@ -50,7 +50,7 @@
-
- LDADD = \
- $(top_builddir)/utils/libppl_utils.a \
--$(top_builddir)/tests/libppl_tests.a \
-+$(top_builddir)/tests/libppl_tests.a -lmpc \
- $(top_builddir)/src/libppl.la \
- @extra_libraries@
-
-Index: b/tests/CO_Tree/Makefile.am
-===================================================================
---- a/tests/CO_Tree/Makefile.am
-+++ b/tests/CO_Tree/Makefile.am
-@@ -47,7 +47,7 @@
-
- LDADD = \
- $(top_builddir)/utils/libppl_utils.a \
--$(top_builddir)/tests/libppl_tests.a \
-+$(top_builddir)/tests/libppl_tests.a -lmpc \
- $(top_builddir)/src/libppl.la \
- @extra_libraries@
-
-Index: b/tests/Concrete_Expression/Makefile.am
-===================================================================
---- a/tests/Concrete_Expression/Makefile.am
-+++ b/tests/Concrete_Expression/Makefile.am
-@@ -50,7 +50,7 @@
-
- LDADD = \
- $(top_builddir)/utils/libppl_utils.a \
--$(top_builddir)/tests/libppl_tests.a \
-+$(top_builddir)/tests/libppl_tests.a -lmpc \
- $(top_builddir)/src/libppl.la \
- @extra_libraries@
-
-Index: b/tests/Grid/Makefile.am
-===================================================================
---- a/tests/Grid/Makefile.am
-+++ b/tests/Grid/Makefile.am
-@@ -46,7 +46,7 @@
-
- LDADD = \
- $(top_builddir)/utils/libppl_utils.a \
--$(top_builddir)/tests/libppl_tests.a \
-+$(top_builddir)/tests/libppl_tests.a -lmpc \
- $(top_builddir)/src/libppl.la \
- @extra_libraries@
-
-Index: b/tests/MIP_Problem/Makefile.am
-===================================================================
---- a/tests/MIP_Problem/Makefile.am
-+++ b/tests/MIP_Problem/Makefile.am
-@@ -47,7 +47,7 @@
-
- LDADD = \
- $(top_builddir)/utils/libppl_utils.a \
--$(top_builddir)/tests/libppl_tests.a \
-+$(top_builddir)/tests/libppl_tests.a -lmpc \
- $(top_builddir)/src/libppl.la \
- @extra_libraries@
-
-Index: b/tests/Octagonal_Shape/Makefile.am
-===================================================================
---- a/tests/Octagonal_Shape/Makefile.am
-+++ b/tests/Octagonal_Shape/Makefile.am
-@@ -50,7 +50,7 @@
-
- LDADD = \
- $(top_builddir)/utils/libppl_utils.a \
--$(top_builddir)/tests/libppl_tests.a \
-+$(top_builddir)/tests/libppl_tests.a -lmpc \
- $(top_builddir)/src/libppl.la \
- @extra_libraries@
-
-Index: b/tests/PIP_Problem/Makefile.am
-===================================================================
---- a/tests/PIP_Problem/Makefile.am
-+++ b/tests/PIP_Problem/Makefile.am
-@@ -47,7 +47,7 @@
-
- LDADD = \
- $(top_builddir)/utils/libppl_utils.a \
--$(top_builddir)/tests/libppl_tests.a \
-+$(top_builddir)/tests/libppl_tests.a -lmpc \
- $(top_builddir)/src/libppl.la \
- @extra_libraries@
-
-Index: b/tests/Partially_Reduced_Product/Makefile.am
-===================================================================
---- a/tests/Partially_Reduced_Product/Makefile.am
-+++ b/tests/Partially_Reduced_Product/Makefile.am
-@@ -50,7 +50,7 @@
-
- LDADD = \
- $(top_builddir)/utils/libppl_utils.a \
--$(top_builddir)/tests/libppl_tests.a \
-+$(top_builddir)/tests/libppl_tests.a -lmpc \
- $(top_builddir)/src/libppl.la \
- @extra_libraries@
-
-Index: b/tests/Polyhedron/Makefile.am
-===================================================================
---- a/tests/Polyhedron/Makefile.am
-+++ b/tests/Polyhedron/Makefile.am
-@@ -47,7 +47,7 @@
-
- LDADD = \
- $(top_builddir)/utils/libppl_utils.a \
--$(top_builddir)/tests/libppl_tests.a \
-+$(top_builddir)/tests/libppl_tests.a -lmpc \
- $(top_builddir)/src/libppl.la \
- @extra_libraries@
-
-Index: b/tests/Powerset/Makefile.am
-===================================================================
---- a/tests/Powerset/Makefile.am
-+++ b/tests/Powerset/Makefile.am
-@@ -46,7 +46,7 @@
-
- LDADD = \
- $(top_builddir)/utils/libppl_utils.a \
--$(top_builddir)/tests/libppl_tests.a \
-+$(top_builddir)/tests/libppl_tests.a -lmpc \
- $(top_builddir)/src/libppl.la \
- @extra_libraries@
-
-Index: b/tests/Watchdog/Makefile.am
-===================================================================
---- a/tests/Watchdog/Makefile.am
-+++ b/tests/Watchdog/Makefile.am
-@@ -45,8 +45,9 @@
- @debug_flag@
-
- LDADD = \
--$(top_builddir)/tests/libppl_tests.a \
--$(top_builddir)/src/libppl.la
-+$(top_builddir)/tests/libppl_tests.a -lmpc \
-+$(top_builddir)/src/libppl.la \
-+ at extra_libraries@
-
- EXTRA_DIST =
-
diff --git a/debian/patches/local_changes.diff b/debian/patches/local_changes.diff
deleted file mode 100644
index 3f8202f..0000000
--- a/debian/patches/local_changes.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: b/doc/user-language-interface.tex
-===================================================================
---- a/doc/user-language-interface.tex
-+++ b/doc/user-language-interface.tex
-@@ -59,6 +59,7 @@
- \usepackage{pspicture}
- \fi
- \usepackage[utf8]{inputenc}
-+\usepackage[table]{xcolor}
- \usepackage{doxygen}
- <PPL_SED_USEPACKAGE_OCAMLDOC>
- \usepackage{ppl}
-Index: b/doc/devref.tex
-===================================================================
---- a/doc/devref.tex
-+++ b/doc/devref.tex
-@@ -59,6 +59,7 @@
- \usepackage{pspicture}
- \fi
- \usepackage[utf8]{inputenc}
-+\usepackage[table]{xcolor}
- \usepackage{doxygen}
- \usepackage{ppl}
- \makeindex
-Index: b/doc/user.tex
-===================================================================
---- a/doc/user.tex
-+++ b/doc/user.tex
-@@ -59,6 +59,7 @@
- \usepackage{pspicture}
- \fi
- \usepackage[utf8]{inputenc}
-+\usepackage[table]{xcolor}
- \usepackage{doxygen}
- \usepackage{ppl}
- \makeindex
-Index: b/doc/devref-language-interface.tex
-===================================================================
---- a/doc/devref-language-interface.tex
-+++ b/doc/devref-language-interface.tex
-@@ -59,6 +59,7 @@
- \usepackage{pspicture}
- \fi
- \usepackage[utf8]{inputenc}
-+\usepackage[table]{xcolor}
- \usepackage{doxygen}
- <PPL_SED_USEPACKAGE_OCAMLDOC>
- \usepackage{ppl}
diff --git a/debian/patches/series b/debian/patches/series
index 3dc0090..1bb8bf6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-local_changes.diff
-gcc-4.9.diff
-link-tests.diff
+# empty
diff --git a/debian/rules b/debian/rules
index ebb1201..16e121b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,39 +20,27 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS := $(shell dpkg-buildflags --get CFLAGS) -Wall -g
-CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) -Wall -g
-LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS = $(shell dpkg-buildflags --get CPPFLAGS; dpkg-buildflags --get CFLAGS) -Wall -g
+CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) -Wall -g
+LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
-# not yet ready for this new default warning ...
-CXXFLAGS += -Wno-unused-local-typedefs
+ifeq ($(DEB_HOST_MULTIARCH),arm-linux-gnueabihf)
+ CFLAGS += -marm
+ CXXFLAGS += -marm
+endif
# FOR AUTOCONF 2.52 AND NEWER ONLY
confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
confflags += --disable-ppl_lpsol --disable-ppl_lcdd
-derivative := $(shell if dpkg-vendor --derives-from Ubuntu; then echo Ubuntu; else echo Debian; fi)
-
# Disable the SWI-Prolog interface during architecture bootstrap, and
# on some architectures
ifneq (,$(filter stage1,$(DEB_STAGE))$(filter $(DEB_HOST_ARCH),arm64 hurd-i386))
- with_swi_prolog :=
-else
- with_swi_prolog := yes
-endif
-
-# in Ubuntu, it's in universe
-ifeq ($(derivative),Ubuntu)
- with_swi_prolog :=
-endif
-
-ifeq ($(with_swi_prolog),yes)
- confflags += --enable-interfaces=c,cxx,swi_prolog
-else
confflags += --enable-interfaces=c,cxx
DH_OPTIONS += -Nlibppl-swi
export DH_OPTIONS
+else
+ confflags += --enable-interfaces=c,cxx,swi_prolog
endif
ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
@@ -85,13 +73,13 @@ endif
configure: configure-stamp
configure-stamp:
dh_testdir
- dh_autoreconf
+ cp -f /usr/share/misc/config.sub config.sub
+ cp -f /usr/share/misc/config.guess config.guess
./configure $(confflags) \
--prefix=/usr \
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
- CPPFLAGS="$(CPPFLAGS)" \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)" \
LDFLAGS="$(LDFLAGS)"
@@ -129,7 +117,8 @@ clean:
rm -f configure-stamp build-stamp
rm -f build-arch-stamp build-indep-stamp
[ ! -e Makefile ] || $(MAKE) distclean
- dh_autoreconf_clean
+ rm -f config.sub
+ rm -f config.guess
dh_clean
install: install-indep install-arch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ppl.git
More information about the debian-science-commits
mailing list