[IPCop-cvs] ipcop/lfs openssl,1.6.2.16,1.6.2.17

[Gilles E. <ges...@us...>]

Update of /cvsroot/ipcop/ipcop/lfs
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15265/lfs

Modified Files:
      Tag: IPCOP_v1_4_0
	openssl 
Log Message:
Fix openssl-0.9.7m compilation on alpha
Revert -march=ev to -mcpu=ev as in 0.9.7l

Report send upstream
0.9.8 is already reverted the same way on cvs


Index: openssl
===================================================================
RCS file: /cvsroot/ipcop/ipcop/lfs/openssl,v
retrieving revision 1.6.2.16
retrieving revision 1.6.2.17
diff -C2 -d -r1.6.2.16 -r1.6.2.17
*** openssl	10 Aug 2007 12:21:50 -0000	1.6.2.16
--- openssl	30 Sep 2007 09:27:16 -0000	1.6.2.17
***************
*** 80,87 ****
  	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
  	@rm -rf /etc/ssl
  	cd $(DIR_APP) && sed -i -e 's/-O3/-O2/' -e 's/-m486/-mcpu=i386/' Configure
  	cd $(DIR_APP) && chmod 755 Configure
! 	cd $(DIR_APP) && ./config --openssldir=/etc/ssl --prefix=/usr 386 \
! 	    no-idea no-threads no-mdc2 no-rc5 no-ec zlib-dynamic shared
  	cd $(DIR_APP) && make depend
  	cd $(DIR_APP) && make MANDIR=/usr/share/man
--- 80,95 ----
  	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
  	@rm -rf /etc/ssl
+ 	# we should check if it is still necessary to change s/-O3/-O2/ (commented does not work with SSP 3 years ago)
  	cd $(DIR_APP) && sed -i -e 's/-O3/-O2/' -e 's/-m486/-mcpu=i386/' Configure
+ 	# revert openssl-0.9.7m change mcpu=>march for alpha as our compiler does not support that
+ 	cd $(DIR_APP) && sed -i -e 's/-march=ev/-mcpu=ev/' config
  	cd $(DIR_APP) && chmod 755 Configure
! 	if [ "$(MACHINE)" == "i386" ]; then \
! 		cd $(DIR_APP) && ./config --openssldir=/etc/ssl --prefix=/usr 386 \
! 			no-idea no-threads no-mdc2 no-rc5 no-ec zlib-dynamic shared; \
! 	elif [ "$(MACHINE)" == "alpha" ]; then \
! 		cd $(DIR_APP) && ./config --openssldir=/etc/ssl --prefix=/usr \
! 			no-idea no-threads no-mdc2 no-rc5 no-ec zlib-dynamic shared; \
! 	fi
  	cd $(DIR_APP) && make depend
  	cd $(DIR_APP) && make MANDIR=/usr/share/man