ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: glibc: Absorb powerpc patch.

Browse source 
* gnu/packages/base.scm (glibc)[source]: Add patch.
[arguments]: Remove 'apply-patch phase.
[native-inputs]: Remove patch file.
* gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash,
glibc-final)[native-inputs]: Remove patch file.
This commit is contained in:
Efraim Flashner 2021-03-24 15:38:17 +02:00
parent 2aab587f84
commit 0e2b817732
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
2 changed files with 3 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/base.scm
View file

@ -678,7 +678,8 @@ (define-public glibc
(sha256 (sha256
(base32 (base32
"0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn")) "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn"))
(patches (search-patches "glibc-ldd-x86_64.patch" (patches (search-patches "glibc-ldd-powerpc.patch"
"glibc-ldd-x86_64.patch"
"glibc-dl-cache.patch" "glibc-dl-cache.patch"
"glibc-hidden-visibility-ldconfig.patch" "glibc-hidden-visibility-ldconfig.patch"
"glibc-versioned-locpath.patch" "glibc-versioned-locpath.patch"
@ -874,14 +875,6 @@ (define (linker-script? file)
(map (cut string-append slib "/" <>) (map (cut string-append slib "/" <>)
files)))))) files))))))
,@(if (target-powerpc?)
'((add-after 'unpack 'apply-patch
(lambda* (#:key inputs #:allow-other-keys)
(let ((patch (assoc-ref inputs
"powerpc64le-patch")))
(invoke "patch" "--force" "-p1"
"-i" patch)))))
'())
,@(if (hurd-target?) ,@(if (hurd-target?)
'((add-after 'install 'augment-libc.so '((add-after 'install 'augment-libc.so
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -902,10 +895,6 @@ (define (linker-script? file)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("python" ,python-minimal) ("python" ,python-minimal)
,@(if (target-powerpc?)
`(("powerpc64le-patch" ,@(search-patches
"glibc-ldd-powerpc.patch")))
'())
,@(if (hurd-target?) ,@(if (hurd-target?)
`(("mig" ,mig) `(("mig" ,mig)
("perl" ,perl)) ("perl" ,perl))

10
gnu/packages/commencement.scm
View file

@ -3218,11 +3218,7 @@ (define glibc-final-with-bootstrap-bash
`(("bison" ,bison-boot0) `(("bison" ,bison-boot0)
("texinfo" ,texinfo-boot0) ("texinfo" ,texinfo-boot0)
("perl" ,perl-boot0) ("perl" ,perl-boot0)
("python" ,python-boot0) ("python" ,python-boot0)))
,@(if (target-powerpc?)
`(("powerpc64le-patch" ,@(search-patches
"glibc-ldd-powerpc.patch")))
'())))
(inputs (inputs
`( ;; The boot inputs. That includes the bootstrap libc. We don't want `( ;; The boot inputs. That includes the bootstrap libc. We don't want
;; it in $CPATH, hence the 'pre-configure' phase above. ;; it in $CPATH, hence the 'pre-configure' phase above.
@ -3366,10 +3362,6 @@ (define glibc-final
;; This time we need 'msgfmt' to install all the libc.mo files. ;; This time we need 'msgfmt' to install all the libc.mo files.
(native-inputs `(,@(package-native-inputs glibc-final-with-bootstrap-bash) (native-inputs `(,@(package-native-inputs glibc-final-with-bootstrap-bash)
,@(if (target-powerpc?)
`(("powerpc64le-patch" ,@(search-patches
"glibc-ldd-powerpc.patch")))
'())
("gettext" ,gettext-boot0))) ("gettext" ,gettext-boot0)))
(propagated-inputs (propagated-inputs