From: Tobias Geerinckx-Rice <me@tobias.gr>
To: 32058@debbugs.gnu.org
Subject: bug#32058: [PATCH] gnu: mysql: Fix build.
Date: Thu, 16 Aug 2018 01:15:16 +0200 [thread overview]
Message-ID: <20180815231516.10758-1-me@tobias.gr> (raw)
In-Reply-To: <20180705102434.odt3hlp3ghsxsmfs@abyayala>
MySQL demands boost@1.59.0, and lying about it no longer works:
sql/item_geofunc_internal.cc: In function ‘void handle_gis_exception(const char*)’:
sql/item_geofunc_internal.cc:37:81: error: expected unqualified-id before ‘&’ token
catch (const boost::geometry::detail::self_get_turn_points::self_ip_exception &)
^
[...]
* gnu/packages/databases.scm (boost-for-mysql): New variable.
(mysql)[inputs]: Use that instead of the regular boost.
[arguments]: Remove now-unnecessary ‘patch-boost-version’ phase.
---
ng0, Ricardo,
I went on holiday and forgot about this bug. A healthy sign.
Here's the straightforward fix to unbreak the current build.
I suggest we get 5.x working soon (I'll bump it to 5.7.23 if this fix
is acceptable) and update to 8.x later, when/if somebody's willing to
work on it. I'm not.
Kind regards,
T G-R
gnu/packages/databases.scm | 27 +++++++++++++++++----------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 87c925a6b..cb77edeaf 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -548,6 +548,22 @@ RDBMS systems (which are deep in functionality).")
;; Some parts are licensed under the Apache License
license:asl2.0))))
+(define boost-for-mysql
+ (package
+ (inherit boost)
+ (version "1.59.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://sourceforge/boost/boost/" version "/boost_"
+ (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version)
+ ".tar.bz2"))
+ (sha256
+ (base32
+ "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj"))))))
+
+;; XXX When updating, check whether boost-for-mysql is still needed.
+;; It might suffice to patch ‘cmake/boost.cmake’ as done in the past.
(define-public mysql
(package
(name "mysql")
@@ -588,15 +604,6 @@ RDBMS systems (which are deep in functionality).")
"-DINSTALL_MYSQLTESTDIR="
"-DINSTALL_SQLBENCHDIR=")
#:phases (modify-phases %standard-phases
- (add-after
- 'unpack 'patch-boost-version
- (lambda _
- ;; Mysql wants boost-1.59.0 specifically
- (substitute* "cmake/boost.cmake"
- (("59")
- ,(match (string-split (package-version boost) #\.)
- ((_ minor . _) minor))))
- #t))
(add-after
'install 'remove-extra-binaries
(lambda* (#:key outputs #:allow-other-keys)
@@ -611,7 +618,7 @@ RDBMS systems (which are deep in functionality).")
`(("bison" ,bison)
("perl" ,perl)))
(inputs
- `(("boost" ,boost)
+ `(("boost" ,boost-for-mysql)
("libaio" ,libaio)
("ncurses" ,ncurses)
("openssl" ,openssl)
--
2.18.0
next prev parent reply other threads:[~2018-08-15 23:16 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-05 10:24 bug#32058: mysql build fails on d88b29d6b78482cdb05ac714984f6a27195e3d37 Nils Gillmann
2018-07-05 11:31 ` Tobias Geerinckx-Rice
2018-07-05 13:47 ` Nils Gillmann
2018-07-05 20:04 ` Ricardo Wurmus
2018-07-05 21:03 ` Nils Gillmann
2018-07-05 11:34 ` Ricardo Wurmus
2018-08-15 23:15 ` Tobias Geerinckx-Rice [this message]
2018-08-16 15:30 ` bug#32058: [PATCH] gnu: mysql: Fix build Marius Bakke
2018-08-20 18:33 ` Tobias Geerinckx-Rice
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180815231516.10758-1-me@tobias.gr \
--to=me@tobias.gr \
--cc=32058@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.