On Fri, 28 Jun 2002, Doug Kaufman wrote:
> On Thu, 27 Jun 2002, Richard Levitte via RT wrote:
>
> > I still don't accept this change, and I've figured out why (I had
I just reviewed the changes that you made as of 30 June 2002. The
changes for makedepend work fine. Compiling the snapshot from 30 June, I
still need to make changes to allow make to go to completion. Test files
for excluded algorithms are still needed in the test directory, since in
the snapshot symbolic links are not installed on unpacking the archive.
This was tested under DJGPP and Cygwin. The attached patch represents
the only changes I see for openssl to compile (with excluded algorithms)
on DJGPP and Cygwin. I have added a new patch for pod2mantest. Since
this includes a new problem, I will submit that separately, with
explanation, to openssl-bugs so a new ticket can be made for it.
Doug
__
Doug Kaufman
Internet: [EMAIL PROTECTED]
--- openssl-0.9.7/Configure.orig Fri Jun 14 13:11:28 2002
+++ openssl-0.9.7/Configure Fri Jun 28 08:33:08 2002
@@ -7,6 +7,7 @@
require 5.000;
use strict;
+use Cwd;
# see INSTALL for instructions.
@@ -1441,10 +1442,18 @@
} else {
my $make_command = "make -f Makefile.ssl PERL=\'$perl\'";
my $make_targets = "";
+ my $skip_dir;
+ my $crypto = "crypto/";
+ my $curr_dir = cwd;
+ my $makefile = "Makefile.ssl";
$make_targets .= " links" if $symlink;
$make_targets .= " depend" if $depflags ne "" && $make_depend;
(system $make_command.$make_targets) == 0 or exit $?
if $make_targets ne "";
+ foreach $skip_dir (@skip) {
+ chdir $crypto.$skip_dir && -e $makefile && system ("make links PERL=\'$perl\'
+-f Makefile.ssl");
+ chdir $curr_dir;
+ }
if ( $perl =~ m@^/@) {
&dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my $dir = "'
. $openssldir . '";');
&dofile("apps/der_chop",$perl,'^#!/', '#!%s');
--- ssl-0.9.7/crypto/perlasm/x86asm.pl.orig Mon Feb 28 11:16:28 2000
+++ ssl-0.9.7/crypto/perlasm/x86asm.pl Thu Jun 27 22:40:52 2002
@@ -87,6 +87,12 @@
#ifdef OUT
#define OK 1
#define ALIGN 4
+#if defined(__CYGWIN__) || defined(__DJGPP__)
+#undef SIZE
+#undef TYPE
+#define SIZE(a,b)
+#define TYPE(a,b)
+#endif /* __CYGWIN__ || __DJGPP__ */
#endif
#if defined(BSDI) && !defined(ELF)
--- openssl-0.9.7/util/pod2mantest.orig 2002-06-30 00:24:56.000000000 -0800
+++ openssl-0.9.7/util/pod2mantest 2002-06-30 12:40:12.000000000 -0800
@@ -11,20 +11,14 @@
IFS=:
-try_without_dir=false
-# First we try "pod2man", then "$dir/pod2man" for each item in $PATH.
-for dir in dummy:$PATH; do
- if [ "$try_without_dir" = true ]; then
- # first iteration
- pod2man=pod2man
- try_without_dir=false
- else
- # second and later iterations
+if test "$OSTYPE" = "msdosdjgpp"; then
+IFS=";"
+fi
+for dir in $PATH; do
pod2man="$dir/pod2man"
if [ ! -f "$pod2man" ]; then # '-x' is not available on Ultrix
pod2man=''
fi
- fi
if [ ! "$pod2man" = '' ]; then
failure=none
