From patchwork Fri Apr 23 14:31:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 28824 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D629F27BC7D; Fri, 23 Apr 2021 15:33:42 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5509127BC7C for ; Fri, 23 Apr 2021 15:33:42 +0100 (BST) Received: from localhost ([::1]:42202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZwsH-0003VO-IK for patchwork@mira.cbaines.net; Fri, 23 Apr 2021 10:33:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZwrg-00035x-D5 for guix-patches@gnu.org; Fri, 23 Apr 2021 10:33:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55148) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lZwrg-0005My-64 for guix-patches@gnu.org; Fri, 23 Apr 2021 10:33:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lZwrf-00077B-It for guix-patches@gnu.org; Fri, 23 Apr 2021 10:33:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47972] [PATCH 3/6] gnu: Add nanodbc-for-irods. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Apr 2021 14:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47972 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 47972@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 47972-submit@debbugs.gnu.org id=B47972.161918834727249 (code B ref 47972); Fri, 23 Apr 2021 14:33:03 +0000 Received: (at 47972) by debbugs.gnu.org; 23 Apr 2021 14:32:27 +0000 Received: from localhost ([127.0.0.1]:38451 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZwr5-00075L-58 for submit@debbugs.gnu.org; Fri, 23 Apr 2021 10:32:27 -0400 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21155) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZwr0-00074u-4p for 47972@debbugs.gnu.org; Fri, 23 Apr 2021 10:32:22 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1619188340; cv=none; d=zohomail.com; s=zohoarc; b=Ra2VTQpWRF71Ffl7FgJOdpJ4qOL8/FMUgUxd1y7IXgDOg5snounkThB2Vhz16wGX4y/CyvmNmQ4xttP61IhyQo7JqKw4bN7Rdw9jAQIOsKIzSnN9CJFDvzmRnGC1sd0XD1vJA1xDBhhTGy2RRdTIyBPkKA2WFzaUkCqrJMG0pas= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619188340; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=dUBFcNhnsWXFC4xRYfYiuqnL908bflnx7XDwg7MdHaI=; b=DNdzuzzjyIGBwFfCTYaTjSheXqohtuF4FAzOAHZyB+3COLeOz8qmx2uFvQTyPYFki4pKqe2L2aNBDwKNC4ZFtid4x8bJDFe9YuARBVVqCO8w5/7z+E8I18wjpagY1GG29sLATkBLRv5UzrRVhJDhiF3g1QMY9jFINZ3s5ECLQZU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1619188340; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=dUBFcNhnsWXFC4xRYfYiuqnL908bflnx7XDwg7MdHaI=; b=FGgxExxp/1SWy2dtsjdIq7TOPf7LMboEZPNA9YqEuWMMRSamBJxKaEEXvLwMi9pz BEVNxABFhIxwZfNh/fp7QGhOY5ugyqeQWg9GX1vQWaVJ4cJBYcjTGE4v28BVCbWwcGG Dv9AG59HQWQwxgvhCaqV1WRGeBSi/arg7E5ajLEg= Received: from localhost (p54ad4fb3.dip0.t-ipconnect.de [84.173.79.179]) by mx.zohomail.com with SMTPS id 1619188337741433.1769107096393; Fri, 23 Apr 2021 07:32:17 -0700 (PDT) From: Ricardo Wurmus Date: Fri, 23 Apr 2021 16:31:58 +0200 Message-Id: <20210423143201.12831-3-rekado@elephly.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210423143201.12831-1-rekado@elephly.net> References: <20210423143201.12831-1-rekado@elephly.net> MIME-Version: 1.0 X-ZohoMailClient: External X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/databases.scm (nanodbc-for-irods): New variable. --- gnu/packages/databases.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index b956833557..d159c47af8 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -98,6 +98,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages lisp-xyz) + #:use-module (gnu packages llvm) #:use-module (gnu packages logging) #:use-module (gnu packages man) #:use-module (gnu packages maths) @@ -2103,6 +2104,42 @@ a simpler and less verbose API for working with ODBC. Common tasks should be easy, requiring concise and simple code.") (license license:expat))) +(define-public nanodbc-for-irods + (package + (inherit nanodbc) + (arguments + `(#:tests? #false + #:configure-flags + '("-DBUILD_SHARED_LIBS=ON" + ;; The tests require ODBC backends to be installed. + "-DNANODBC_DISABLE_TESTS=ON" + "-DCMAKE_CXX_COMPILER=clang++" + "-DCMAKE_CXX_FLAGS=-stdlib=libc++" + "-DCMAKE_EXE_LINKER_FLAGS=-lc++abi") + #:phases + (modify-phases %standard-phases + (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH + (lambda* (#:key inputs #:allow-other-keys) + (let ((gcc (assoc-ref inputs "gcc"))) + (setenv "CPLUS_INCLUDE_PATH" + (string-join + (cons (string-append (assoc-ref inputs "libcxx") + "/include/c++/v1") + ;; Hide GCC's C++ headers so that they do not interfere with + ;; the Clang headers. + (delete (string-append gcc "/include/c++") + (string-split (getenv "CPLUS_INCLUDE_PATH") + #\:))) + ":")) + (format #true + "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" + (getenv "CPLUS_INCLUDE_PATH")))))))) + (inputs + `(("unixodbc" ,unixodbc) + ("libcxx" ,libcxx+libcxxabi-6) + ("libcxxabi" ,libcxxabi-6) + ("clang" ,clang-6))))) + (define-public unqlite (package (name "unqlite")