mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-05 18:29:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: make-bootstrap: Allow compilation of the statically-link gawk.

Browse source 
Previously, linking would fail due to the '-fno-common' default in GCC 10:

  ld: /gnu/store/…-glibc-2.33-static/lib/libc.a(getopt.o): in function `_getopt_internal_r':
  (.text+0x6e0): multiple definition of `_getopt_internal_r'; support/libsupport.a(getopt.o):/tmp/guix-build-gawk-5.1.0.drv-0/gawk-5.1.0/support/getopt.c:404: first defined here
  ld: /gnu/store/…-glibc-2.33-static/lib/libc.a(getopt.o): in function `_getopt_internal':

Reported by Thiago Jung Bauermann <bauermann@kolabnow.com>.

* gnu/packages/make-bootstrap.scm (%static-inputs) <gawk>: Remove
getopt.o from libsupport.a.
This commit is contained in:
Ludovic Courtès 2021-09-28 23:41:10 +02:00
parent 3f78935275
commit 7d30e6e5c2
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/make-bootstrap.scm
View file

@ -206,8 +206,17 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(("^xz_LDADD =") (("^xz_LDADD =")
"xz_LDADD = -all-static")) "xz_LDADD = -all-static"))
#t))))))) #t)))))))
(gawk (package (inherit gawk) (gawk (package
(source (origin (inherit (package-source gawk)) (inherit gawk)
(source (origin
(inherit (package-source gawk))
(modules '((guix build utils)))
(snippet
;; Do not build 'getopt.c' since that leads to a
;; link failure due to duplicate symbols with
;; 'libc.a'.
'(substitute* "support/Makefile.in"
(("getopt\\.\\$\\(OBJEXT\\)") "")))
(patches (cons (search-patch "gawk-shell.patch") (patches (cons (search-patch "gawk-shell.patch")
(origin-patches (origin-patches
(package-source gawk)))))) (package-source gawk))))))