diff options
| -rw-r--r-- | repo/devel/rustc.xibuild | 11 | ||||
| -rw-r--r-- | repo/system/js78.xibuild | 2 | ||||
| -rw-r--r-- | repo/util/bash.xibuild | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/repo/devel/rustc.xibuild b/repo/devel/rustc.xibuild index f6d9bc3..97f6b3f 100644 --- a/repo/devel/rustc.xibuild +++ b/repo/devel/rustc.xibuild @@ -33,10 +33,10 @@ extended = true [install] # Adjust the prefix for the desired destination #prefix = "/usr" -prefix = "/opt/rustc-1.32.0" +prefix = "/opt/rustc-$PKG_VER" # docdir is used even if the full awesome docs are not installed -docdir = "share/doc/rustc-1.32.0" +docdir = "share/doc/rustc-$PKG_VER" [rust] channel = "stable" @@ -72,10 +72,8 @@ pathprepend /opt/rustc/bin PATH # End /etc/profile.d/rustc.sh EOF -} - -postinstall () { -cat >> /etc/ld.so.conf << EOF + mkdir -pv $PKG_DEST/etc/ld.so.conf.d +cat >> $PKG_DEST/etc/ld.so.conf.d/rustc.conf << EOF # Begin rustc addition /opt/rustc/lib @@ -83,5 +81,4 @@ cat >> /etc/ld.so.conf << EOF # End rustc addition EOF -ldconfig } diff --git a/repo/system/js78.xibuild b/repo/system/js78.xibuild index 5fe32a6..ecc21ad 100644 --- a/repo/system/js78.xibuild +++ b/repo/system/js78.xibuild @@ -16,7 +16,7 @@ prepare () { patch -Np1 -i js-$PKG_VER-python_3_10-1.patch mountpoint -q /dev/shm || mount -t tmpfs devshm /dev/shm - + export PATH=/opt/rustc/bin:$PATH } build () { diff --git a/repo/util/bash.xibuild b/repo/util/bash.xibuild index 051379f..8b02e5a 100644 --- a/repo/util/bash.xibuild +++ b/repo/util/bash.xibuild @@ -18,5 +18,5 @@ package () { } postinstall () { - echo "/bin/bash" >> /etc/shells + grep -q "bash" /etc/shells || echo "/bin/bash" >> /etc/shells } |