Diff for /elwix/build_world.sh between versions 1.4 and 1.7

version 1.4, 2014/09/15 19:06:42 version 1.7, 2021/07/16 18:35:50
Line 42  X_TARGET_CPUTYPE="TARGET_CPUTYPE=${TARGET_CPUTYPE}" Line 42  X_TARGET_CPUTYPE="TARGET_CPUTYPE=${TARGET_CPUTYPE}"
   
 clean_world()  clean_world()
 {  {
        echo "+++ Clean ELWIX World ..."        echo "+++ Clean ELWIX World ... $WORLD"
         rm -rf $WORLD          rm -rf $WORLD
         mkdir -p $WORLD          mkdir -p $WORLD
   
Line 85  build_world() Line 85  build_world()
   
 install_world()  install_world()
 {  {
        echo "+++ Install ELWIX World ..."        echo "+++ Install ELWIX World ... $WORLD"
         cd $BSDSRC          cd $BSDSRC
         env MAKEOBJDIRPREFIX=${BSDOBJ} make \          env MAKEOBJDIRPREFIX=${BSDOBJ} make \
                 TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \                  TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
Line 95  install_world() Line 95  install_world()
         if [ $? -eq 0 ]; then          if [ $? -eq 0 ]; then
                 echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/elwix.ver                  echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/elwix.ver
         fi          fi
   
           echo "+++ Completed ELWIX World ... $WORLD"
 }  }
   
 build_cross()  build_cross()
Line 109  build_cross() Line 111  build_cross()
 export \\  export \\
 _EOF  _EOF
         env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \          env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
                buildenvvars >> ${CENV}                WORLDTMP=${WORLD} buildenvvars >> ${CENV}
         cat >>${CENV} <<_EOF          cat >>${CENV} <<_EOF
 PATH=$WORLD/elwix/pkg/bin:$WORLD/elwix/pkg/sbin:/elwix/pkg/bin:/elwix/pkg/sbin:$PKG/bin:$PKG/sbin:\$PATH:$PATH  PATH=$WORLD/elwix/pkg/bin:$WORLD/elwix/pkg/sbin:/elwix/pkg/bin:/elwix/pkg/sbin:$PKG/bin:$PKG/sbin:\$PATH:$PATH
   
Line 117  if [ -n "\${REPLACE_MAKEOBJDIRPREFIX}" ]; then Line 119  if [ -n "\${REPLACE_MAKEOBJDIRPREFIX}" ]; then
         MAKEOBJDIRPREFIX="\${REPLACE_MAKEOBJDIRPREFIX}"          MAKEOBJDIRPREFIX="\${REPLACE_MAKEOBJDIRPREFIX}"
 fi  fi
   
   export CROSS_WORLD=$WORLD
   export CFLAGS="\$CFLAGS -I\${CROSS_WORLD}/usr/include"
   export LDFLAGS="\$LDFLAGS -L\${CROSS_WORLD}/lib -L\${CROSS_WORLD}/usr/lib"
   
 _EOF  _EOF
         cd -          cd -
         cp ${CENV} ${CBUILD}          cp ${CENV} ${CBUILD}
Line 125  _EOF Line 131  _EOF
         cat >>${CBUILD} <<_EOF          cat >>${CBUILD} <<_EOF
 make \$*  make \$*
 _EOF  _EOF
           echo "+++ Ready cross script ${CBUILD}"
         cat >>${CGBUILD} <<_EOF          cat >>${CGBUILD} <<_EOF
 gmake \$*  gmake \$*
 _EOF  _EOF
           echo "+++ Ready cross script ${CGBUILD}"
         cat >>${CEXEC} <<_EOF          cat >>${CEXEC} <<_EOF
 eval \$*  eval \$*
 _EOF  _EOF
           echo "+++ Ready cross script ${CEXEC}"
         chmod +x ${CBUILD} ${CGBUILD} ${CEXEC} ${CENV}          chmod +x ${CBUILD} ${CGBUILD} ${CEXEC} ${CENV}
         echo "Done."          echo "Done."
 }  }
   
 ### main()  ### main()
   if [ -n "${1}" ]; then
           rm ${WORLD}/elwix.ver
   fi
   
 if ! SnitVer ${WORLD}/elwix.ver; then  if ! SnitVer ${WORLD}/elwix.ver; then
         if [ -z "$1" ]; then          if [ -z "$1" ]; then
                 clean_world                  clean_world

Removed from v.1.4  
changed lines
  Added in v.1.7


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>