Skip to content

Commit 513d8e5

Browse files
committed
add tizen patch to openssl
1 parent 45c96bf commit 513d8e5

File tree

3 files changed

+45
-2
lines changed

3 files changed

+45
-2
lines changed

contrib/src/openssl/rules.mak

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@ $(TARBALLS)/openssl-$(OPENSSL_VERSION).tar.gz:
3030

3131
openssl: openssl-$(OPENSSL_VERSION).tar.gz .sum-openssl
3232
$(UNPACK)
33+
ifdef HAVE_TIZEN
34+
$(APPLY) $(SRC)/openssl/tizen.patch
35+
endif
3336
$(MOVE)
3437

3538
.openssl: openssl
36-
cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(OPENSSL_ECFLAGS)" ./Configure $(OPENSSL_CONFIG_VARS) --prefix=$(PREFIX) --openssldir=$(PREFIX) $(OPENSSL_COMPILER)
39+
cd $< && $(HOSTVARS) CFLAG="$(CFLAG) $(OPENSSL_ECFLAGS)" ./Configure $(OPENSSL_CONFIG_VARS) --prefix=$(PREFIX) --openssldir=$(PREFIX) $(OPENSSL_COMPILER)
3740
cd $< && $(MAKE) install
3841
touch $@

contrib/src/openssl/tizen.patch

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
diff --git a/Makefile.org b/Makefile.org
2+
index 050019d..cb59820 100644
3+
--- a/Makefile.org
4+
+++ b/Makefile.org
5+
@@ -290,7 +290,7 @@ build_testapps:
6+
@dir=crypto; target=testapps; $(BUILD_ONE_CMD)
7+
8+
fips_premain_dso$(EXE_EXT): libcrypto.a
9+
- [ -z "$(FIPSCANLIB)" ] || $(CC) $(CFLAG) -Iinclude \
10+
+ [ -z "$(FIPSCANLIB)" ] || $(CC) $(CFLAG) -fPIC -Iinclude \
11+
-DFINGERPRINT_PREMAIN_DSO_LOAD -o $@ \
12+
$(FIPSLIBDIR)fips_premain.c $(FIPSLIBDIR)fipscanister.o \
13+
libcrypto.a $(EX_LIBS)
14+
@@ -367,7 +367,7 @@ libcrypto.pc: Makefile
15+
echo 'Requires: '; \
16+
echo 'Libs: -L$${libdir} -lcrypto'; \
17+
echo 'Libs.private: $(EX_LIBS)'; \
18+
- echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
19+
+ echo 'Cflags: -fPIC -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
20+
21+
libssl.pc: Makefile
22+
@ ( echo 'prefix=$(INSTALLTOP)'; \
23+
@@ -381,7 +381,7 @@ libssl.pc: Makefile
24+
echo 'Requires: '; \
25+
echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
26+
echo 'Libs.private: $(EX_LIBS)'; \
27+
- echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
28+
+ echo 'Cflags: -fPIC -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
29+
30+
openssl.pc: Makefile
31+
@ ( echo 'prefix=$(INSTALLTOP)'; \
32+
@@ -395,7 +395,7 @@ openssl.pc: Makefile
33+
echo 'Requires: '; \
34+
echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
35+
echo 'Libs.private: $(EX_LIBS)'; \
36+
- echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
37+
+ echo 'Cflags: -fPIC -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
38+
39+
Makefile: Makefile.org Configure config
40+
@echo "Makefile is older than Makefile.org, Configure or config."

contrib/src/websockets/rules.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ DEPS_websockets = zlib $(DEPS_zlib)
2121
DEPS_websockets = openssl $(DEPS_openssl)
2222

2323
.websockets: websockets .zlib .openssl toolchain.cmake
24-
cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(EX_ECFLAGS)" $(CMAKE) -DCMAKE_BUILD_TYPE=Release -DLIBWEBSOCKETS_LIBRARIES=websocket
24+
cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(EX_ECFLAGS)" $(CMAKE) -DCMAKE_BUILD_TYPE=Release
2525
cd $< && $(MAKE) install
2626
touch $@

0 commit comments

Comments
 (0)