[SCM] Debian packaging for libntl - Number Theory Library branch, master, updated. 725690a74333b49e1096467192cc414183237986
Bernhard R. Link
brlink at debian.org
Fri Feb 3 21:15:30 UTC 2012
The following commit has been merged in the master branch:
commit 46158a632f43edb2de2a2a0d3316f830b6801fa3
Author: Bernhard R. Link <brlink at debian.org>
Date: Fri Feb 3 16:39:21 2012 +0100
drop Multi-Arch support for now as header file needs more work first
diff --git a/debian/control b/debian/control
index bd1c33c..7002794 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Vcs-Git: git://git.debian.org/git/debian-science/packages/libntl.git
Package: libntl0
Architecture: any
-Multi-arch: same
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/libntl0-dev.install b/debian/libntl0-dev.install
index 5276a14..f9a23d5 100644
--- a/debian/libntl0-dev.install
+++ b/debian/libntl0-dev.install
@@ -1,3 +1,3 @@
usr/include/NTL/*.h
-usr/lib/*/*.so
-usr/lib/*/*.a
+usr/lib/*.so
+usr/lib/*.a
diff --git a/debian/libntl0.install b/debian/libntl0.install
index 3de3b10..093956b 100644
--- a/debian/libntl0.install
+++ b/debian/libntl0.install
@@ -1 +1 @@
-usr/lib/*/*.so.*
+usr/lib/*.so.*
diff --git a/debian/patches/0002-mach_desc.patch b/debian/patches/0002-mach_desc.patch
deleted file mode 100644
index 635b195..0000000
--- a/debian/patches/0002-mach_desc.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- /dev/null
-+++ b/include/NTL/mach_desc_posix.h
-@@ -0,0 +1,84 @@
-+#ifndef NTL_mach_desc_posix__H
-+#define NTL_mach_desc_posix__H
-+
-+/* static variant of mach_desc.h */
-+
-+#include <limits.h>
-+#include <stdint.h>
-+
-+#define NTL_MAX_LONG LONG_MAX
-+#define NTL_MAX_INT INT_MAX
-+#define NTL_MIN_LONG LONG_MIN
-+#define NTL_MIN_INT INT_MIN
-+
-+/* guaranteed by posix, but be careful */
-+#if INT_MAX == 2147483647
-+# define NTL_BITS_PER_INT (32)
-+#else
-+# error Unexpected size of int.
-+#endif
-+
-+#if LONG_MAX == (2147483647)
-+# define NTL_BITS_PER_LONG (32)
-+#else
-+# if LONG_MAX == (9223372036854775807L)
-+# define NTL_BITS_PER_LONG (64)
-+# else
-+# error Could not determine size of long
-+# endif
-+#endif
-+
-+#ifdef SIZE_MAX
-+// /usr/include/stdint.h
-+# if SIZE_MAX == (4294967295U)
-+# define NTL_BITS_PER_SIZE_T (32)
-+# else
-+# if SIZE_MAX == (18446744073709551615UL)
-+# define NTL_BITS_PER_SIZE_T (64)
-+# else
-+# error Could not determine size of size_t
-+# endif
-+# endif
-+#else
-+# warning "possibly adventurous definition of NTL_BITS_PER_SIZE_T"
-+# define NTL_BITS_PER_SIZE_T NTL_BITS_PER_LONG
-+#endif
-+
-+/* this is IEEE standard */
-+#define NTL_DOUBLE_PRECISION (53)
-+
-+#if NTL_BITS_PER_LONG == 32
-+#define NTL_NBITS_MAX (30)
-+#define NTL_FDOUBLE_PRECISION (((double)(1L<<30))*((double)(1L<<22)))
-+#else
-+#define NTL_NBITS_MAX (50)
-+#define NTL_FDOUBLE_PRECISION (((double)(1L<<52)))
-+#endif
-+#define NTL_QUAD_FLOAT_SPLIT ((((double)(1L<<27)))+1.0)
-+
-+#ifdef __GNUC__
-+#define NTL_ARITH_RIGHT_SHIFT (1)
-+// http://gcc.gnu.org/ml/gcc/2000-04/msg00152.html
-+// "For right shifts, if the type is signed, then we use an arithmetic shift; if
-+// the type is unsigned then we use a logical."
-+#else
-+#define NTL_ARITH_RIGHT_SHIFT (1)
-+// this looks quite waterproof, but any test of this sort is imcomplete, so why bother?
-+//#define COMPILE_TIME_ASSERT(EXP) \
-+// typedef int CompileTimeAssertType##__LINE__[(EXP) ? 1 : -1]
-+//#define RIGHT_SHIFT_IS_ARITHMETIC ( (((long)-1)>>1) == ((long)-1) )
-+//COMPILE_TIME_ASSERT( RIGHT_SHIFT_IS_ARITHMETIC );
-+# warning "unknown compiler -- please check manually."
-+#endif
-+
-+#if (defined(__GNUC__) && (defined(__i386__) || defined(__i486__) || defined(__i586__)))
-+#define NTL_EXT_DOUBLE (1)
-+#else
-+#define NTL_EXT_DOUBLE (0)
-+#endif
-+
-+/* MakeDesc.c says those two are "fairly obsolete" and safe to set 0: */
-+#define NTL_SINGLE_MUL_OK (0)
-+#define NTL_DOUBLES_LOW_HIGH (0)
-+
-+#endif
---- a/src/MakeDesc.c
-+++ b/src/MakeDesc.c
-@@ -1071,6 +1071,8 @@
-
- fprintf(f, "#ifndef NTL_mach_desc__H\n");
- fprintf(f, "#define NTL_mach_desc__H\n\n\n");
-+ fprintf(f, "#include \"mach_desc_posix.h\"\n");
-+ fprintf(f, "#if 0\n");
- fprintf(f, "#define NTL_BITS_PER_LONG (%ld)\n", bpl);
- fprintf(f, "#define NTL_MAX_LONG (%ldL)\n", ((long) ((1UL<<(bpl-1))-1UL)));
- fprintf(f, "#define NTL_MAX_INT (%ld)\n", ((long) ((1UL<<(bpi-1))-1UL)));
-@@ -1088,12 +1090,13 @@
- fprintf(f, "#define NTL_EXT_DOUBLE (%d)\n", ((dp1 > dp) || dr));
- fprintf(f, "#define NTL_SINGLE_MUL_OK (%d)\n", single_mul_ok != 0);
- fprintf(f, "#define NTL_DOUBLES_LOW_HIGH (%d)\n\n\n", single_mul_ok < 0);
-+ fprintf(f, "#endif\n");
- print_BB_mul_code(f, bpl);
- print_BB_sqr_code(f, bpl);
- print_BB_rev_code(f, bpl);
-
-- fprintf(f, "#define NTL_MIN_LONG (-NTL_MAX_LONG - 1L)\n");
-- fprintf(f, "#define NTL_MIN_INT (-NTL_MAX_INT - 1)\n");
-+ fprintf(f, "// #define NTL_MIN_LONG (-NTL_MAX_LONG - 1L)\n");
-+ fprintf(f, "// #define NTL_MIN_INT (-NTL_MAX_INT - 1)\n");
-
- fprintf(f, "#endif\n\n");
-
diff --git a/debian/patches/series b/debian/patches/series
index fb0bcfa..b99e247 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
0001-gcc-4.5-mips.patch
-0002-mach_desc.patch
# this patch is for sage.
sage_error_callback.patch
diff --git a/debian/rules b/debian/rules
index 4c1c429..0516057 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,6 @@ CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -27,7 +26,7 @@ include/NTL/con%ig.h src/src/m%ileout src/make%ile src/c%ileout: src/configure s
WIZARD=off SHARED=on \
CFLAGS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' \
CPPFLAGS='$(CPPFLAGS)' LDFLAGS='' \
- DEF_PREFIX='/usr' LIBDIR='$$(PREFIX)/lib/$(DEB_HOST_MULTIARCH)' \
+ DEF_PREFIX='/usr' \
NTL_GMP_LIP=on NTL_STD_CXX=on SHARED=on \
NTL_GF2X_LIB=off
--
Debian packaging for libntl - Number Theory Library
More information about the debian-science-commits
mailing list