Skip to content
This repository has been archived by the owner on Apr 25, 2020. It is now read-only.

Commit

Permalink
Update readme to reflect changes to min version + where gcc9 is found…
Browse files Browse the repository at this point in the history
… + fix the utils checks for a compatible release
  • Loading branch information
danielhams committed Oct 31, 2019
1 parent ae2b571 commit 21e840b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 27 deletions.
4 changes: 2 additions & 2 deletions DidbsUtils.pm
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ sub compatibledidbscurrent
my($dirMajVer,$dirGenVer,$dirMinVer,$dirRest) =
$dirBehindLink =~ m/(\d)_(\d)_(\d)[^_]*(_.+)/;
$verbose && didbsprint "Matched $dirMajVer $dirGenVer $dirMinVer $dirRest\n";
if( $dirRest == "_n32_mips3_mp" ) {
$verbose && didbsprint "Elf width, ISA + compiler OK\n";
if( rindex($dirRest,"_n32_mips3_") == 0 ) {
$verbose && didbsprint "Elf width, ISA OK\n";
# Version check min is 0.1.7 (starting from 0.1.7)
# due to the need for a particular didbs perl version.
# max is current script minus one
Expand Down
35 changes: 10 additions & 25 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,30 @@ Be aware - this build process will create the exact same content that may be fou
* Roughly 20Gb diskspace
* Minimum of ~2Gb of RAM
* Beefy CPU if you want to build everything (2*600mhz min)
* A previously extracted didbs release >= 0.1.6-n32-m3mp (n32, mips3, MIPSpro)
* A previously extracted didbs release appropriate for your build >= 0.1.7-n32-m3gcc (n32, mips3, MIPSpro or gcc depending on taste)

If you are looking for an already built didbs release - didbs releases are posted on the SGUG (Silicon Graphics User Group) forums in the development section [here](https://forums.sgi.sh/).

Suggested approach:

(1) Do everything as your user, I do not recommend use of root or installing into /usr/local or other existing directories. If you have to do things as root, I consider that a bug!

(Example for n32, mips3, mipspro)
(Example for n32, mips3, gcc)
```
* As root
* Create /usr/didbs
* chown myuser:people /usr/didbs # (have to do this as root, of course)
* As your user
* Extract previous didbs release
* cd /usr/didbs; tar xf usr-didbs-0.1.6-n32m3mp.tar.gz
* cd /usr/didbs; tar xf usr-didbs-0.1.7-n32m3gcc.tar.gz
* Link up a "current"
* cd /usr/didbs; ln -s 0_1_6_n32_mips3_mp current
* cd /usr/didbs; ln -s 0_1_7_n32_mips3_gcc current
* (Setup paths to include the bin and lib32 of the above)
* cd ~; git clone https://github.com/danielhams/didbs.git
* cd ~/didbs
* echo "DIDBS_JOBS=N" >overrideenv.vars
* For above, set the DIDBS_JOBS to CPU+1, or just one if RAM is < 512Mb
* ./bootstrap.pl -p /usr/didbs/0_1_package -b /usr/didbs/0_*_*_n32_mips3_mp_build -i /usr/didbs/0_*_*_n32_mips3_mp -e n32 -a mips3 -c mipspro # (replace * - this sets up paths)
* ./bootstrap.pl -p /usr/didbs/0_1_package -b /usr/didbs/0_*_*_n32_mips3_gcc_build -i /usr/didbs/0_*_*_n32_mips3_gcc -e n32 -a mips3 -c gcc # (replace * - this sets up paths)
* ./bootstrap.pl # (This builds the stage1 then release packages)
```

Expand All @@ -48,20 +48,11 @@ Suggested approach:
You'll need to setup your environment to pull the right directories (bash example):

```
* export PATH=/usr/didbs/0_*_*_n32_mips3_mp/bin:$PATH
* export LD_LIBRARYN32_PATH=/usr/didbs/0_*_*_n32_mips3_mp/lib32:$LD_LIBRARYN32_PATH
* export PKG_CONFIG_PATH=/usr/didbs/0_*_*_n32_mips3_mp/lib32/pkgconfig:$PKG_CONFIG_PATH
* export PATH=/usr/didbs/0_*_*_n32_mips3_gcc/bin:$PATH
* export LD_LIBRARYN32_PATH=/usr/didbs/0_*_*_n32_mips3_gcc/lib32:$LD_LIBRARYN32_PATH
* export PKG_CONFIG_PATH=/usr/didbs/0_*_*_n32_mips3_gcc/lib32/pkgconfig:$PKG_CONFIG_PATH
If you want to use the included gcc(4|5|8|9) - after building they may be found here (so add to PATH and LD_LIBRARYN32_PATH as well):
gcc4 actual -> /usr/didbs/0_*_*_n32_mips3_mp/gbs4_2
gcc5 actual -> /usr/didbs/0_*_*_n32_mips3_mp/gbs5_0
(gcc5 is a special case, and requires the gcc4 paths afterwards to pick up the binutils/gdb there)
gcc8 actual -> /usr/didbs/0_*_*_n32_mips3_mp/gbs8_1
gcc9 actual -> /usr/didbs/0_*_*_n32_mips3_mp/gbs9_1
GCC9 is now included within the regular `bin` and `lib32` directories - no additional PATH or LD_LIBRARYN32_PATH entries required.
```

## Troubleshooting
Expand All @@ -74,10 +65,7 @@ To find the mkheaders script a command like this (from /usr/didbs/current) will

```
/usr/didbs/current $ find . -name mkheaders
./gbs4_2/libexec/gcc/mips-sgi-irix6.5/4.8.2/install-tools/mkheaders
./gbs5_0/libexec/gcc/mips-sgi-irix6.5/5.4.0/install-tools/mkheaders
./gbs8_1/libexec/gcc/mips-sgi-irix6.5/8.2.0/install-tools/mkheaders
./gbs9_1/libexec/gcc/mips-sgi-irix6.5/9.2.0/install-tools/mkheaders
./libexec/gcc/mips-sgi-irix6.5/9.2.0/install-tools/mkheaders
/usr/didbs/current $
```
Expand All @@ -103,6 +91,3 @@ Now move into the gcc version you want to update and run the mkheaders script fr


eof



0 comments on commit 21e840b

Please sign in to comment.