diff options
Diffstat (limited to 'dev-util/ddd')
| -rw-r--r-- | dev-util/ddd/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/ddd/ddd-3.3.12-r4.ebuild | 4 | ||||
| -rw-r--r-- | dev-util/ddd/files/ddd-3.3.12-gcc9.patch | 93 | ||||
| -rw-r--r-- | dev-util/ddd/files/ddd-3.3.12-parallel.patch | 15 |
4 files changed, 114 insertions, 2 deletions
diff --git a/dev-util/ddd/Manifest b/dev-util/ddd/Manifest index fcfed827af3a..95b45fc765c6 100644 --- a/dev-util/ddd/Manifest +++ b/dev-util/ddd/Manifest @@ -1,7 +1,9 @@ AUX ddd-3.3.12-gcc44.patch 209 BLAKE2B ce05a8f213e505680297aa3de998efada5c4db48ea18fa3a5474b8aeb266fa85c582723ac3a9b52a7ece0ec7636782a1dc69d69ed073becb8dc834839e907715 SHA512 9373fee21d92b5661c659bcad0f9ce4bca25c86eba40d5d6e498f454cd56af225f290431bd79bfd98a6da5e49180ccb8fd37c144fb99e8b75c886c066e48b129 +AUX ddd-3.3.12-gcc9.patch 3409 BLAKE2B 752d4d8e36af49e4dcec6b79e3c3c0a0f8f55fcfba6fb882d3ba64a4016fc8d74a7eb32873be08194a865309e99b80a0d188d0456dd5dd770e7f280ed14172b1 SHA512 e148f6dcce1406d1ba2f5b83ff387c16bc914d6014077c465508085b9a595de539d7dc39b39a02e0db2e3e0b9704de748949767d31fb23657b40655b4052a580 AUX ddd-3.3.12-gdb-disassembler-bug.patch 266 BLAKE2B a5658a1513adc116a81de7ec7bfb3eca4002043629a7b939970b8d902e1534d31df0ab8252a7dd2e5f998bc0df4d632bb5cb04662e81391b0e26e6a09809e35b SHA512 15ca238a9ac88c0736c861b962558f09be53f1bc85a5d46d6efb8d6c7ff6fc089b9f730dc0b691d65bbc40010cbd4d2cc4947f369d12271c214770114d533b14 AUX ddd-3.3.12-man.patch 571 BLAKE2B 88f499833e47ae279beac8dbc4aadcfaa80e8c19f388b6dac3d724b284820472ca83ce81811df838e26d66d3bf1a558c9de8f51f22037b70cff3207f82104b40 SHA512 830115e517f754702892549d780003033e29fc0668824540cc63c3270e8445549896505a6584ccee104d94ffcf152bff679d946922f9d6fffc75d77abdbb8a59 +AUX ddd-3.3.12-parallel.patch 621 BLAKE2B 57446f5c7e797d7ddab5ed6aca01a5ffdc6af314bb797d96cfb357e214f1cf49153387635f9b585c53ebbcf7b06dcd6119b6bb2cbcaffa7d4382c4fbe9fdd181 SHA512 1157bec9212ffd4cbf86e8d36f68c80e9170091d09318effd800ce154f2b738e730db95e1e954c632dc25390e78cf88a9f1f3d14426df4069c0e5523f2dc6646 AUX ddd-3.3.12-tinfo.patch 330 BLAKE2B f0e29f408f1e5e7fa40e386ab2a1f6786a9a14dc6722aef3fc8132558b624c233102b4290c0ba0e5d55b27aa4b25e6bcdd6fcd1b4ae237540621f3961e92bffc SHA512 a3cd3d59bdcce6c106d4488ec9a6c32d8baea49963f61e8e493a01131fd604664dca2e9e548852ff4c538c7123f5c1572bc54d6143340167fcdfa754002eb224 DIST ddd-3.3.12.tar.gz 5687115 BLAKE2B 52c448eda46bfdc4f5720abda569a0c70f3680c3fdd543f6101c9af8c4c448496414c1c2a7be91590d9f14d0c8c2bb053a234d179bf900ca52df0ea8c2642131 SHA512 1249e4f5f25335f8f2c3616470f7a8f36262c00b8ac12b79f2b2806228de2831ebeb780fe09490e5e8b5b1ca108fe936ae70856f6a6ec02876fc75c7b4a7dbf3 -EBUILD ddd-3.3.12-r4.ebuild 2256 BLAKE2B 6fdae531b7aee21be37ca2c90c9e4042cbbb7388d42bedb5f198da4b7c4b2ec8793763eb4e24d50ea620dcf3e96be099cd50a550e0e49891bcae9f9c3eca1779 SHA512 a6614f1ad38fd3c479476f870b9c7ca09602d2592e5e2f9bff2005b441b0d88747ec5cad84268c0ef6670dc3ca5c1072f88d307a45dc3c807ddce629bf89981d +EBUILD ddd-3.3.12-r4.ebuild 2335 BLAKE2B 92099e6daa39cbdeb0ce1d1ecb03f3c08e0085873c5c0106bf26fad4a1f9080cfe0436be99b78edcf2348f8a1d7b3cb79aee1a524e5d79ae060194a87a2d24b5 SHA512 f2d4b15fac0fccd3438b8ecaad982187860a6e8a3012fae004fe605c0c185173606d36120ca164c7cff8e89ca042c5397f75c5a4a6db11be34178dcc42474ff7 MISC metadata.xml 658 BLAKE2B f2b35a9e08da89197aa56157e5d3c9adbc991d888cf798849bf7edf33fe6d9fd7dab16e0ea3068d20a836f85d133a570f3bbbcb9e57399c095292fa3390f59bb SHA512 8b304bbca5e836ff3032079f5dd2afea432b8f48e2c57575644adbefba0ddc4f64e3682f35f53c2804c27e950785ae8040f8704c05162acf302c6fb61b70c51d diff --git a/dev-util/ddd/ddd-3.3.12-r4.ebuild b/dev-util/ddd/ddd-3.3.12-r4.ebuild index 4110ccf39cd6..2694f0cffacf 100644 --- a/dev-util/ddd/ddd-3.3.12-r4.ebuild +++ b/dev-util/ddd/ddd-3.3.12-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -41,6 +41,8 @@ PATCHES=( "${FILESDIR}/${P}-gdb-disassembler-bug.patch" "${FILESDIR}/${PN}-3.3.12-man.patch" "${FILESDIR}/${PN}-3.3.12-tinfo.patch" + "${FILESDIR}/${PN}-3.3.12-gcc9.patch" + "${FILESDIR}/${PN}-3.3.12-parallel.patch" ) DOCS=( diff --git a/dev-util/ddd/files/ddd-3.3.12-gcc9.patch b/dev-util/ddd/files/ddd-3.3.12-gcc9.patch new file mode 100644 index 000000000000..ce12a41c91d2 --- /dev/null +++ b/dev-util/ddd/files/ddd-3.3.12-gcc9.patch @@ -0,0 +1,93 @@ +diff -ruN -x '*.am' ddd-3.3.12/ddd/strclass.h my/ddd/strclass.h +--- ddd-3.3.12/ddd/strclass.h 2009-02-11 18:25:06.000000000 +0100 ++++ my/ddd/strclass.h 2019-11-22 22:00:49.000267420 +0100 +@@ -543,7 +543,6 @@ + bool OK() const; + }; + +- + class string + { + friend class subString; +@@ -811,9 +810,9 @@ + const regex& sep); + + friend string common_prefix(const string& x, const string& y, +- int startpos = 0); ++ int startpos); + friend string common_suffix(const string& x, const string& y, +- int startpos = -1); ++ int startpos); + friend string replicate(char c, int n); + friend string replicate(const string& y, int n); + friend string join(const string *src, int n, const string& sep); +@@ -864,8 +863,8 @@ + friend std::istream& operator>>(std::istream& s, string& x); + + friend int readline(std::istream& s, string& x, +- char terminator = '\n', +- int discard_terminator = 1); ++ char terminator, ++ int discard_terminator); + + // Status + unsigned int length() const; +@@ -882,6 +881,58 @@ + bool OK() const; + }; + ++inline void cat(const string&, const string&, string&); ++inline void cat(const string&, const subString&, string&); ++inline void cat(const string&, const constSubString&, string&); ++inline void cat(const string&, const char*, string&); ++inline void cat(const string&, char*, string&); ++inline void cat(const string&, char, string&); ++ ++inline void cat(const subString&, const string&, string&); ++inline void cat(const subString&, const subString&, string&); ++inline void cat(const subString&, const char*, string&); ++inline void cat(const subString&, char*, string&); ++inline void cat(const subString&, char, string&); ++ ++inline void cat(const char*, const string&, string&); ++inline void cat(const char*, const subString&, string&); ++inline void cat(const char*, const char*, string&); ++inline void cat(const char*, char*, string&); ++inline void cat(const char*, char, string&); ++ ++inline void cat(char*, const string&, string&); ++inline void cat(char*, const subString&, string&); ++inline void cat(char*, const char*, string&); ++inline void cat(char*, char*, string&); ++inline void cat(char*, char, string&); ++ ++inline void cat(char, const string&, string&); ++inline void cat(char, const subString&, string&); ++inline void cat(char, const char*, string&); ++inline void cat(char, char*, string&); ++inline void cat(char, char, string&); ++ ++int split(const string& x, string *res, int maxn, ++ const string& sep); ++int split(const string& x, string *res, int maxn, ++ const regex& sep); ++ ++string common_prefix(const string& x, const string& y, ++ int startpos = 0); ++string common_suffix(const string& x, const string& y, ++ int startpos = -1); ++string replicate(char c, int n); ++string replicate(const string& y, int n); ++string join(const string *src, int n, const string& sep); ++ ++inline std::ostream& operator<<(std::ostream& s, const string& x); ++inline std::ostream& operator<<(std::ostream& s, const subString& x); ++std::istream& operator>>(std::istream& s, string& x); ++ ++int readline(std::istream& s, string& x, ++ char terminator = '\n', ++ int discard_terminator = 1); ++ + // Inject names manually to accomodate argument-dependent name lookup (ADL) + // (aka Koenig lookup). The rule is that friend declarations are visible + // when found through ADL because an argument of the call happens to be diff --git a/dev-util/ddd/files/ddd-3.3.12-parallel.patch b/dev-util/ddd/files/ddd-3.3.12-parallel.patch new file mode 100644 index 000000000000..21624a2ab614 --- /dev/null +++ b/dev-util/ddd/files/ddd-3.3.12-parallel.patch @@ -0,0 +1,15 @@ +diff -ruN -x strclass.h ddd-3.3.12/ddd/Makefile.am my/ddd/Makefile.am +--- ddd-3.3.12/ddd/Makefile.am 2009-02-11 18:25:07.000000000 +0100 ++++ my/ddd/Makefile.am 2019-11-22 22:49:26.212765331 +0100 +@@ -580,9 +580,8 @@ + + # Make sure needed headers are built before trying to compile these files + # (Assume ddd.C is the first source file to be built.) +-ddd.o: version.h host.h root.h +-resources.o: Ddd.ad.h +-show.o: build.h ++# MM: AND WHY WOULD YOU ASSUME THAT?? ++BUILT_SOURCES = version.h host.h root.h Ddd.ad.h build.h + + # ----------------------------------------------------------------------------- + # Local Libraries. |