Guest User

Untitled

a guest
Nov 13th, 2018
100
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.57 KB | None | 0 0
  1. $ diff -b -u <(egrep -v '^[ ]*$|^#' usr/src/tools/env/illumos.sh) <(egrep -v '^[ ]*$|^#' illumos.sh)
  2. --- /dev/fd/63 Tue Nov 13 15:46:31 2018
  3. +++ /dev/fd/62 Tue Nov 13 15:46:31 2018
  4. @@ -1,4 +1,4 @@
  5. -export NIGHTLY_OPTIONS='-FnCDAlmprt'
  6. +export NIGHTLY_OPTIONS='-nCDAmprtl'
  7. export CODEMGR_WS="`git rev-parse --show-toplevel`"
  8. function maxjobs
  9. {
  10. @@ -29,7 +29,6 @@
  11. }
  12. maxjobs DMAKE_MAX_JOBS # "DMAKE_MAX_JOBS" passed as ksh(1) name reference
  13. export DMAKE_MAX_JOBS
  14. -ONBLD_BIN='/opt/onbld/bin'
  15. export PARENT_WS=''
  16. export CLONE_WS='ssh://anonhg@hg.illumos.org/illumos-gate'
  17. export STAFFER="$LOGNAME"
  18. @@ -43,7 +42,8 @@
  19. export ROOT="$CODEMGR_WS/proto/root_${MACH}"
  20. export SRC="$CODEMGR_WS/usr/src"
  21. export MULTI_PROTO="no"
  22. -export VERSION="`git describe --long --all HEAD | cut -d/ -f2-`"
  23. +git_version="`git describe --long --all HEAD | cut -d/ -f2-`"
  24. +export VERSION="`basename $CODEMGR_WS`-$git_version"
  25. export PARENT_ROOT="$PARENT_WS/proto/root_$MACH"
  26. export PARENT_TOOLS_ROOT="$PARENT_WS/usr/src/tools/proto/root_$MACH-nd"
  27. export PKGARCHIVE="${CODEMGR_WS}/packages/${MACH}/nightly"
  28. @@ -55,3 +55,11 @@
  29. export SPRO_ROOT='/opt/SUNWspro'
  30. export SPRO_VROOT="$SPRO_ROOT"
  31. export ENABLE_SMB_PRINTING=
  32. +export PKGVERS_BRANCH=9999.99.0.0
  33. +export PERL_VERSION="5.22"
  34. +export PERL_PKGVERS="-522"
  35. +export BLD_JAVA_8=
  36. +export PRIMARY_CC=gcc4,/opt/gcc/4.4.4/bin/gcc,gnu
  37. +export PRIMARY_CCC=gcc4,/opt/gcc/4.4.4/bin/g++,gnu
  38. +export SHADOW_CCS=gcc7,/usr/gcc/7/bin/gcc,gnu
  39. +export SHADOW_CCCS=gcc7,/usr/gcc/7/bin/g++,gnu
Add Comment
Please, Sign In to add comment