diff options
| author | Mateusz Piotrowski <0mp@FreeBSD.org> | 2020-09-22 21:17:33 +0000 |
|---|---|---|
| committer | Mateusz Piotrowski <0mp@FreeBSD.org> | 2020-09-22 21:17:33 +0000 |
| commit | b6cc085dce9bbef96c63bde511027658fd5c2f83 (patch) | |
| tree | c20fd46a5103096332c609f9dcf8194ff6a30519 | |
| parent | New ports required for gitlab 13.4. (diff) | |
Fix compilation on i386
The error was:
In file included from lbfgs.cpp:29:
./common.h:216:18: error: class member cannot be redeclared
string_buffer& operator<<(size_t _n) { _UITOA(_n); }
^
./common.h:214:18: note: previous definition is here
string_buffer& operator<<(unsigned int _n) { _UITOA(_n); }
^
| -rw-r--r-- | science/crf++/Makefile | 1 | ||||
| -rw-r--r-- | science/crf++/files/patch-common.h | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/science/crf++/Makefile b/science/crf++/Makefile index 4ab25dadee10..4c2bf27f4037 100644 --- a/science/crf++/Makefile +++ b/science/crf++/Makefile @@ -5,6 +5,7 @@ PORTNAME= crf++ # 0.59 as defined in # https://github.com/taku910/crfpp/commit/d78526835e4cfcc4822156724edda8a3839327c2 DISTVERSION= 0.59 +PORTREVISION= 1 CATEGORIES= science math PATCH_SITES= https://patch-diff.githubusercontent.com/raw/taku910/crfpp/pull/:pr PATCHFILES= 15.patch:-p1:pr \ diff --git a/science/crf++/files/patch-common.h b/science/crf++/files/patch-common.h new file mode 100644 index 000000000000..cf68fa07b60f --- /dev/null +++ b/science/crf++/files/patch-common.h @@ -0,0 +1,11 @@ +--- common.h.orig 2020-09-22 21:00:58 UTC ++++ common.h +@@ -211,7 +211,7 @@ class string_buffer: public std::string { + string_buffer& operator<<(int _n) { _ITOA(_n); } + string_buffer& operator<<(long int _n) { _ITOA(_n); } + string_buffer& operator<<(unsigned short int _n) { _UITOA(_n); } +- string_buffer& operator<<(unsigned int _n) { _UITOA(_n); } ++ // string_buffer& operator<<(unsigned int _n) { _UITOA(_n); } + // string_buffer& operator<<(unsigned long int _n) { _UITOA(_n); } + string_buffer& operator<<(size_t _n) { _UITOA(_n); } + string_buffer& operator<<(char _n) { |