Magellan Linux

Diff of /branches/magellan-next/core/openssl/openssl-1.0.0a-r1.smage2

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

revision 5998 by niro, Tue Aug 17 22:17:57 2010 UTC revision 5999 by niro, Tue Aug 17 22:28:38 2010 UTC
# Line 27  SRC_URI=( Line 27  SRC_URI=(
27   http://www.openssl.org/source/${SRCFILE}   http://www.openssl.org/source/${SRCFILE}
28   mirror://${PNAME}/${SRCFILE}   mirror://${PNAME}/${SRCFILE}
29   mirror://${PNAME}/openssl-make-certs.sh-${MKCERTS_CVS_REV}   mirror://${PNAME}/openssl-make-certs.sh-${MKCERTS_CVS_REV}
  mirror://${PNAME}/${PNAME}-0.9.8k-libdir.patch  
  mirror://${PNAME}/${PNAME}-0.9.8e-magellan-2.patch  
  mirror://${PNAME}/${PNAME}-0.9.8e-fix-manpages.patch  
30   mirror://${PNAME}/${PNAME}-0.9.8k-binutils-32bit-asm.patch   mirror://${PNAME}/${PNAME}-0.9.8k-binutils-32bit-asm.patch
31   mirror://${PNAME}/${PNAME}-${PVER}-fix-double-free.patch   mirror://${PNAME}/${PNAME}-${PVER}-fix-double-free.patch
32  )  )
# Line 42  src_prepare() Line 39  src_prepare()
39  {  {
40   munpack ${SRCFILE} || die   munpack ${SRCFILE} || die
41    
  # allow variable libdir  
  mpatch ${PNAME}-0.9.8k-libdir.patch || die  
   
  # fix CFLAGS and allow x86_64 multlib builds  
  mpatch ${PNAME}-0.9.8e-magellan-2.patch || die  
   
  # fixes conflicts with perl, shadow and some broken pod files  
  mpatch ${PNAME}-0.9.8e-fix-manpages.patch || die  
   
42   # fixes 32bit issues in md4-x86_64 asm code with newer binutils   # fixes 32bit issues in md4-x86_64 asm code with newer binutils
43   mpatch ${PNAME}-0.9.8k-binutils-32bit-asm.patch || die   mpatch ${PNAME}-0.9.8k-binutils-32bit-asm.patch || die
44    
# Line 64  src_compile() Line 52  src_compile()
52   do   do
53   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}
54    
  local myopts="linux-${ARCH}-${abi}"  
  [[ ${ARCH} = i*86 ]] && myopts="linux-elf"  
   
55   ./Configure \   ./Configure \
56   --openssldir=/etc/ssl \   --openssldir=/etc/ssl \
57   --prefix=/usr \   --prefix=/usr \
58   shared ${myopts} || die   shared thread ${myopts} || die
   
  # do not install libfips  
  sed -i 's%SHLIBDIRS= fips crypto ssl%SHLIBDIRS= crypto ssl%g' Makefile || die  
59    
60   make depend || die   make depend || die
61   done   done

Legend:
Removed from v.5998  
changed lines
  Added in v.5999