Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (97c6806b8b7cf3e851c40a294ebe01cb8f8cd819)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (97c6806b8b7cf3e851c40a294ebe01cb8f8cd819)
  • Date: Fri, 1 Nov 2019 16:01:30 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

python-pypi/cython/DETAILS | 11 -
python-pypi/cython/HISTORY | 3
science/routino/0001-use-our-CFLAGS-honour-installation-path.patch | 89
++++++----
science/routino/DETAILS | 4
science/routino/HISTORY | 4
5 files changed, 71 insertions(+), 40 deletions(-)

New commits:
commit 97c6806b8b7cf3e851c40a294ebe01cb8f8cd819
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

python-pypi/cython: version 0.29.14

commit 203cb5fc5be9dfe9a2b09d0929482d6f021db9d4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

science/routino: version 3.3.1

diff --git a/python-pypi/cython/DETAILS b/python-pypi/cython/DETAILS
index 7651cb2..1748faf 100755
--- a/python-pypi/cython/DETAILS
+++ b/python-pypi/cython/DETAILS
@@ -1,10 +1,9 @@
SPELL=cython
- SPELLX=Cython
- VERSION=0.29.13
- SOURCE=${SPELLX}-${VERSION}.tar.gz
- SOURCE_URL[0]=https://pypi.org/packages/source/C/${SPELLX}/${SOURCE}
-
SOURCE_HASH=sha512:61ce4cab938163c14c7ece750fde2b26ce8476c3a6fed0c6768022ef7e9b652591db9646a2814c7f17457581c9b4b7c38bb703e697fee9322a480b020a43d8fc
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
+ VERSION=0.29.14
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+ SOURCE_URL[0]=https://github.com/cython/cython/archive/${VERSION}.tar.gz
+
SOURCE_HASH=sha512:54dffa0a1ff5f45aaa947f8b2e94cfb1818d0cc781e0e39e341de6acede48b7a1c73f8804b77d3f65fdef05661b47e2e6fe84c11ac3ec7a2e2c0956c20099e3e
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://www.cython.org/
ENTERED=20100106
LICENSE[0]=APACHE
diff --git a/python-pypi/cython/HISTORY b/python-pypi/cython/HISTORY
index b646213..fba6c51 100644
--- a/python-pypi/cython/HISTORY
+++ b/python-pypi/cython/HISTORY
@@ -1,3 +1,6 @@
+2019-11-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.29.14
+
2019-07-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.29.13

diff --git
a/science/routino/0001-use-our-CFLAGS-honour-installation-path.patch
b/science/routino/0001-use-our-CFLAGS-honour-installation-path.patch
index 2e9d36d..b266255 100644
--- a/science/routino/0001-use-our-CFLAGS-honour-installation-path.patch
+++ b/science/routino/0001-use-our-CFLAGS-honour-installation-path.patch
@@ -1,41 +1,61 @@
-From dba0c127bacf334b6255d51ef21564ff99fb66a7 Mon Sep 17 00:00:00 2001
+From 669baa8308c2043060c78878e08becc4a9b4515a Mon Sep 17 00:00:00 2001
From: Florian Franzmann <bwlf AT bandrate.org>
-Date: Mon, 23 Jul 2018 18:48:55 +0200
+Date: Fri, 1 Nov 2019 14:22:48 +0100
Subject: [PATCH] use our CFLAGS, honour installation path

---
- Makefile.conf | 19 +++++++------------
- 1 file changed, 7 insertions(+), 12 deletions(-)
+ Makefile.conf | 45 ++++++++++-----------------------------------
+ 1 file changed, 10 insertions(+), 35 deletions(-)

diff --git a/Makefile.conf b/Makefile.conf
-index a1cfb24..a7aea84 100644
+index 5e6d3db..62ab027 100644
--- a/Makefile.conf
+++ b/Makefile.conf
-@@ -45,11 +45,11 @@ endif
+@@ -44,21 +44,12 @@ endif
+
# Installation locations (edit if required)

- ifneq ($(HOST),MINGW)
--prefix=/usr/local
+-ifneq ($(HOST),MINGW)
+- prefix=/usr/local
+- bindir=$(prefix)/bin
+- incdir=$(prefix)/include
+- libdir=$(prefix)/lib
+- docdir=$(prefix)/doc/routino
+- datadir=$(prefix)/share/routino
+-else
+- prefix="c:/Program Files/Routino"
+- bindir=$(prefix)/bin
+- incdir=$(prefix)/include
+- libdir=$(prefix)/lib
+- docdir=$(prefix)/doc
+- datadir=$(prefix)/xml
+-endif
+prefix=/usr
- bindir=$(prefix)/bin
- incdir=$(prefix)/include
- libdir=$(prefix)/lib
--docdir=$(prefix)/doc/routino
++bindir=$(prefix)/bin
++incdir=$(prefix)/include
++libdir=$(prefix)/lib
+docdir=$(prefix)/share/doc/routino
- datadir=$(prefix)/share/routino
- else
- prefix="c:/Program Files/Routino"
-@@ -69,23 +69,18 @@ LIBVERSION=$(SOVERSION).0.0
++datadir=$(prefix)/share/routino
+
+
+ # Library version for ABI compatibility
+@@ -69,9 +60,7 @@ LIBVERSION=$(SOVERSION).0.0


