From patchwork Thu Jan 31 16:56:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabriel Hondet X-Patchwork-Id: 931 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 1E1C816B3D; Thu, 31 Jan 2019 17:17:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C939316AB1 for ; Thu, 31 Jan 2019 17:17:11 +0000 (GMT) Received: from localhost ([127.0.0.1]:57868 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpFxf-0007NU-Cw for patchwork@mira.cbaines.net; Thu, 31 Jan 2019 12:17:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpFxW-0007ML-No for guix-patches@gnu.org; Thu, 31 Jan 2019 12:17:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpFxW-00020H-4a for guix-patches@gnu.org; Thu, 31 Jan 2019 12:17:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53980) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gpFxW-00020C-1L for guix-patches@gnu.org; Thu, 31 Jan 2019 12:17:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gpFxV-0006Fy-O1 for guix-patches@gnu.org; Thu, 31 Jan 2019 12:17:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34265] [PATCH 7/9] gnu: ocaml-compiler-libs: Fix libdir install References: <875zu4ycve.fsf@gmail.com> In-Reply-To: <875zu4ycve.fsf@gmail.com> Resent-From: Gabriel Hondet Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Jan 2019 17:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34265 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34265@debbugs.gnu.org Received: via spool by 34265-submit@debbugs.gnu.org id=B34265.154895496623975 (code B ref 34265); Thu, 31 Jan 2019 17:17:01 +0000 Received: (at 34265) by debbugs.gnu.org; 31 Jan 2019 17:16:06 +0000 Received: from localhost ([127.0.0.1]:53261 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gpFwc-0006Ed-5T for submit@debbugs.gnu.org; Thu, 31 Jan 2019 12:16:06 -0500 Received: from mail-wr1-f50.google.com ([209.85.221.50]:44274) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gpFwY-0006Dk-Ig for 34265@debbugs.gnu.org; Thu, 31 Jan 2019 12:16:04 -0500 Received: by mail-wr1-f50.google.com with SMTP id z5so4143560wrt.11 for <34265@debbugs.gnu.org>; Thu, 31 Jan 2019 09:16:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=user-agent:from:to:subject:date:message-id:mime-version; bh=jmus2ilbSNg36TnM46AKum1eJTMjbD5t/YR4oFT3CX8=; b=eZ8sNQyvgYKEB0u5J1czXP6yFdBDW48XjYxMg8D5mshpFUCxlHQdRx/HHll91CPKIX sQblGF/QRq79sXPvRqZoFgg7VdMqGvGfMUOWjPKteeI8+MHBYr9F7BDEefvb7DKAkspz sItlM/+d+rnVD1QfJJUxt3+24naF+xS6wknASpuTSAC4wEhn6NS0W+zI9bX49c0zoDZF vYSG1gQFlkyxDNR2Kr1I7QpGU2sIhg+kLhTn4d1A9HAb8LKKiccFc8IBObAaBvIlt7dH z991vBYHUv09NyLkwBjQ6/+nMkNCb/sfwOWCA0het9wz9jasRcbEAUhA7nPVmfc/jN4b fudA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:user-agent:from:to:subject:date:message-id :mime-version; bh=jmus2ilbSNg36TnM46AKum1eJTMjbD5t/YR4oFT3CX8=; b=eYyow0Mxw8DK3GF8juFWJo2sXUuqCvmVKxUAW52sXLekuXqX8NUTsXVU329x+/YKxv +1tUDm7pyzgXNgbpU3h3KbzLFilaQubiwqecNWcDPX0CLrv6TKZzx58ZnuRx/WDIB8KL RSRlmYiRcscxCvBNv9NEjrYIy1vaGJltSX0Q9CMiXtIWqWKNZ5G4TmqiqADQbTTizFPS dSpi6/DSRH6aW6i3jr0Hxiz2J3PBXK+yXlYGbBJRxvquRuJigvT8Hm+ggyARyYQ7THpt YrLQ5ehtX4y3gooKHkaS50dhU1JPPyl/ZmEycz0nHQ53Q/6JtY8hZscGBf7xuIG3HAF/ 2QGA== X-Gm-Message-State: AHQUAub2qJhSQkYBWDjCV+qhf08aObwbwelVJaba3TA5JQYhuSRSRtP0 bH5XOcsvVyKqQXfGbTs3JBzL17KM X-Google-Smtp-Source: AHgI3IaLurkk0HlT0nTmFFG4bcMP2u4z8kcvjUy2vRZsl9ZfQYLsPpQj4XiRctqpb3tEVWCIiMxsCQ== X-Received: by 2002:a5d:4a0c:: with SMTP id m12mr9765996wrq.38.1548954956556; Thu, 31 Jan 2019 09:15:56 -0800 (PST) Received: from glht-aurore.gmail.com ([217.109.134.89]) by smtp.gmail.com with ESMTPSA id x15sm12813663wrs.27.2019.01.31.09.15.55 for <34265@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Jan 2019 09:15:56 -0800 (PST) User-agent: mu4e 1.0; emacs 26.1 From: Gabriel Hondet Date: Thu, 31 Jan 2019 17:56:43 +0100 Message-ID: <87womkwxx0.fsf@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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/ocaml.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index bf12cc85c..8abbbab71 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5082,7 +5082,18 @@ provided by companion libraries such as "03jds7bszh8wwpfwxb3dg0gyr1j1872wxwx1xqhry5ir0i84bg0s")))) (build-system dune-build-system) (arguments - '(#:tests? #f)) ;no tests + '(#:tests? #f ;no tests + #:phases + (modify-phases %standard-phases + (replace 'install + ;; set libdir to use ocaml-site + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "dune" "install" + (string-append "--prefix=" out) + (string-append "--libdir=" out + "/lib/ocaml/site-lib"))) + #t))))) (synopsis "Compiler libraries repackaged") (description "This packaeg simply repackages the OCaml compiler libraries so they don't expose everything at toplevel. For instance, @code{Ast_helper}