From 31cc0df2717389bc126b2b1d5d47a107c31ab077 Mon Sep 17 00:00:00 2001 From: Marc Mengel Date: Mon, 29 Apr 2024 07:55:59 -0500 Subject: [PATCH 1/2] motif as external... --- templates/packagelist | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/packagelist b/templates/packagelist index 31b5328..7cab13f 100644 --- 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 From dbd589e4fdc2c8f69f8c817c09cd62b0c93452be Mon Sep 17 00:00:00 2001 From: Marc Mengel Date: Mon, 29 Apr 2024 08:08:40 -0500 Subject: [PATCH 2/2] add generated files, make motif:buildable: False --- bin/make_packages_yaml | 2 +- templates/packages.yaml.almalinux9 | 5 +++++ templates/packages.yaml.scientific7 | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/bin/make_packages_yaml b/bin/make_packages_yaml index fd9c3cb..1060808 100755 --- 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/packages.yaml.almalinux9 b/templates/packages.yaml.almalinux9 index 0c3d7c5..4d433a6 100644 --- 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 index d348fed..d75d960 100644 --- a/templates/packages.yaml.scientific7 +++ b/templates/packages.yaml.scientific7 @@ -315,6 +315,11 @@ packages: - spec: "mkfontscale @7.5 %gcc@4.8.5 os=scientific7" prefix: /usr buildable: False + motif: + externals: + - spec: "motif @2.3.4 %gcc@4.8.5 os=scientific7" + prefix: /usr + buildable: False mpich: externals: - spec: "mpich @3.2 %gcc@4.8.5 os=scientific7"