# Compilation programs
-CC=gcc
+-CXX=g++
-LD=gcc
-+LD=$(CC)
++LD=$(CXX)

+ ifdef CLANG
+ ifeq ($(CLANG),1)
+@@ -82,10 +71,10 @@ ifdef CLANG
+ endif

# Maths library
- LDFLAGS=-lm
+-LDFLAGS=-lm
++LDFLAGS+=-lm

# Language dialect selection
-CFLAGS=-std=c99
@@ -43,15 +63,31 @@ index a1cfb24..a7aea84 100644

# Warning options
CFLAGS+=-Wall -Wmissing-prototypes -Wextra -Wno-unused-parameter -pedantic
+@@ -96,23 +85,9 @@ ifdef CLANG
+ endif
+ endif

-# Optimisation options
-CFLAGS+=-O3
+-
+-# Fast maths option - makes test cases fail slightly
-CFLAGS+=-ffast-math
+-ifdef FASTMATHS
+- ifeq ($(FASTMATHS),0)
+- CFLAGS+=-fno-fast-math
+- endif
+-endif
-
# Optimisation option (only works if compilation and execution use exactly
the same CPU architecture).
#CFLAGS+=-march=native

-@@ -123,7 +118,7 @@ LDFLAGS_LDSO=-Wl,-R.
+-# Compile with debugging symbols
+-CFLAGS+=-g
+-
+ # Option for compiling with sanitizer for debugging memory addresses and
undefined behaviour
+ ifdef SANITIZE
+ ifeq ($(SANITIZE),1)
+@@ -143,7 +118,7 @@ LDFLAGS_LDSO=-Wl,-R.

# Required for multi-threaded support (comment these two lines out if not
required)
CFLAGS+=-pthread -DUSE_PTHREADS
@@ -59,18 +95,7 @@ index a1cfb24..a7aea84 100644
+LDFLAGS+=-pthread


- ifneq ($(HOST),MINGW)
-@@ -139,8 +134,8 @@ LDFLAGS+=-lz
-
-
- # Required for xz support (uncomment these two lines if required)
--#CFLAGS+=-DUSE_XZ
--#LDFLAGS+=-llzma
-+CFLAGS+=-DUSE_XZ
-+LDFLAGS+=-llzma
-
-
- # Required to use stdio with files > 2GiB on 32-bit system.
+ # Required for bzip2 support (comment these two lines out if not required)
--
-2.18.0
+2.23.0

diff --git a/science/routino/DETAILS b/science/routino/DETAILS
index fdd2551..fcedd5b 100755
--- a/science/routino/DETAILS
+++ b/science/routino/DETAILS
@@ -1,8 +1,8 @@
SPELL=routino
- VERSION=3.2
+ VERSION=3.3.1
SOURCE="${SPELL}-${VERSION}.tgz"
SOURCE_URL[0]=http://www.${SPELL}.org/download/${SOURCE}
-
SOURCE_HASH=sha512:f5be46d9c026fcd92658490630d9ff6e4827e84ee57ccbaae48f54372da37ab78de24432ab9fa1d6860304a9a2ac86061eb876c12b39e821693282c4d4aaefcf
+
SOURCE_HASH=sha512:3cfb183a5997f10b743a2c2a955e28f108855e51b340074a1cb8bf091b973a7423edf41e13486ee3946e42d53ce4de037af5a3bd264ef4c6748fdbda4ccee41e
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.routino.org";
LICENSE[0]=AGPL
diff --git a/science/routino/HISTORY b/science/routino/HISTORY
index 124bbbf..bb23cdc 100644
--- a/science/routino/HISTORY
+++ b/science/routino/HISTORY
@@ -1,3 +1,7 @@
+2019-11-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.3.1
+ * 0001-use-our-CFLAGS-honour-installation-path.patch: regenerate
+
2018-07-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.2
* DEPENDS: add dependency on LZMA



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (97c6806b8b7cf3e851c40a294ebe01cb8f8cd819), Florian Franzmann, 11/01/2019

Archive powered by MHonArc 2.6.24.

Top of Page