diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-06-30 17:36:28 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-06-30 17:36:28 +0100 |
| commit | 7014a5a3ea0feffab9701fdd6b64cc7667a985af (patch) | |
| tree | f2cbbaa8bb9209cd15208721103228336149b799 /dev-lang/yap | |
| parent | 7a86906b67693cc65671d3e1476835d3a7e13092 (diff) | |
gentoo resync : 30.06.2019
Diffstat (limited to 'dev-lang/yap')
| -rw-r--r-- | dev-lang/yap/Manifest | 3 | ||||
| -rw-r--r-- | dev-lang/yap/files/yap-6.3.3-fix-gcc9.patch | 27 | ||||
| -rw-r--r-- | dev-lang/yap/yap-6.3.3-r1.ebuild | 5 |
3 files changed, 33 insertions, 2 deletions
diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest index 708cca58f774..41301e5909e5 100644 --- a/dev-lang/yap/Manifest +++ b/dev-lang/yap/Manifest @@ -1,5 +1,6 @@ +AUX yap-6.3.3-fix-gcc9.patch 1112 BLAKE2B 7b416b83d33c71f787557692fa0a5f0e955299e979adc13f8717ac5ac84af4798db7011ee461aaa78dcdc428b08897b181d45869f8d08b110240c62bc09ff3c4 SHA512 60e6c1745bda4691d61b1fcc61b96d8f0bc806e2788da152888d0659dd1eb0113bdd584d16d084ad398fcff9a613a856b5283b906a935008b1d9a3c092f03d6d DIST yap-6.3.3-gentoo-patchset-11.tar.gz 6021 BLAKE2B d83682de9a6f095482db66f4fd5bb562739121b8502464d92fb784c634bfbfc020ae3ec55641aaeb8c0d52ce5534f7888bdd7d3d556f68c749b2f0ee35860764 SHA512 d9645a6f5c2b633fb5b61f8b6219ac69ae28e4f53f149fcdbb161cb7a8226aecab64f831a19e73876eb5056bb9efc3501fe792b6dca418a2a56b058ec658a2db DIST yap-6.3.3.tar.gz 7879301 BLAKE2B 1b12a3113dd57634df64680726fd49575979b84126a7a9e1f4d1429be90e1b95599166151ffe62c9ef990ac3c32f57a1efae081b864fc22225c93d21807f412b SHA512 4ef45277ec84b6e072fa54afc7d6c18f11c3a0cdf477e35e35a0ce2181c9ff2e693f8735f63a1899373f6baf79ce0a972b37e1ae6ed8271bec60663f477bbe80 -EBUILD yap-6.3.3-r1.ebuild 2857 BLAKE2B 5412e16a8b26b285aa7698138219650ad8a3ab4ba7d2f384d4e9204930ca2e9b273722a5122df8570f7c24f9cdd595f28945ebb87b952fad23e6463b613bfdff SHA512 408ff3711cf15b5a25a7e9115c884cc13c6b79053345fc1b769fde00a26e0ee1877ef9368b35100af354a17b863073efe54c793b4e36ca49d4341e251867a7f8 +EBUILD yap-6.3.3-r1.ebuild 2900 BLAKE2B 8cec748656cbe10c153776e09214b97065ee4b95bdf32273a36970a3d00af248c79d14226266d582a46ec5743da84dc7eafd32643ad5c701646483be54d4b2dc SHA512 6194bbd1aeb83e7484390d860959f2d7ac38dc57703f14e7ad41184ba1d462adf7039b90e9c84e66987836be4af5f93398f2ffa3fcf598d91fc0e3e1d193f818 EBUILD yap-6.3.3.ebuild 2869 BLAKE2B 755423834f09ec5d57b0e568a3fbc8c3639eacf8ac3db2d3048a73685af7c7cc3b8caf0628d31436e9045e6828c21de18f984662ee94eec1ee4bc586579e885b SHA512 68d0234ff375d36bd8b90c2b3375285684146f1b61b16c1a2ae7ba4a0e957f197cb357634be75395dd11f8ef43f6526e0300e0ed53da800faccc1688f32bbd23 MISC metadata.xml 314 BLAKE2B af1c9bedbf26431e7a624c520a4c93ca9eff16f2539741b01ccf5da16c710c82d3820e3ad647a36a4629dc7b316a18c1b1306314200843e1d4d6b95c8c829442 SHA512 c5bd279aec3b80e6c08dfaa85cf091cbfcbf9380f1e5a8a0fcd6f27297368b92906340ae9dfd5176f37d36e4fb61ca772448c0248121d8e302c181bf670e57bc diff --git a/dev-lang/yap/files/yap-6.3.3-fix-gcc9.patch b/dev-lang/yap/files/yap-6.3.3-fix-gcc9.patch new file mode 100644 index 000000000000..f16d29142215 --- /dev/null +++ b/dev-lang/yap/files/yap-6.3.3-fix-gcc9.patch @@ -0,0 +1,27 @@ +https://bugs.gentoo.org/686048 + +./SolverTypes.h:122:20: error: friend declaration of ‘Clause* Clause_new(const V&, bool)’ specifies default arguments and isn’t a definition [-fpermissive] + 122 | friend Clause* Clause_new(const V& ps, bool learnt = false); + | ^~~~~~~~~~ + +--- a/packages/swi-minisat2/C/SolverTypes.h ++++ b/packages/swi-minisat2/C/SolverTypes.h +@@ -97,6 +97,9 @@ + //================================================================================================= + // Clause -- a simple class for representing a clause: + ++class Clause; ++template<class V> ++Clause* Clause_new(const V& ps, bool learnt = false); + + class Clause { + uint32_t size_etc; +@@ -119,7 +122,7 @@ + + // -- use this function instead: + template<class V> +- friend Clause* Clause_new(const V& ps, bool learnt = false); ++ friend Clause* Clause_new(const V& ps, bool learnt); + + int size () const { return size_etc >> 3; } + void shrink (int i) { assert(i <= size()); size_etc = (((size_etc >> 3) - i) << 3) | (size_etc & 7); } diff --git a/dev-lang/yap/yap-6.3.3-r1.ebuild b/dev-lang/yap/yap-6.3.3-r1.ebuild index fd653ef29268..3864fe27707b 100644 --- a/dev-lang/yap/yap-6.3.3-r1.ebuild +++ b/dev-lang/yap/yap-6.3.3-r1.ebuild @@ -29,7 +29,10 @@ RDEPEND="sys-libs/zlib DEPEND="${RDEPEND} doc? ( app-text/texi2html )" -PATCHES=( "${WORKDIR}"/${PV} ) +PATCHES=( + "${WORKDIR}"/${PV} + "${FILESDIR}"/${PN}-6.3.3-fix-gcc9.patch +) src_prepare() { default |