Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add motif as external... #40

Merged
merged 2 commits into from
May 14, 2024
Merged

Add motif as external... #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31cc0df
motif as external...
marcmengel Apr 29, 2024
dbd589e
add generated files, make motif:buildable: False
marcmengel Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/make_packages_yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)$'
Expand Down
1 change: 1 addition & 0 deletions templates/packagelist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions templates/packages.yaml.almalinux9
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions templates/packages.yaml.scientific7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down