Merge pull request #40 from FNALssi/motif_external

Add motif as external...
FNALssi · May 14, 2024 · 8b17790 · 8b17790
2 parents 361472c + dbd589e
commit 8b17790
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/bin/make_packages_yaml b/bin/make_packages_yaml
@@ -58,7 +58,7 @@ fi
 dst=$1/etc/spack/${sd}${os}/packages.yaml
 
 # packages to make not buildable
-force_system='^(bdftopcf|damageproto|diffutils|expat|findutils|font-util|gdbm|gettext|libc|libfontenc|libice|libx11|libxau|libxcb|libxdamage|libxdmcp|libxext|libxfixes|libxfont|libxkbcommon|libxmu|libxpm|libxrandr|libxrender|libxshmfence|libxt|libxv|libxvmc|libxxf86vm|mesa-glu|mkfontdir|mkfontscale|openssl|pkg-config|pkgconf|tar|tcl|tk|xcb-util-(image|keysyms|renderutil|wm)|xextproto|xorg-server|xproto|xproxymanagementprotocol|xrandr|xtrans|zlib)$'
+force_system='^(bdftopcf|damageproto|diffutils|expat|findutils|font-util|gdbm|gettext|libc|libfontenc|libice|libx11|libxau|libxcb|libxdamage|libxdmcp|libxext|libxfixes|libxfont|libxkbcommon|libxmu|libxpm|libxrandr|libxrender|libxshmfence|libxt|libxv|libxvmc|libxxf86vm|mesa-glu|mkfontdir|mkfontscale|motif|openssl|pkg-config|pkgconf|tar|tcl|tk|xcb-util-(image|keysyms|renderutil|wm)|xextproto|xorg-server|xproto|xproxymanagementprotocol|xrandr|xtrans|zlib)$'
 
 # packages to force target (instead of merely preferred)
 force_x86_64='^(hwloc|libpciaccess|libsigsegv)$'

diff --git a/templates/packagelist b/templates/packagelist
@@ -81,6 +81,7 @@ mesa-libGL:mesa:$0-devel
 meson:meson:$0
 (xorg-x11-font-utils|mkfontscale):mkfontdir:$0
 (xorg-x11-font-utils|mkfontscale):mkfontscale:$0
+motif:motif:$0
 mpich(-[0-9.]+)?:mpich:$0-devel
 nasm:nasm:$0
 ninja-build:ninja:$0

diff --git a/templates/packages.yaml.almalinux9 b/templates/packages.yaml.almalinux9
@@ -322,6 +322,11 @@ packages:
     - spec: "mkfontscale @1.2.1 %gcc@11 os=almalinux9"
       prefix: /usr
     buildable: False
+  motif:
+    externals:
+    - spec: "motif @2.3.4 %gcc@11 os=almalinux9"
+      prefix: /usr
+    buildable: False
   nasm:
     externals:
     - spec: "nasm @2.15.03 %gcc@11 os=almalinux9"

diff --git a/templates/packages.yaml.scientific7 b/templates/packages.yaml.scientific7
@@ -315,6 +315,11 @@ packages:
     - spec: "mkfontscale @7.5 %[email protected] os=scientific7"
       prefix: /usr
     buildable: False
+  motif:
+    externals:
+    - spec: "motif @2.3.4 %[email protected] os=scientific7"
+      prefix: /usr
+    buildable: False
   mpich:
     externals:
     - spec: "mpich @3.2 %[email protected] os=scientific7"