Skip to content

Commit 3d85eda

Browse files
committed
modify the tizen patch file
1 parent 513d8e5 commit 3d85eda

File tree

2 files changed

+11
-39
lines changed

2 files changed

+11
-39
lines changed

contrib/src/openssl/rules.mak

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ endif
1616

1717
ifdef HAVE_TIZEN
1818
OPENSSL_COMPILER=os/compiler:arm-linux-gnueabi-
19-
OPENSSL_ECFLAGS = -fPIC
2019
endif
2120

2221
ifdef HAVE_ANDROID
@@ -36,6 +35,6 @@ endif
3635
$(MOVE)
3736

3837
.openssl: openssl
39-
cd $< && $(HOSTVARS) CFLAG="$(CFLAG) $(OPENSSL_ECFLAGS)" ./Configure $(OPENSSL_CONFIG_VARS) --prefix=$(PREFIX) --openssldir=$(PREFIX) $(OPENSSL_COMPILER)
38+
cd $< && $(HOSTVARS) ./Configure $(OPENSSL_CONFIG_VARS) --prefix=$(PREFIX) $(OPENSSL_COMPILER)
4039
cd $< && $(MAKE) install
4140
touch $@

contrib/src/openssl/tizen.patch

Lines changed: 10 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,13 @@
11
diff --git a/Makefile.org b/Makefile.org
2-
index 050019d..cb59820 100644
2+
index 050019d..5e5f642 100644
33
--- a/Makefile.org
44
+++ 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."
5+
@@ -203,7 +203,7 @@ CLEARENV= TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS} \
6+
$${SHARED_LIB+SHARED_LIB} $${LIBEXTRAS+LIBEXTRAS}
7+
8+
BUILDENV= PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
9+
- CC='$(CC)' CFLAG='$(CFLAG)' \
10+
+ CC='$(CC)' CFLAG='$(CFLAG) -fPIC' \
11+
AS='$(CC)' ASFLAG='$(CFLAG) -c' \
12+
AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)' \
13+
CROSS_COMPILE='$(CROSS_COMPILE)' \

0 commit comments

Comments
 (0)