In message <[EMAIL PROTECTED]> on Fri, 13 Dec 2002 18:40:19 +0100, Andy
Polyakov <[EMAIL PROTECTED]> said:
appro> Commited to OpenSSL_0_9_7-stable and will appear in corresponding
appro> snapshot shortly. What's the best way to synchronize it with HEAD? Just
appro> commit same things to HEAD or is it possible somehow to simply tag those
appro> files that are identical between branches?
I've found it easier to have the different branches in different
directories (I've got "openssl" and "openssl-0.9.7-stable" in
parallell), and to use patch to make sure I synchronise everything.
For example, if I change something in openssl-0.9.7-stable:
cvs diff -u | (cd ../openssl; patch -p0)
for x in ../openssl .; do (cd $x; cvs ci -m "<message>"); done
If you're doing it after the fact but happen to have a patch file
around, that's probably the easier way to go. Otherwise, you'll have
to do it file by file where you use -j with the correct revision
numbers. If you feel unsure, I can do it, since I've received the log
mail.
appro> But back to the originating ticket. Shall we add that -shared flag to
appro> gcc command line? What was the consensus?
Uhmm, I thought it already did in 0.9.7? If it doesn't, that's a
fault in Makefile.org. You have to look at the target
do_solaris-shared, and see why ${DETECT_GNU_LD} doesn't detect GNU ld
properly.
Note that, at least as far as I know, the use of -G vs. -shared
greatly depends on which ld is used underneath.
--
Richard Levitte \ Spannv�gen 38, II \ [EMAIL PROTECTED]
Redakteur@Stacken \ S-168 35 BROMMA \ T: +46-8-26 52 47
\ SWEDEN \ or +46-708-26 53 44
Procurator Odiosus Ex Infernis -- [EMAIL PROTECTED]
Member of the OpenSSL development team: http://www.openssl.org/
Unsolicited commercial email is subject to an archival fee of $400.
See <http://www.stacken.kth.se/~levitte/mail/> for more info.
______________________________________________________________________
OpenSSL Project http://www.openssl.org
Development Mailing List [EMAIL PROTECTED]
Automated List Manager [EMAIL PROTECTED]
