all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Sharlatan Hellseher <sharlatanus@gmail.com>
To: 62247@debbugs.gnu.org
Cc: Sharlatan Hellseher <sharlatanus@gmail.com>
Subject: [bug#62247] [PATCH 1/2] gnu: haproxy: Update to 2.7.5.
Date: Fri, 17 Mar 2023 22:03:56 +0000	[thread overview]
Message-ID: <20230317220357.7471-1-sharlatanus@gmail.com> (raw)
In-Reply-To: <20230317220247.7388-1-sharlatanus@gmail.com>

* gnu/packages/networking.scm (haproxy): Update to 2.7.4.
  [arguments]: Use Gexp.
  <make-flags>: Add extra build options 'USE_PCRE2_JIT' enables JIT for
  faster regex on libpcre2, 'USE_PROMEX' enables the Prometheus
  exporter. Set CC to use cc-for-target, point 'LUA_INC' and 'LUA_LIB'
  to corresponded '/include' and '/lib' outputs of Lua. Replace
  'USE_PCRE_2' by correct option 'USE_PCRE2'.
---
 gnu/packages/networking.scm | 50 +++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 3fac05c411..feff20afb1 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -4243,30 +4243,36 @@ (define-public vde2
 (define-public haproxy
   (package
     (name "haproxy")
-    (version "2.1.7")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://www.haproxy.org/download/"
-                                  (version-major+minor version)
-                                  "/src/haproxy-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0fd3c1znid5a9w3gcf77b85hm2a2558w9s02c4b7xzkmivqnqbir"))))
+    (version "2.7.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://www.haproxy.org/download/"
+                           (version-major+minor version)
+                           "/src/haproxy-" version ".tar.gz"))
+       (sha256
+        (base32 "00j5lwvrf8lgfid3108gclxbd46v3mnd4lh0lw4l0nn3f0rf9ip2"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:make-flags
-       (let* ((out (assoc-ref %outputs "out")))
-         (list (string-append "PREFIX=" out)
-               (string-append "DOCDIR=" out "/share/" ,name)
-               "TARGET=linux-glibc"
-               "USE_LUA=1"
-               "USE_OPENSSL=1"
-               "USE_ZLIB=1"
-               "USE_PCRE_2=1"))
-       #:tests? #f  ; there are only regression tests, using varnishtest
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure))))
+     (list
+      #:tests? #f  ; there are only regression tests, using varnishtest
+      #:make-flags
+      #~(list "LUA_LIB_NAME=lua"
+              "TARGET=linux-glibc"
+              "USE_LUA=1"
+              "USE_OPENSSL=1"
+              "USE_PCRE2=1"
+              "USE_PCRE2_JIT=1"
+              "USE_PROMEX=1"
+              "USE_ZLIB=1"
+              (string-append "CC=" #$(cc-for-target))
+              (string-append "DOCDIR=" #$output "/share/" #$name)
+              (string-append "LUA_INC=" #$(this-package-input "lua") "/include")
+              (string-append "LUA_LIB=" #$(this-package-input "lua") "/lib")
+              (string-append "PREFIX=" #$output))
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure))))
     (inputs
      (list lua openssl pcre2 zlib))
     (home-page "https://www.haproxy.org/")
-- 
2.39.2





  reply	other threads:[~2023-03-17 22:05 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-17 22:02 [bug#62247] [PATCH 0/2]: gnu: haproxy: Update to 2.7.5 Sharlatan Hellseher
2023-03-17 22:03 ` Sharlatan Hellseher [this message]
2023-03-17 22:03   ` [bug#62247] [PATCH 2/2] gnu: haproxy: Move to (gnu packages high-availability) Sharlatan Hellseher
2023-03-26 21:30 ` bug#62247: [PATCH 0/2]: gnu: haproxy: Update to 2.7.5 Ludovic Courtès

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=20230317220357.7471-1-sharlatanus@gmail.com \
    --to=sharlatanus@gmail.com \
    --cc=62247@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.