diff options
Diffstat (limited to 'gnu/packages/admin.scm')
| -rw-r--r-- | gnu/packages/admin.scm | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a8d4269fbb..8f72b0eeae 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) @@ -1549,7 +1553,6 @@ connection alive.") (coreutils (assoc-ref inputs "coreutils*")) (inetutils (assoc-ref inputs "inetutils")) (grep (assoc-ref inputs "grep*")) - (net-tools (assoc-ref inputs "net-tools")) (sed (assoc-ref inputs "sed*"))) (substitute* "client/scripts/linux" (("/sbin/ip") @@ -1565,16 +1568,16 @@ connection alive.") ,(map (lambda (dir) (string-append dir "/bin:" dir "/sbin")) - (list inetutils net-tools coreutils grep sed)))))))))) + (list inetutils coreutils grep sed)))))))))) (native-inputs (list config perl file)) (inputs `(("inetutils" ,inetutils) ("bash" ,bash-minimal) - ,@(if (target-hurd?) '() - `(("net-tools" ,net-tools) - ("iproute" ,iproute))) + ,@(if (target-hurd?) + '() + `(("iproute" ,iproute))) ;; isc-dhcp bundles a copy of BIND, which has proved vulnerable ;; in the past. Use a BIND-VERSION of our choosing instead. |