131 lines
6.2 KiB
Diff
131 lines
6.2 KiB
Diff
diff -Naur openssl-1.0.1e/Configure openssl-1.0.1e-cygwin/Configure
|
|
--- openssl-1.0.1e/Configure 2013-02-11 15:26:04.000000000 +0000
|
|
+++ openssl-1.0.1e-cygwin/Configure 2013-03-27 04:58:53.265625000 +0000
|
|
@@ -550,6 +550,7 @@
|
|
"Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32",
|
|
"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:coff:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
|
|
"debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
|
|
+"Cygwin-x86_64", "gcc:-DTERMIOS -DL_ENDIAN -O3 -Wall:::CYGWIN32::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:mingw64:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
|
|
|
|
# NetWare from David Ward (dsward@novell.com)
|
|
# requires either MetroWerks NLM development tools, or gcc / nlmconv
|
|
@@ -1127,7 +1128,7 @@ foreach (sort @experimental)
|
|
|
|
my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds;
|
|
|
|
-$exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/);
|
|
+$exe_ext=".exe" if ($target =~ /^Cygwin/ || $target eq "DJGPP" || $target =~ /^mingw/);
|
|
$exe_ext=".nlm" if ($target =~ /netware/);
|
|
$exe_ext=".pm" if ($target =~ /vos/);
|
|
$openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq "");
|
|
diff -Naur openssl-1.0.1e/engines/ccgost/Makefile openssl-1.0.1e-cygwin/engines/ccgost/Makefile
|
|
--- openssl-1.0.1e/engines/ccgost/Makefile 2013-02-11 15:26:04.000000000 +0000
|
|
+++ openssl-1.0.1e-cygwin/engines/ccgost/Makefile 2013-03-27 04:58:53.281250000 +0000
|
|
@@ -45,7 +45,11 @@
|
|
set -e; \
|
|
echo installing $(LIBNAME); \
|
|
pfx=lib; \
|
|
- if [ "$(PLATFORM)" != "Cygwin" ]; then \
|
|
+ case "$(PLATFORM)" in Cygwin*) \
|
|
+ sfx=".so"; \
|
|
+ cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
|
|
+ ;; \
|
|
+ *) \
|
|
case "$(CFLAGS)" in \
|
|
*DSO_BEOS*) sfx=".so";; \
|
|
*DSO_DLFCN*) sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;; \
|
|
@@ -54,10 +58,7 @@
|
|
*) sfx=".bad";; \
|
|
esac; \
|
|
cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
|
|
- else \
|
|
- sfx=".so"; \
|
|
- cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
|
|
- fi; \
|
|
+ esac; \
|
|
chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
|
|
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \
|
|
fi
|
|
diff -Naur openssl-1.0.1e/engines/Makefile openssl-1.0.1e-cygwin/engines/Makefile
|
|
--- openssl-1.0.1e/engines/Makefile 2013-02-11 15:26:04.000000000 +0000
|
|
+++ openssl-1.0.1e-cygwin/engines/Makefile 2013-03-27 05:03:58.596679600 +0000
|
|
@@ -111,7 +111,11 @@
|
|
for l in $(LIBNAMES); do \
|
|
( echo installing $$l; \
|
|
pfx=lib; \
|
|
- if [ "$(PLATFORM)" != "Cygwin" ]; then \
|
|
+ case "$(PLATFORM)" in Cygwin*) \
|
|
+ sfx=".so"; \
|
|
+ cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
|
|
+ ;; \
|
|
+ *) \
|
|
case "$(CFLAGS)" in \
|
|
*DSO_BEOS*) sfx=".so";; \
|
|
*DSO_DLFCN*) sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;; \
|
|
@@ -120,10 +124,7 @@
|
|
*) sfx=".bad";; \
|
|
esac; \
|
|
cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
|
|
- else \
|
|
- sfx=".so"; \
|
|
- cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
|
|
- fi; \
|
|
+ esac; \
|
|
chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
|
|
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
|
|
done; \
|
|
diff -Naur openssl-1.0.1e/Makefile.org openssl-1.0.1e-cygwin/Makefile.org
|
|
--- openssl-1.0.1e/Makefile.org 2013-02-11 15:26:04.000000000 +0000
|
|
+++ openssl-1.0.1e-cygwin/Makefile.org 2013-03-27 04:58:53.265625000 +0000
|
|
@@ -325,9 +325,9 @@
|
|
done; \
|
|
fi; \
|
|
( set -x; rm -f lib$$i$(SHLIB_EXT) ); \
|
|
- if [ "$(PLATFORM)" = "Cygwin" ]; then \
|
|
+ case "$(PLATFORM)" in Cygwin*) \
|
|
( set -x; rm -f cyg$$i$(SHLIB_EXT) lib$$i$(SHLIB_EXT).a ); \
|
|
- fi; \
|
|
+ esac; \
|
|
done
|
|
|
|
link-shared:
|
|
@@ -570,11 +570,7 @@
|
|
do \
|
|
if [ -f "$$i" -o -f "$$i.a" ]; then \
|
|
( echo installing $$i; \
|
|
- if [ "$(PLATFORM)" != "Cygwin" ]; then \
|
|
- cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
|
|
- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
|
|
- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
|
|
- else \
|
|
+ case "$(PLATFORM)" in Cygwin*) \
|
|
c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \
|
|
cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
|
|
chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
|
|
@@ -582,7 +578,12 @@
|
|
cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
|
|
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
|
|
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
|
|
- fi ); \
|
|
+ ;; \
|
|
+ *) \
|
|
+ cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
|
|
+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
|
|
+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
|
|
+ esac ); \
|
|
if expr $(PLATFORM) : 'mingw' > /dev/null; then \
|
|
( case $$i in \
|
|
*crypto*) i=libeay32.dll;; \
|
|
@@ -642,9 +643,9 @@
|
|
@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
|
|
here="`pwd`"; \
|
|
filecase=; \
|
|
- if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \
|
|
+ case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*) \
|
|
filecase=-i; \
|
|
- fi; \
|
|
+ esac; \
|
|
set -e; for i in doc/apps/*.pod; do \
|
|
fn=`basename $$i .pod`; \
|
|
sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
|