Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/mage/usr/lib/mage/smage2.functions.sh

    Diff of /trunk/mage/usr/lib/mage/smage2.functions.sh

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 2869 by niro, Fri Mar 20 08:33:42 2015 UTC revision 3179 by niro, Mon Jul 31 09:11:43 2023 UTC
    # Line 261  src_install() Line 261  src_install()
    261    
    262  mlibdir()  mlibdir()
    263  {  {
    264   local libdir=lib   local libdir="${ABI_DEFAULT_LIBDIR}"
    265   [[ ${ARCH} = x86_64 ]] && libdir=lib64   [[ ${ARCH} = i686 ]] && libdir="${ABI_X86_LIBDIR}"
    266     [[ ${ARCH} = x86_64 ]] && libdir="${ABI_X86_64_LIBDIR}"
    267     [[ -n ${ABI_LIBDIR} ]] && libdir="${ABI_LIBDIR}"
    268    
    269   echo "${libdir}"   echo "${libdir}"
    270  }  }
    # Line 391  munpack() Line 393  munpack()
    393   popd > /dev/null   popd > /dev/null
    394   fi   fi
    395   ;;   ;;
    396     lz)
    397     IFTAR="$(basename $SRCFILE .lz)"
    398     IFTAR="${IFTAR##*.}"
    399     if [[ ${IFTAR} = tar ]]
    400     then
    401     tar --no-same-owner -xvf --lzip ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tar.lz unpack failed."
    402     else
    403     pushd ${DEST} > /dev/null
    404     lzip -dc ${SOURCEDIR}/${PNAME}/${SRCFILE} > ${DEST}/$(basename ${SRCFILE} .xz) || die ".lz unpack failed."
    405     popd > /dev/null
    406     fi
    407     ;;
    408   tbz2|mpks|mpk)   tbz2|mpks|mpk)
    409   tar --no-same-owner -xvjf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tbz2 unpack failed."   tar --no-same-owner -xvjf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tbz2 unpack failed."
    410   ;;   ;;
    # Line 498  mstriplibs() Line 512  mstriplibs()
    512    
    513   [[ -z ${stripdir} ]] && stripdir="${BINDIR}"   [[ -z ${stripdir} ]] && stripdir="${BINDIR}"
    514   [[ -z ${STRIP_DYN_LIB} ]] && STRIP_DYN_LIB="--strip-debug"   [[ -z ${STRIP_DYN_LIB} ]] && STRIP_DYN_LIB="--strip-debug"
    515   find ${stripdir} ! -type d | xargs --no-run-if-empty file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs --no-run-if-empty strip ${STRIP_DYN_LIB} 2> /dev/null   find ${stripdir} ! -type d | xargs --no-run-if-empty file | grep "[shared object|pie executable]" | grep ELF | cut -f 1 -d : | xargs --no-run-if-empty strip ${STRIP_DYN_LIB} 2> /dev/null
    516  }  }
    517    
    518  mstripbins()  mstripbins()
    # Line 507  mstripbins() Line 521  mstripbins()
    521    
    522   [[ -z ${stripdir} ]] && stripdir="${BINDIR}"   [[ -z ${stripdir} ]] && stripdir="${BINDIR}"
    523   [[ -z ${STRIP_DYN_BIN} ]] && STRIP_DYN_BIN="--strip-debug"   [[ -z ${STRIP_DYN_BIN} ]] && STRIP_DYN_BIN="--strip-debug"
    524   find ${stripdir} ! -type d | xargs --no-run-if-empty file | grep "executable" | grep ELF | cut -f 1 -d : | xargs --no-run-if-empty strip ${STRIP_DYN_BIN} 2> /dev/null   find ${stripdir} ! -type d | xargs --no-run-if-empty file | grep -v "pie executable" | grep "executable" | grep ELF | cut -f 1 -d : | xargs --no-run-if-empty strip ${STRIP_DYN_BIN} 2> /dev/null
    525  }  }
    526    
    527  mstripstatic()  mstripstatic()
    # Line 595  march() Line 609  march()
    609   return "${retval}"   return "${retval}"
    610  }  }
    611    
    612  marchsrcfile()  marchvariable()
    613  {  {
    614   local retval   local retval
    615   local var="$1"   local var="$1"
    616    
    617   [[ -z ${var} ]] && var="SRCFILE"   [[ -n ${var} ]] || die "marchvariable(): missing variable"
    618    
    619   if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]   if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
    620   then   then
    # Line 613  marchsrcfile() Line 627  marchsrcfile()
    627   return "${retval}"   return "${retval}"
    628  }  }
    629    
    630    marchsrcfile()
    631    {
    632     local retval
    633     local var="$1"
    634    
    635     [[ -z ${var} ]] && var="SRCFILE"
    636    
    637     marchvariable "${var}" || die
    638    }
    639    
    640  marchsrcdir()  marchsrcdir()
    641  {  {
    642   local retval   local retval
    # Line 620  marchsrcdir() Line 644  marchsrcdir()
    644    
    645   [[ -z ${var} ]] && var="SRCDIR"   [[ -z ${var} ]] && var="SRCDIR"
    646    
    647   if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]   marchvariable "${var}" || die
      then  
      eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'  
      retval=0  
      else  
      retval=1  
      fi  
       
      return "${retval}"  
    648  }  }
    649    
    650  marchdepend()  marchdepend()
    Legend:
    Removed from v.2869  
    changed lines
      Added in v.3179