Magellan Linux

Diff of /smage/trunk/extras/cargo/cargo-0.23.0-r1.smage2

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

revision 11669 by niro, Fri Dec 29 12:49:01 2017 UTC revision 11670 by niro, Wed Jan 10 10:13:12 2018 UTC
# Line 15  BOOTSTRAP=1 Line 15  BOOTSTRAP=1
15    
16  DEPEND=">= dev-lang/rust-1.22  DEPEND=">= dev-lang/rust-1.22
17   >= net-misc/curl-7   >= net-misc/curl-7
18   >= net-misc/curl-dev-7"   >= net-misc/curl-dev-7
19     >= net-libs/libssh2-1.8
20     >= dev-libs/openssl-1.1
21     >= sys-libs/zlib-1.2"
22    
23  SDEPEND=">= dev-util/cmake-3.6  SDEPEND=">= dev-util/cmake-3.6
24   >= dev-lang/python-2.7"   >= dev-libs/openssl-dev-1.1
25     >= net-libs/libssh2-dev-1.8
26     >= sys-libs/zlib-dev-1.2"
27    
28  if [[ ${BOOTSTRAP} = 0 ]]  if [[ ${BOOTSTRAP} = 0 ]]
29  then  then
# Line 70  src_compile() Line 75  src_compile()
75  {  {
76   cd ${SRCDIR}   cd ${SRCDIR}
77    
78   local myconf   local cargo
   
  # enforce rust-bin chost  
  local myARCH  
  [[ ${ARCH} = i*86 ]] && myARCH=i686  
  myconf+=" --host=${myARCH}-unknown-linux-gnu --build=${myARCH}-unknown-linux-gnu"  
   
79   if [[ ${BOOTSTRAP} = 1 ]]   if [[ ${BOOTSTRAP} = 1 ]]
80   then   then
81   myconf+=" --cargo=${CARGOBIN_SRCDIR}/cargo/bin/cargo"   cargo="${CARGOBIN_SRCDIR}/cargo/bin/cargo"
82     else
83     cargo="/usr/bin/cargo"
84   fi   fi
85    
86   mconfigure \   ${cargo} build --release --verbose || die
  --release-channel=stable \  
  --enable-optimize \  
  ${myconf} \  
  || die  
   
  mmake VERBOSE=1 || die  
87  }  }
88    
89  src_install()  src_install()
90  {  {
91   cd ${SRCDIR}   cd ${SRCDIR}
92    
93   local myARCH   minstallexec target/release/cargo || die
94   [[ ${ARCH} = i*86 ]] && myARCH=i686   minstallman src/etc/man/* || die
95   make prepare-image-${myARCH}-unknown-linux-gnu IMGDIR_${myARCH}-unknown-linux-gnu=${BINDIR}/usr || die   minstalldocs ARCHITECTURE* CONTRIBUTING* LICENSE* README* || die
   
  # remove unnecessary files  
  mdelete -r /usr/etc || die  
   
  minstalldocs LICENSE-* || die  
96  }  }

Legend:
Removed from v.11669  
changed lines
  Added in v.11670