guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: gnu: isc-dhcp: Fix cross-compilation to powerpc-l


From: guix-commits
Subject: branch master updated: gnu: isc-dhcp: Fix cross-compilation to powerpc-linux.
Date: Wed, 18 Oct 2023 07:44:14 -0400

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 1076f32111 gnu: isc-dhcp: Fix cross-compilation to powerpc-linux.
1076f32111 is described below

commit 1076f32111e512ed437f135c9eb6ce2daaafd623
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed Oct 18 14:21:10 2023 +0300

    gnu: isc-dhcp: Fix cross-compilation to powerpc-linux.
    
    * gnu/packages/admin.scm (isc-dhcp)[arguments]: Adjust the custom
    'fix-bind-cross-compilation phase to force linking with '-latomic' when
    building for powerpc-linux.
---
 gnu/packages/admin.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 05e3936b0a..4f55c926fe 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1479,14 +1479,18 @@ connection alive.")
                  (("^RELEASEVER=.*")
                   (format #f "RELEASEVER=~a\n" ,bind-release-version)))))
            ,@(if (%current-target-system)
-                 '((add-before 'configure 'fix-bind-cross-compilation
+                 `((add-before 'configure 'fix-bind-cross-compilation
                      (lambda _
                        (substitute* "configure"
                          (("--host=\\$host")
                           "--host=$host_alias"))
                        ;; BIND needs a native compiler because the DHCP
                        ;; build system uses the built 'gen' executable.
-                       (setenv "BUILD_CC" "gcc"))))
+                       (setenv "BUILD_CC" "gcc")
+                       ;; powerpc-linux needs to be told to use -latomic.
+                       ,@(if (target-ppc32?)
+                           `((setenv "LIBS" "-latomic"))
+                           '()))))
                  '())
            (add-before 'configure 'update-config-scripts
              (lambda* (#:key native-inputs inputs #:allow-other-keys)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]