tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

gnu: httptunnel: Fix build by applying CFLAGS.

Browse Source 
* gnu/packages/web.scm (httptunnel): Fix build and modernize package.
[source]<origin>: Switch to https; use G-Expressions in ’snippet.
[arguments]: Use G-Expressions.
<#:phases>: Fix 'configure.
[home-page]: Switch to https.

Merges guix/guix!7417

Change-Id: If82232e402fbc6791a6f089558afc3ab007d8247
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
This commit is contained in:
Hugo Buddelmeijer
2026-03-22 22:28:57 +01:00
committed by Cayetano Santos
parent 9f19f69fe5
commit 09eb32b167
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gnu/packages/web.scm
View File

@@ -7219,29 +7219,33 @@ multicore machines.")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://www.nocrew.org/software/httptunnel/" ;; git repository has no tags, so difficult to figure out which commit
;; corresponds to which version.
(uri (string-append "https://www.nocrew.org/software/httptunnel/"
name "-" version ".tar.gz")) name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0mn5s6p68n32xzadz6ds5i6bp44dyxzkq68r1yljlv470jr84bql")) "0mn5s6p68n32xzadz6ds5i6bp44dyxzkq68r1yljlv470jr84bql"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet '(begin
;; Remove non-free IETF RFC documentation. ;; Remove non-free IETF RFC documentation.
(delete-file-recursively "doc") (snippet #~(delete-file-recursively "doc"))))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (list
(modify-phases %standard-phases #:phases
#~(modify-phases %standard-phases
;; The default configure phase tries to pass environment variables as ;; The default configure phase tries to pass environment variables as
;; command-line arguments, which confuses the ./configure script. ;; command-line arguments, which confuses the ./configure script.
(replace 'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let* ((out (assoc-ref outputs "out")))
(setenv "CONFIG_SHELL" (which "bash")) (setenv "CONFIG_SHELL" (which "bash"))
(setenv "CFLAGS" (string-append
"-O2 -g "
"-Wno-error=implicit-int "
"-Wno-error=implicit-function-declaration"))
(invoke "./configure" (invoke "./configure"
(string-append "--prefix=" out)))))))) (string-append "--prefix=" #$output)))))))
(home-page "http://www.nocrew.org/software/httptunnel.html") (home-page "https://www.nocrew.org/software/httptunnel.html")
(synopsis "Tunnel data connections through HTTP requests") (synopsis "Tunnel data connections through HTTP requests")
(description "httptunnel creates a bidirectional virtual data connection (description "httptunnel creates a bidirectional virtual data connection
tunnelled through HTTP (HyperText Transfer Protocol) requests. This can be tunnelled through HTTP (HyperText Transfer Protocol) requests. This can be