From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48302) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX9S3-0004IA-QB for guix-patches@gnu.org; Thu, 04 Jan 2018 12:37:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eX9Rv-0000HU-5s for guix-patches@gnu.org; Thu, 04 Jan 2018 12:37:11 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:55472) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eX9Ru-0000HH-St for guix-patches@gnu.org; Thu, 04 Jan 2018 12:37:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eX9Ru-0004t1-JE for guix-patches@gnu.org; Thu, 04 Jan 2018 12:37:02 -0500 Subject: [bug#29982] [PATCH] gnu: ao-cad: Update and fix for aarch64. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX9Qi-0003Ky-HF for guix-patches@gnu.org; Thu, 04 Jan 2018 12:35:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eX9Qd-000755-H7 for guix-patches@gnu.org; Thu, 04 Jan 2018 12:35:48 -0500 Received: from esa1.cray.iphmx.com ([68.232.142.33]:25849) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1eX9Qc-00072e-Uj for guix-patches@gnu.org; Thu, 04 Jan 2018 12:35:43 -0500 Received: from pe06.us.cray.com (pe06.us.cray.com [172.30.79.74]) by sealmr01.us.cray.com (8.14.3/8.13.8/hubv3-LastChangedRevision: 16250) with ESMTP id w04HZeiw029509 for ; Thu, 4 Jan 2018 09:35:41 -0800 Date: Thu, 4 Jan 2018 11:35:40 -0600 From: Eric Bavier Message-ID: <20180104173540.GJ188239@pe06.us.cray.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="V0207lvV8h4k8FAm" Content-Disposition: inline List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 29982@debbugs.gnu.org --V0207lvV8h4k8FAm Content-Type: text/plain; charset=us-ascii Content-Disposition: inline This patch updates the 'ao-cad' package snapshot and fixes the build for aarch64. This could be split into two commits if desired. -- Eric Bavier, Scientific Libraries, Cray Inc. --V0207lvV8h4k8FAm Content-Type: text/x-patch; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-ao-cad-Update-and-fix-for-aarch64.patch" >From 686fd80fdc3e507c78ca0592ddf248c49a2e04ef Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 14 Dec 2017 17:03:58 -0600 Subject: [PATCH] gnu: ao-cad: Update and fix for aarch64. * gnu/packages/patches/ao-cad-aarch64-support.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/engineering.scm (ao-cad)[source]: Use it. Update snapshot to fb288c9. Use VCS helpers for version and file-name. [arguments]: Add 'remove-native-compilation' phase. --- gnu/local.mk | 1 + gnu/packages/engineering.scm | 22 ++++++++++++---------- gnu/packages/patches/ao-cad-aarch64-support.patch | 18 ++++++++++++++++++ 3 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/ao-cad-aarch64-support.patch diff --git a/gnu/local.mk b/gnu/local.mk index d02cb3449..952fe3c61 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -538,6 +538,7 @@ dist_patch_DATA = \ %D%/packages/patches/agg-am_c_prototype.patch \ %D%/packages/patches/ansible-wrap-program-hack.patch \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ + %D%/packages/patches/ao-cad-aarch64-support.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \ %D%/packages/patches/ath9k-htc-firmware-binutils.patch \ diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 77b1386b5..61abd6058 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -559,10 +559,11 @@ as well as pick-place files.") (license license:gpl2+))) (define-public ao - (let ((commit "0bc2354b8dcd1a82a0fd6647706b126045e52734")) + (let ((commit "fb288c945aa7e30d9be10a564edad7e1b6a6c1ae") + (revision "1")) (package (name "ao-cad") ;XXX: really "ao", but it collides with libao - (version (string-append "0." (string-take commit 7))) + (version (git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -570,8 +571,9 @@ as well as pick-place files.") (commit commit))) (sha256 (base32 - "0lm7iljklafs8dhlvaab2yhwx4xymrdjrqk9c5xvn59hlvbgl1j5")) - (file-name (string-append name "-" version "-checkout")) + "0syplfqiq7ng7md44yriq5cz41jp8q9z3pl2iwkkllds6p9ylyal")) + (file-name (git-file-name name version)) + (patches (search-patches "ao-cad-aarch64-support.patch")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries: Eigen, glm, and catch. TODO: @@ -594,6 +596,10 @@ as well as pick-place files.") #:phases (modify-phases %standard-phases + (add-after 'unpack 'remove-native-compilation + (lambda _ + (substitute* "CMakeLists.txt" (("-march=native") "")) + #t)) (add-before 'build 'add-eigen-to-search-path (lambda* (#:key inputs #:allow-other-keys) ;; Allow things to find our own Eigen and Catch. @@ -615,16 +621,12 @@ as well as pick-place files.") (with-directory-excursion ,(string-append "../" name "-" version "-checkout") - (substitute* "bind/guile/ao/bind.scm" + (substitute* "bind/guile/ao/sys/libao.scm" (("\\(define libao \\(dynamic-link .*$") (string-append "(define libao (dynamic-link \"" out "/lib/libao\")) ;"))) - (for-each (lambda (file) - (install-file file - (string-append moddir - "/ao"))) - (find-files "bind/guile" "\\.scm$")) + (copy-recursively "bind/guile/ao" (string-append moddir "/ao")) (substitute* "bin/ao-guile" (("\\(add-to-load-path .*") diff --git a/gnu/packages/patches/ao-cad-aarch64-support.patch b/gnu/packages/patches/ao-cad-aarch64-support.patch new file mode 100644 index 000000000..291369cd9 --- /dev/null +++ b/gnu/packages/patches/ao-cad-aarch64-support.patch @@ -0,0 +1,18 @@ +Support in ao-cad for aarch64. + +Submitted upstream at https://github.com/mkeeter/ao/issues/69 + +--- ao/ui/vendor/efsw/src/efsw/inotify-nosys.h.orig 2017-12-14 16:27:16.125871099 -0600 ++++ ao/ui/vendor/efsw/src/efsw/inotify-nosys.h 2017-12-14 16:26:39.786022981 -0600 +@@ -69,6 +69,11 @@ + # define __NR_inotify_add_watch (__NR_SYSCALL_BASE+317) + # define __NR_inotify_rm_watch (__NR_SYSCALL_BASE+318) + ++#elif defined (__aarch64__) ++# define __NR_inotify_init 1043 ++# define __NR_inotify_add_watch 27 ++# define __NR_inotify_rm_watch 28 ++ + #elif defined (__frv__) + # define __NR_inotify_init 291 + # define __NR_inotify_add_watch 292 -- 2.15.0 --V0207lvV8h4k8FAm--