diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-29 11:22:34 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-29 11:22:34 +0000 |
| commit | bd7908c6630f38067350d396ac5d18c3cc2434a0 (patch) | |
| tree | 3559b3e11424f5529527f2474d8a977a91ee3389 /sci-geosciences/routino/files | |
| parent | 8b2628ad8526c806375e7b157889e4274b70248b (diff) | |
gentoo resync : 29.10.2017
Diffstat (limited to 'sci-geosciences/routino/files')
| -rw-r--r-- | sci-geosciences/routino/files/routino-3.1.1.patch | 38 | ||||
| -rw-r--r-- | sci-geosciences/routino/files/routino-3.2.patch | 42 |
2 files changed, 64 insertions, 16 deletions
diff --git a/sci-geosciences/routino/files/routino-3.1.1.patch b/sci-geosciences/routino/files/routino-3.1.1.patch index 15ba41b73feb..ac54fcf9f887 100644 --- a/sci-geosciences/routino/files/routino-3.1.1.patch +++ b/sci-geosciences/routino/files/routino-3.1.1.patch @@ -1,17 +1,22 @@ -diff -r -U1 routino-3.1.1.orig/Makefile.conf routino-3.1.1/Makefile.conf ---- routino-3.1.1.orig/Makefile.conf 2016-03-05 19:49:21.000000000 +0600 -+++ routino-3.1.1/Makefile.conf 2016-07-16 20:09:22.208869580 +0600 -@@ -47,3 +47,3 @@ +--- routino-3.1.1/Makefile.conf 2017-10-22 15:55:10.420531850 +0200 ++++ routino-3.1.1/Makefile.conf.new 2017-10-22 15:55:32.180533067 +0200 +@@ -45,11 +45,11 @@ + # Installation locations (edit if required) + ifneq ($(HOST),MINGW) -prefix=/usr/local +prefix=/usr bindir=$(prefix)/bin -@@ -51,3 +51,3 @@ + incdir=$(prefix)/include libdir=$(prefix)/lib -docdir=$(prefix)/doc/routino +docdir=$(prefix)/share/doc/$(PF) datadir=$(prefix)/share/routino -@@ -76,6 +76,6 @@ + else + prefix="c:/Program Files/Routino" +@@ -74,16 +74,16 @@ + + # Maths library -LDFLAGS=-lm +LDFLAGS+=-lm @@ -20,15 +25,32 @@ diff -r -U1 routino-3.1.1.orig/Makefile.conf routino-3.1.1/Makefile.conf -CFLAGS=-std=c99 +CFLAGS+=-std=c99 -@@ -85,3 +85,3 @@ + # Warning options + CFLAGS+=-Wall -Wmissing-prototypes -Wextra -Wno-unused-parameter -pedantic + # Optimisation options -CFLAGS+=-O3 +#CFLAGS+=-O3 CFLAGS+=-ffast-math -@@ -141,4 +141,4 @@ + + # Optimisation option (only works if compilation and execution use exactly the same CPU architecture). +@@ -118,7 +118,7 @@ + endif + + # Put the current directory in the shared library path for the router using libroutino +-LDFLAGS_LDSO=-Wl,-R. ++#LDFLAGS_LDSO=-Wl,-R. + + + # Required for multi-threaded support (comment these two lines out if not required) +@@ -139,8 +139,8 @@ + + # 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. diff --git a/sci-geosciences/routino/files/routino-3.2.patch b/sci-geosciences/routino/files/routino-3.2.patch index 484b61b68f10..81b6c4d938c9 100644 --- a/sci-geosciences/routino/files/routino-3.2.patch +++ b/sci-geosciences/routino/files/routino-3.2.patch @@ -1,30 +1,56 @@ -diff -r -U1 routino-3.2.orig/Makefile.conf routino-3.2/Makefile.conf ---- routino-3.2.orig/Makefile.conf 2016-11-22 20:22:52.000000000 +0100 -+++ routino-3.2/Makefile.conf 2017-04-01 23:58:23.835905270 +0200 -@@ -47,3 +47,3 @@ +--- routino-3.2/Makefile.conf 2017-10-22 16:03:29.917559780 +0200 ++++ routino-3.2/Makefile.conf.new 2017-10-22 16:04:23.877562797 +0200 +@@ -45,11 +45,11 @@ + # Installation locations (edit if required) + ifneq ($(HOST),MINGW) -prefix=/usr/local +prefix=/usr bindir=$(prefix)/bin -@@ -51,3 +51,3 @@ + incdir=$(prefix)/include libdir=$(prefix)/lib -docdir=$(prefix)/doc/routino +docdir=$(prefix)/share/doc/$(PF) datadir=$(prefix)/share/routino -@@ -79,3 +79,3 @@ + else + prefix="c:/Program Files/Routino" +@@ -74,16 +74,16 @@ + + + # Maths library +-LDFLAGS=-lm ++LDFLAGS+=-lm + # Language dialect selection -CFLAGS=-std=c99 +CFLAGS+=-std=c99 -@@ -85,3 +85,3 @@ + # Warning options + CFLAGS+=-Wall -Wmissing-prototypes -Wextra -Wno-unused-parameter -pedantic + # Optimisation options -CFLAGS+=-O3 +#CFLAGS+=-O3 CFLAGS+=-ffast-math -@@ -141,4 +141,4 @@ + + # Optimisation option (only works if compilation and execution use exactly the same CPU architecture). +@@ -118,7 +118,7 @@ + endif + + # Put the current directory in the shared library path for the router using libroutino +-LDFLAGS_LDSO=-Wl,-R. ++#LDFLAGS_LDSO=-Wl,-R. + + + # Required for multi-threaded support (comment these two lines out if not required) +@@ -139,8 +139,8 @@ + + # 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. |