Fossil SCM

Fix the openssl-1.1.1b build procedures.

drh 2019-05-17 12:04 trunk merge
Commit 003281772c841fd3df824cd33bf8e385c02f2170e6af1ffc028b4cfe1424eb77
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1165,10 +1165,11 @@
11651165
BLDTARGETS = zlib
11661166
endif
11671167
11681168
openssl: $(BLDTARGETS)
11691169
cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
1170
+ sed -i -e 's/^PERL=C:\\.*$$/PERL=perl.exe/i' $(OPENSSLLIBDIR)/Makefile
11701171
$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
11711172
11721173
clean-openssl:
11731174
$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
11741175
11751176
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1165,10 +1165,11 @@
1165 BLDTARGETS = zlib
1166 endif
1167
1168 openssl: $(BLDTARGETS)
1169 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
 
1170 $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
1171
1172 clean-openssl:
1173 $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
1174
1175
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1165,10 +1165,11 @@
1165 BLDTARGETS = zlib
1166 endif
1167
1168 openssl: $(BLDTARGETS)
1169 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
1170 sed -i -e 's/^PERL=C:\\.*$$/PERL=perl.exe/i' $(OPENSSLLIBDIR)/Makefile
1171 $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
1172
1173 clean-openssl:
1174 $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
1175
1176
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1095,10 +1095,11 @@
10951095
BLDTARGETS = zlib
10961096
endif
10971097
10981098
openssl: $(BLDTARGETS)
10991099
cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
1100
+ sed -i -e 's/^PERL=C:\\.*$$/PERL=perl.exe/i' $(OPENSSLLIBDIR)/Makefile
11001101
$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
11011102
11021103
clean-openssl:
11031104
$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
11041105
11051106
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1095,10 +1095,11 @@
1095 BLDTARGETS = zlib
1096 endif
1097
1098 openssl: $(BLDTARGETS)
1099 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
 
1100 $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
1101
1102 clean-openssl:
1103 $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
1104
1105
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1095,10 +1095,11 @@
1095 BLDTARGETS = zlib
1096 endif
1097
1098 openssl: $(BLDTARGETS)
1099 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
1100 sed -i -e 's/^PERL=C:\\.*$$/PERL=perl.exe/i' $(OPENSSLLIBDIR)/Makefile
1101 $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
1102
1103 clean-openssl:
1104 $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
1105
1106
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1095,10 +1095,11 @@
10951095
BLDTARGETS = zlib
10961096
endif
10971097
10981098
openssl: $(BLDTARGETS)
10991099
cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
1100
+ sed -i -e 's/^PERL=C:\\.*$$/PERL=perl.exe/i' $(OPENSSLLIBDIR)/Makefile
11001101
$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
11011102
11021103
clean-openssl:
11031104
$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
11041105
11051106
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1095,10 +1095,11 @@
1095 BLDTARGETS = zlib
1096 endif
1097
1098 openssl: $(BLDTARGETS)
1099 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
 
1100 $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
1101
1102 clean-openssl:
1103 $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
1104
1105
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1095,10 +1095,11 @@
1095 BLDTARGETS = zlib
1096 endif
1097
1098 openssl: $(BLDTARGETS)
1099 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
1100 sed -i -e 's/^PERL=C:\\.*$$/PERL=perl.exe/i' $(OPENSSLLIBDIR)/Makefile
1101 $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
1102
1103 clean-openssl:
1104 $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
1105
1106

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button