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 6006 by niro, Tue Aug 17 23:09: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}
30   mirror://${PNAME}/${PNAME}-0.9.8k-libdir.patch   mirror://${PNAME}/${PNAME}-${PVER}-fix-manpages.patch
  mirror://${PNAME}/${PNAME}-0.9.8e-magellan-2.patch  
  mirror://${PNAME}/${PNAME}-0.9.8e-fix-manpages.patch  
31   mirror://${PNAME}/${PNAME}-0.9.8k-binutils-32bit-asm.patch   mirror://${PNAME}/${PNAME}-0.9.8k-binutils-32bit-asm.patch
32   mirror://${PNAME}/${PNAME}-${PVER}-fix-double-free.patch   mirror://${PNAME}/${PNAME}-${PVER}-fix-double-free.patch
33  )  )
# Line 42  src_prepare() Line 40  src_prepare()
40  {  {
41   munpack ${SRCFILE} || die   munpack ${SRCFILE} || die
42    
  # 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  
   
43   # fixes conflicts with perl, shadow and some broken pod files   # fixes conflicts with perl, shadow and some broken pod files
44   mpatch ${PNAME}-0.9.8e-fix-manpages.patch || die   mpatch ${PNAME}-${PVER}-fix-manpages.patch || die
45    
46   # fixes 32bit issues in md4-x86_64 asm code with newer binutils   # fixes 32bit issues in md4-x86_64 asm code with newer binutils
47   mpatch ${PNAME}-0.9.8k-binutils-32bit-asm.patch || die   mpatch ${PNAME}-0.9.8k-binutils-32bit-asm.patch || die
# Line 64  src_compile() Line 56  src_compile()
56   do   do
57   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}
58    
59   local myopts="linux-${ARCH}-${abi}"   ./config \
  [[ ${ARCH} = i*86 ]] && myopts="linux-elf"  
   
  ./Configure \  
60   --openssldir=/etc/ssl \   --openssldir=/etc/ssl \
61   --prefix=/usr \   --prefix=/usr \
62   shared ${myopts} || die   --libdir=$(mlibdir) \
63     shared threads ${myopts} || die
  # do not install libfips  
  sed -i 's%SHLIBDIRS= fips crypto ssl%SHLIBDIRS= crypto ssl%g' Makefile || die  
64    
65   make depend || die   make depend || die
66   done   done
67    
68   mmake -j1 MANDIR=/usr/share/man 'LIBDIR=$(mlibdir)' || die   mmake -j1 MANDIR=/usr/share/man || die
69  }  }
70    
71  src_install()  src_install()
# Line 88  src_install() Line 75  src_install()
75   # needed directories   # needed directories
76   minstalldir /etc/ssl || die   minstalldir /etc/ssl || die
77    
78   mmake -j1 INSTALL_PREFIX=${BINDIR} MANDIR=/usr/share/man 'LIBDIR=$(mlibdir)' install || die   mmake -j1 INSTALL_PREFIX=${BINDIR} MANDIR=/usr/share/man install || die
79    
80   # fix permissions   # fix permissions
81   mchmod 0755 /usr/$(mlibdir)/pkgconfig || die   mchmod 0755 /usr/$(mlibdir)/pkgconfig || die

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