Fossil SCM

(cherry-pick): Fix the openssl-1.1.1b build procedures.

jan.nijtmans 2019-05-17 14:03 branch-2.8

Commit e5616cdac8eafc768452a41adb744ad114c41416c0f4f7e3dc4c7b063dd62f59

Parent c8bd45c1aa0d18b…

6 files changed +1 +1 +1 +1 +1 +1

~ src/makemake.tcl ~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.mingw.mistachkin

M src/makemake.tcl

+1

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -1164,10 +1164,11 @@
1164	1164	BLDTARGETS = zlib
1165	1165	endif
1166	1166
1167	1167	openssl: $(BLDTARGETS)
1168	1168	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
	1169	+ sed -i -e 's/^PERL=C:\\.*$$/PERL=perl.exe/i' $(OPENSSLLIBDIR)/Makefile
1169	1170	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
1170	1171
1171	1172	clean-openssl:
1172	1173	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
1173	1174
1174	1175

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -1164,10 +1164,11 @@
1164	BLDTARGETS = zlib
1165	endif
1166
1167	openssl: $(BLDTARGETS)
1168	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)

1169	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
1170
1171	clean-openssl:
1172	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
1173
1174

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -1164,10 +1164,11 @@
1164	BLDTARGETS = zlib
1165	endif
1166
1167	openssl: $(BLDTARGETS)
1168	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
1169	sed -i -e 's/^PERL=C:\\.*$$/PERL=perl.exe/i' $(OPENSSLLIBDIR)/Makefile
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

M src/makemake.tcl

+1

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -1164,10 +1164,11 @@
1164	1164	BLDTARGETS = zlib
1165	1165	endif
1166	1166
1167	1167	openssl: $(BLDTARGETS)
1168	1168	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
	1169	+ sed -i -e 's/^PERL=C:\\.*$$/PERL=perl.exe/i' $(OPENSSLLIBDIR)/Makefile
1169	1170	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
1170	1171
1171	1172	clean-openssl:
1172	1173	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
1173	1174
1174	1175

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -1164,10 +1164,11 @@
1164	BLDTARGETS = zlib
1165	endif
1166
1167	openssl: $(BLDTARGETS)
1168	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)

1169	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
1170
1171	clean-openssl:
1172	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
1173
1174

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -1164,10 +1164,11 @@
1164	BLDTARGETS = zlib
1165	endif
1166
1167	openssl: $(BLDTARGETS)
1168	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
1169	sed -i -e 's/^PERL=C:\\.*$$/PERL=perl.exe/i' $(OPENSSLLIBDIR)/Makefile
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

M win/Makefile.mingw

+1

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -1092,10 +1092,11 @@
1092	1092	BLDTARGETS = zlib
1093	1093	endif
1094	1094
1095	1095	openssl: $(BLDTARGETS)
1096	1096	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
	1097	+ sed -i -e 's/^PERL=C:\\.*$$/PERL=perl.exe/i' $(OPENSSLLIBDIR)/Makefile
1097	1098	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
1098	1099
1099	1100	clean-openssl:
1100	1101	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
1101	1102
1102	1103

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1092,10 +1092,11 @@
1092	BLDTARGETS = zlib
1093	endif
1094
1095	openssl: $(BLDTARGETS)
1096	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)

1097	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
1098
1099	clean-openssl:
1100	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
1101
1102

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1092,10 +1092,11 @@
1092	BLDTARGETS = zlib
1093	endif
1094
1095	openssl: $(BLDTARGETS)
1096	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
1097	sed -i -e 's/^PERL=C:\\.*$$/PERL=perl.exe/i' $(OPENSSLLIBDIR)/Makefile
1098	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
1099
1100	clean-openssl:
1101	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
1102
1103

M win/Makefile.mingw

+1

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -1092,10 +1092,11 @@
1092	1092	BLDTARGETS = zlib
1093	1093	endif
1094	1094
1095	1095	openssl: $(BLDTARGETS)
1096	1096	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
	1097	+ sed -i -e 's/^PERL=C:\\.*$$/PERL=perl.exe/i' $(OPENSSLLIBDIR)/Makefile
1097	1098	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
1098	1099
1099	1100	clean-openssl:
1100	1101	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
1101	1102
1102	1103

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1092,10 +1092,11 @@
1092	BLDTARGETS = zlib
1093	endif
1094
1095	openssl: $(BLDTARGETS)
1096	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)

1097	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
1098
1099	clean-openssl:
1100	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
1101
1102

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1092,10 +1092,11 @@
1092	BLDTARGETS = zlib
1093	endif
1094
1095	openssl: $(BLDTARGETS)
1096	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
1097	sed -i -e 's/^PERL=C:\\.*$$/PERL=perl.exe/i' $(OPENSSLLIBDIR)/Makefile
1098	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
1099
1100	clean-openssl:
1101	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
1102
1103

M win/Makefile.mingw.mistachkin

+1

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -1092,10 +1092,11 @@
1092	1092	BLDTARGETS = zlib
1093	1093	endif
1094	1094
1095	1095	openssl: $(BLDTARGETS)
1096	1096	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
	1097	+ sed -i -e 's/^PERL=C:\\.*$$/PERL=perl.exe/i' $(OPENSSLLIBDIR)/Makefile
1097	1098	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
1098	1099
1099	1100	clean-openssl:
1100	1101	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
1101	1102
1102	1103

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1092,10 +1092,11 @@
1092	BLDTARGETS = zlib
1093	endif
1094
1095	openssl: $(BLDTARGETS)
1096	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)

1097	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
1098
1099	clean-openssl:
1100	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
1101
1102

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1092,10 +1092,11 @@
1092	BLDTARGETS = zlib
1093	endif
1094
1095	openssl: $(BLDTARGETS)
1096	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
1097	sed -i -e 's/^PERL=C:\\.*$$/PERL=perl.exe/i' $(OPENSSLLIBDIR)/Makefile
1098	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
1099
1100	clean-openssl:
1101	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
1102
1103

M win/Makefile.mingw.mistachkin

+1

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -1092,10 +1092,11 @@
1092	1092	BLDTARGETS = zlib
1093	1093	endif
1094	1094
1095	1095	openssl: $(BLDTARGETS)
1096	1096	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
	1097	+ sed -i -e 's/^PERL=C:\\.*$$/PERL=perl.exe/i' $(OPENSSLLIBDIR)/Makefile
1097	1098	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
1098	1099
1099	1100	clean-openssl:
1100	1101	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
1101	1102
1102	1103

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1092,10 +1092,11 @@
1092	BLDTARGETS = zlib
1093	endif
1094
1095	openssl: $(BLDTARGETS)
1096	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)

1097	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
1098
1099	clean-openssl:
1100	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
1101
1102

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1092,10 +1092,11 @@
1092	BLDTARGETS = zlib
1093	endif
1094
1095	openssl: $(BLDTARGETS)
1096	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
1097	sed -i -e 's/^PERL=C:\\.*$$/PERL=perl.exe/i' $(OPENSSLLIBDIR)/Makefile
1098	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
1099
1100	clean-openssl:
1101	$(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean
1102
1103

Keyboard Shortcuts

Open search /

Next entry (timeline) j

Previous entry (timeline) k

Open focused entry Enter

Show this help ?

Toggle theme Top nav button