File tree Expand file tree Collapse file tree 5 files changed +25
-9
lines changed Expand file tree Collapse file tree 5 files changed +25
-9
lines changed Original file line number Diff line number Diff line change @@ -100,9 +100,10 @@ mkdir -p "tizen-armv7-a" && cd "tizen-armv7-a"
100
100
#
101
101
# make
102
102
#
103
- core_count=` sysctl -n machdep.cpu.core_count`
104
- let jobs=$core_count +1
105
- info " Running make -j$jobs "
103
+ # # FIXME: some 3rd party libraries doesn't support parallel build, like openssl. so we just disable the feature here
104
+ # core_count=`sysctl -n machdep.cpu.core_count`
105
+ # let jobs=$core_count+1
106
+ # info "Running make -j$jobs"
106
107
make fetch
107
108
make list
108
- make -j $jobs
109
+ make
Original file line number Diff line number Diff line change @@ -411,6 +411,9 @@ ifdef HAVE_ANDROID
411
411
echo "set(CMAKE_CXX_SYSROOT_FLAG \"\")" >> $@
412
412
echo "set(CMAKE_C_SYSROOT_FLAG \"\")" >> $@
413
413
endif
414
+ ifdef HAVE_TIZEN
415
+ echo "set(CMAKE_SYSTEM_NAME Linux)" >> $@
416
+ endif
414
417
endif
415
418
echo "set(CMAKE_C_COMPILER $(CC))" >> $@
416
419
echo "set(CMAKE_CXX_COMPILER $(CXX))" >> $@
Original file line number Diff line number Diff line change @@ -14,6 +14,14 @@ ifeq ($(shell uname),Darwin)
14
14
OPENSSL_CONFIG_VARS =darwin64-x86_64-cc
15
15
endif
16
16
17
+ ifdef HAVE_TIZEN
18
+ OPENSSL_COMPILER =os/compiler:arm-linux-gnueabi-
19
+ OPENSSL_ECFLAGS = -fPIC
20
+ endif
21
+
22
+ ifdef HAVE_ANDROID
23
+ OPENSSL_COMPILER =os/compiler:$(HOST )
24
+ endif
17
25
18
26
$(TARBALLS ) /openssl-$(OPENSSL_VERSION ) .tar.gz :
19
27
$(call download,$(OPENSSL_URL ) )
@@ -25,6 +33,6 @@ openssl: openssl-$(OPENSSL_VERSION).tar.gz .sum-openssl
25
33
$(MOVE )
26
34
27
35
.openssl : openssl
28
- cd $< && $(HOSTVARS ) ./Configure $(OPENSSL_CONFIG_VARS ) --prefix=$(PREFIX ) --openssldir=$(PREFIX )
36
+ cd $< && $(HOSTVARS ) CFLAGS= " $( CFLAGS ) $( OPENSSL_ECFLAGS ) " ./Configure $(OPENSSL_CONFIG_VARS ) --prefix=$(PREFIX ) --openssldir=$(PREFIX ) $( OPENSSL_COMPILER )
29
37
cd $< && $(MAKE ) install
30
38
touch $@
Original file line number Diff line number Diff line change @@ -12,11 +12,15 @@ websockets: libwebsockets-1.3-chrome37-firefox30.zip .sum-websockets
12
12
$(UNPACK )
13
13
$(MOVE )
14
14
15
+ ifdef HAVE_TIZEN
16
+ EX_ECFLAGS = -fPIC
17
+ endif
18
+
15
19
DEPS_websockets = zlib $(DEPS_zlib )
16
20
17
21
DEPS_websockets = openssl $(DEPS_openssl )
18
22
19
23
.websockets : websockets .zlib .openssl toolchain.cmake
20
- cd $< && $(HOSTVARS ) $( CMAKE ) -DCMAKE_BUILD_TYPE=Release
24
+ cd $< && $(HOSTVARS ) CFLAGS= " $( CFLAGS ) $( EX_ECFLAGS ) " $( CMAKE ) -DCMAKE_BUILD_TYPE=Release -DLIBWEBSOCKETS_LIBRARIES=websocket
21
25
cd $< && $(MAKE ) install
22
26
touch $@
Original file line number Diff line number Diff line change @@ -16,8 +16,8 @@ ZLIB_CONFIG_VARS=CHOST=$(HOST)
16
16
endif
17
17
endif
18
18
19
- ifdef HAVE_SOLARIS
20
- ZLIB_ECFLAGS = -fPIC -DPIC
19
+ ifdef HAVE_TIZEN
20
+ EX_ECFLAGS = -fPIC
21
21
endif
22
22
23
23
$(TARBALLS ) /zlib-$(ZLIB_VERSION ) .tar.gz :
@@ -30,6 +30,6 @@ zlib: zlib-$(ZLIB_VERSION).tar.gz .sum-zlib
30
30
$(MOVE )
31
31
32
32
.zlib : zlib
33
- cd $< && $(HOSTVARS ) $(ZLIB_CONFIG_VARS ) CFLAGS=" $( CFLAGS) $( ZLIB_ECFLAGS ) " ./configure --prefix=$(PREFIX ) --static
33
+ cd $< && $(HOSTVARS ) $(ZLIB_CONFIG_VARS ) CFLAGS=" $( CFLAGS) $( EX_ECFLAGS ) " ./configure --prefix=$(PREFIX ) --static
34
34
cd $< && $(MAKE ) install
35
35
touch $@
You can’t perform that action at this time.
0 commit comments