Accepting request 131317 from home:Dmitry_R:branches:science
- Update to version 0.94g
* fixed memory leaks in cddlib.c and cddlp.c
* integrated patches for making the library
shared and more compatible for C++ compilers
OBS-URL: https://build.opensuse.org/request/show/131317
OBS-URL: https://build.opensuse.org/package/show/science/cddlib?expand=0&rev=4
This commit is contained in:
Git OBS Bridge
parent
0d1c671f7c
commit
32627b7d99
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:02dd983fab97d98f56e22d6dc46beee4973f82afb05612f0fe909a56049e4a9f
|
|
||||||
size 1221857
|
|
||||||
3
cddlib-094g.tar.gz
Normal file
3
cddlib-094g.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:af1b81226514abf731800e2e104def8a7274817d7e645693f8b99fc2b1432155
|
||||||
|
size 1383388
|
||||||
@ -1,72 +0,0 @@
|
|||||||
From: Jan Engelhardt <jengelh@medozas.de>
|
|
||||||
Date: 2011-09-26 14:49:00.979547210 +0200
|
|
||||||
Upstream: dead
|
|
||||||
|
|
||||||
Replace old variable names by new ones.
|
|
||||||
|
|
||||||
---
|
|
||||||
configure.in | 7 ++++---
|
|
||||||
lib-src-gmp/Makefile.am | 2 +-
|
|
||||||
src-gmp/Makefile.am | 6 +++---
|
|
||||||
src/Makefile.am | 4 ++--
|
|
||||||
4 files changed, 10 insertions(+), 9 deletions(-)
|
|
||||||
|
|
||||||
Index: cddlib-094f/configure.in
|
|
||||||
===================================================================
|
|
||||||
--- cddlib-094f.orig/configure.in
|
|
||||||
+++ cddlib-094f/configure.in
|
|
||||||
@@ -1,8 +1,8 @@
|
|
||||||
dnl Process this file with autoconf to produce a configure script.
|
|
||||||
-AC_INIT()
|
|
||||||
+AC_INIT([cddlib], [0.94])
|
|
||||||
|
|
||||||
dnl Init automake.
|
|
||||||
-AM_INIT_AUTOMAKE(cddlib, 0.94)
|
|
||||||
+AM_INIT_AUTOMAKE([-Wall foreign])
|
|
||||||
|
|
||||||
dnl Checks for programs.
|
|
||||||
AC_PROG_CC
|
|
||||||
@@ -26,4 +26,5 @@ AC_C_CONST
|
|
||||||
|
|
||||||
dnl Checks for library functions.
|
|
||||||
|
|
||||||
-AC_OUTPUT(lib-src/Makefile src/Makefile lib-src-gmp/Makefile src-gmp/Makefile Makefile)
|
|
||||||
+AC_CONFIG_FILES([lib-src/Makefile src/Makefile lib-src-gmp/Makefile src-gmp/Makefile Makefile])
|
|
||||||
+AC_OUTPUT
|
|
||||||
Index: cddlib-094f/lib-src-gmp/Makefile.am
|
|
||||||
===================================================================
|
|
||||||
--- cddlib-094f.orig/lib-src-gmp/Makefile.am
|
|
||||||
+++ cddlib-094f/lib-src-gmp/Makefile.am
|
|
||||||
@@ -25,5 +25,5 @@ cddtypes_f.h \
|
|
||||||
setoper.h
|
|
||||||
|
|
||||||
AM_CPPFLAGS = -DGMPRATIONAL
|
|
||||||
-INCLUDES = -I$(gmpincludedir)
|
|
||||||
+AM_CPPFLAGS += -I$(gmpincludedir)
|
|
||||||
|
|
||||||
Index: cddlib-094f/src-gmp/Makefile.am
|
|
||||||
===================================================================
|
|
||||||
--- cddlib-094f.orig/src-gmp/Makefile.am
|
|
||||||
+++ cddlib-094f/src-gmp/Makefile.am
|
|
||||||
@@ -31,6 +31,6 @@ testlp3_gmp_SOURCES = tes
|
|
||||||
|
|
||||||
LDADD = ../lib-src-gmp/libcddgmp.la
|
|
||||||
AM_LDFLAGS = -L$(gmplibdir)
|
|
||||||
-INCLUDES = -I../lib-src-gmp
|
|
||||||
-INCLUDES += -I$(gmpincludedir)
|
|
||||||
-AM_CPPFLAGS = -DGMPRATIONAL
|
|
||||||
+AM_CPPFLAGS = -I../lib-src-gmp
|
|
||||||
+AM_CPPFLAGS += -I$(gmpincludedir)
|
|
||||||
+AM_CPPFLAGS += -DGMPRATIONAL
|
|
||||||
Index: cddlib-094f/src/Makefile.am
|
|
||||||
===================================================================
|
|
||||||
--- cddlib-094f.orig/src/Makefile.am
|
|
||||||
+++ cddlib-094f/src/Makefile.am
|
|
||||||
@@ -30,5 +30,5 @@ testlp3_SOURCES = testlp3
|
|
||||||
# cddmathlink_SOURCES = cddmathlink.c cddmlio.h cddmlio.c
|
|
||||||
|
|
||||||
LDADD = ../lib-src/libcdd.la
|
|
||||||
-INCLUDES = -I../lib-src
|
|
||||||
-AM_CPPFLAGS = -UGMPRATIONAL
|
|
||||||
+AM_CPPFLAGS = -I../lib-src
|
|
||||||
+AM_CPPFLAGS += -UGMPRATIONAL
|
|
||||||
@ -1,79 +0,0 @@
|
|||||||
From: Jan Engelhardt <jengelh@medozas.de>
|
|
||||||
Date: 2011-09-26 14:47:01.350702632 +0200
|
|
||||||
Upstream: dead
|
|
||||||
|
|
||||||
Replace ye olde static libs with shared libs.
|
|
||||||
|
|
||||||
---
|
|
||||||
configure.in | 3 ++-
|
|
||||||
lib-src-gmp/Makefile.am | 4 ++--
|
|
||||||
lib-src/Makefile.am | 4 ++--
|
|
||||||
src-gmp/Makefile.am | 2 +-
|
|
||||||
src/Makefile.am | 2 +-
|
|
||||||
5 files changed, 8 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
Index: cddlib-094f/configure.in
|
|
||||||
===================================================================
|
|
||||||
--- cddlib-094f.orig/configure.in
|
|
||||||
+++ cddlib-094f/configure.in
|
|
||||||
@@ -7,7 +7,8 @@ AM_INIT_AUTOMAKE(cddlib, 0.94)
|
|
||||||
dnl Checks for programs.
|
|
||||||
AC_PROG_CC
|
|
||||||
AC_PROG_INSTALL
|
|
||||||
-AC_PROG_RANLIB
|
|
||||||
+AC_DISABLE_STATIC
|
|
||||||
+LT_INIT
|
|
||||||
|
|
||||||
dnl Checks for libraries.
|
|
||||||
dnl Replace `main' with a function in -lg:
|
|
||||||
Index: cddlib-094f/lib-src-gmp/Makefile.am
|
|
||||||
===================================================================
|
|
||||||
--- cddlib-094f.orig/lib-src-gmp/Makefile.am
|
|
||||||
+++ cddlib-094f/lib-src-gmp/Makefile.am
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
-lib_LIBRARIES = libcddgmp.a
|
|
||||||
+lib_LTLIBRARIES = libcddgmp.la
|
|
||||||
|
|
||||||
-libcddgmp_a_SOURCES = \
|
|
||||||
+libcddgmp_la_SOURCES = \
|
|
||||||
cddcore.c \
|
|
||||||
cddlp.c \
|
|
||||||
cddmp.c \
|
|
||||||
Index: cddlib-094f/lib-src/Makefile.am
|
|
||||||
===================================================================
|
|
||||||
--- cddlib-094f.orig/lib-src/Makefile.am
|
|
||||||
+++ cddlib-094f/lib-src/Makefile.am
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
-lib_LIBRARIES = libcdd.a
|
|
||||||
+lib_LTLIBRARIES = libcdd.la
|
|
||||||
|
|
||||||
-libcdd_a_SOURCES = \
|
|
||||||
+libcdd_la_SOURCES = \
|
|
||||||
cddcore.c \
|
|
||||||
cddlp.c \
|
|
||||||
cddmp.c \
|
|
||||||
Index: cddlib-094f/src-gmp/Makefile.am
|
|
||||||
===================================================================
|
|
||||||
--- cddlib-094f.orig/src-gmp/Makefile.am
|
|
||||||
+++ cddlib-094f/src-gmp/Makefile.am
|
|
||||||
@@ -29,7 +29,7 @@ testlp2_gmp_SOURCES = tes
|
|
||||||
testlp3_gmp_SOURCES = testlp3.c
|
|
||||||
# cddmathlink_SOURCES = cddmathlink.c cddmlio.h cddmlio.c
|
|
||||||
|
|
||||||
-LDADD = ../lib-src-gmp/libcddgmp.a
|
|
||||||
+LDADD = ../lib-src-gmp/libcddgmp.la
|
|
||||||
AM_LDFLAGS = -L$(gmplibdir)
|
|
||||||
INCLUDES = -I../lib-src-gmp
|
|
||||||
INCLUDES += -I$(gmpincludedir)
|
|
||||||
Index: cddlib-094f/src/Makefile.am
|
|
||||||
===================================================================
|
|
||||||
--- cddlib-094f.orig/src/Makefile.am
|
|
||||||
+++ cddlib-094f/src/Makefile.am
|
|
||||||
@@ -29,6 +29,6 @@ testlp2_SOURCES = testlp2
|
|
||||||
testlp3_SOURCES = testlp3.c
|
|
||||||
# cddmathlink_SOURCES = cddmathlink.c cddmlio.h cddmlio.c
|
|
||||||
|
|
||||||
-LDADD = ../lib-src/libcdd.a
|
|
||||||
+LDADD = ../lib-src/libcdd.la
|
|
||||||
INCLUDES = -I../lib-src
|
|
||||||
AM_CPPFLAGS = -UGMPRATIONAL
|
|
||||||
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Aug 21 19:59:49 UTC 2012 - dmitry@roshchin.org
|
||||||
|
|
||||||
|
- Update to version 0.94g
|
||||||
|
* fixed memory leaks in cddlib.c and cddlp.c
|
||||||
|
* integrated patches for making the library
|
||||||
|
shared and more compatible for C++ compilers
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Feb 26 12:04:08 UTC 2012 - scorot@free.fr
|
Sun Feb 26 12:04:08 UTC 2012 - scorot@free.fr
|
||||||
|
|
||||||
|
|||||||
13
cddlib.spec
13
cddlib.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package cddlib
|
# spec file for package cddlib
|
||||||
#
|
#
|
||||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -17,17 +17,16 @@
|
|||||||
|
|
||||||
Name: cddlib
|
Name: cddlib
|
||||||
%define lname libcdd0
|
%define lname libcdd0
|
||||||
Version: 0.94f
|
Version: 0.94g
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Library for finding vertices of convex polytopes
|
Summary: Library for finding vertices of convex polytopes
|
||||||
Group: Productivity/Scientific/Math
|
Group: Productivity/Scientific/Math
|
||||||
License: GPL-2.0+
|
License: GPL-2.0+
|
||||||
URL: http://www.ifor.math.ethz.ch/~fukuda/cdd_home/
|
URL: http://www.ifor.math.ethz.ch/~fukuda/cdd_home/
|
||||||
|
|
||||||
Source: cddlib-094f.tar.bz2
|
Source: cddlib-094g.tar.gz
|
||||||
Patch1: cddlib-shared.diff
|
|
||||||
Patch2: cddlib-flags.diff
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
BuildRequires: autoconf
|
||||||
BuildRequires: gmp-devel >= 3
|
BuildRequires: gmp-devel >= 3
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -58,11 +57,9 @@ extreme rays of a general convex polyhedron in R^d given by a system
|
|||||||
of linear inequalities.
|
of linear inequalities.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -qn %name-094f
|
%setup -qn %name-094g
|
||||||
%patch -P 1 -P 2 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -fi;
|
|
||||||
%configure --enable-shared --disable-static
|
%configure --enable-shared --disable-static
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user