Skip to content

Commit dffc96d

Browse files
winlinvipwinlinvip
committed
For #1537, disable crossbuild for ARM/MIPS.
1 parent e6e4bd7 commit dffc96d

File tree

7 files changed

+56
-299
lines changed

7 files changed

+56
-299
lines changed

‎trunk/auto/auto_headers.sh

-36
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,6 @@ fi
4646
if [ $SRS_X86_X64 = YES ]; then
4747
srs_define_macro "SRS_X86_X64" $SRS_AUTO_HEADERS_H
4848
fi
49-
if [ $SRS_ARM_UBUNTU12 = YES ]; then
50-
srs_define_macro "SRS_ARM_UBUNTU12" $SRS_AUTO_HEADERS_H
51-
fi
52-
if [ $SRS_MIPS_UBUNTU12 = YES ]; then
53-
srs_define_macro "SRS_MIPS_UBUNTU12" $SRS_AUTO_HEADERS_H
54-
fi
5549
if [ $SRS_PI = YES ]; then
5650
srs_define_macro "SRS_PI" $SRS_AUTO_HEADERS_H
5751
fi
@@ -69,15 +63,6 @@ echo "" >> $SRS_AUTO_HEADERS_H
6963
#####################################################################################
7064
# generate auto headers file, depends on the finished of options.sh
7165
#####################################################################################
72-
# write to source file
73-
if [ $SRS_CROSS_BUILD = YES ]; then
74-
__TOOL_CHAIN="cc=$SrsArmCC gcc=$SrsArmGCC g++=$SrsArmCXX ar=$SrsArmAR ld=$SrsArmLD randlib=$SrsArmRANDLIB" && echo "$__TOOL_CHAIN"
75-
srs_define_macro_value "SRS_AUTO_EMBEDED_TOOL_CHAIN" "\"$__TOOL_CHAIN\"" $SRS_AUTO_HEADERS_H
76-
else
77-
srs_undefine_macro "SRS_AUTO_EMBEDED_TOOL_CHAIN" $SRS_AUTO_HEADERS_H
78-
fi
79-
echo "" >> $SRS_AUTO_HEADERS_H
80-
8166
# auto headers in depends.
8267
if [ $SRS_NGINX = YES ]; then
8368
srs_define_macro "SRS_AUTO_NGINX" $SRS_AUTO_HEADERS_H
@@ -147,27 +132,6 @@ fi
147132
#####################################################################################
148133
# for embeded.
149134
#####################################################################################
150-
if [ $SRS_CROSS_BUILD = YES ]; then
151-
srs_define_macro "SRS_AUTO_EMBEDED_CPU" $SRS_AUTO_HEADERS_H
152-
else
153-
srs_undefine_macro "SRS_AUTO_EMBEDED_CPU" $SRS_AUTO_HEADERS_H
154-
fi
155-
156-
# arm
157-
if [ $SRS_ARM_UBUNTU12 = YES ]; then
158-
srs_define_macro "SRS_AUTO_ARM_UBUNTU12" $SRS_AUTO_HEADERS_H
159-
else
160-
srs_undefine_macro "SRS_AUTO_ARM_UBUNTU12" $SRS_AUTO_HEADERS_H
161-
fi
162-
163-
# mips
164-
if [ $SRS_MIPS_UBUNTU12 = YES ]; then
165-
srs_define_macro "SRS_AUTO_MIPS_UBUNTU12" $SRS_AUTO_HEADERS_H
166-
else
167-
srs_undefine_macro "SRS_AUTO_MIPS_UBUNTU12" $SRS_AUTO_HEADERS_H
168-
fi
169-
170-
echo "" >> $SRS_AUTO_HEADERS_H
171135
# for log level compile settings
172136
if [ $SRS_LOG_VERBOSE = YES ]; then
173137
srs_define_macro "SRS_AUTO_VERBOSE" $SRS_AUTO_HEADERS_H

‎trunk/auto/depends.sh

+25-96
Original file line numberDiff line numberDiff line change
@@ -45,24 +45,6 @@ function Ubuntu_prepare()
4545
fi
4646
fi
4747
fi
48-
49-
# cross build for arm, install the cross build tool chain.
50-
if [ $SRS_ARM_UBUNTU12 = YES ]; then
51-
$SrsArmCC --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
52-
echo "Installing gcc-arm-linux-gnueabi g++-arm-linux-gnueabi."
53-
require_sudoer "sudo apt-get install -y --force-yes gcc-arm-linux-gnueabi g++-arm-linux-gnueabi"
54-
sudo apt-get install -y --force-yes gcc-arm-linux-gnueabi g++-arm-linux-gnueabi; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
55-
echo "The gcc-arm-linux-gnueabi g++-arm-linux-gnueabi are installed."
56-
fi
57-
fi
58-
59-
# cross build for mips, user must installed the tool chain.
60-
if [ $SRS_MIPS_UBUNTU12 = YES ]; then
61-
$SrsArmCC --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
62-
echo "You must install the tool chain: $SrsArmCC"
63-
return 2
64-
fi
65-
fi
6648

6749
OS_IS_UBUNTU=YES
6850
echo "Installing tools for Ubuntu."
@@ -168,12 +150,6 @@ function Centos_prepare()
168150
if [[ ! -f /etc/redhat-release ]]; then
169151
return 0;
170152
fi
171-
172-
# cross build for arm, install the cross build tool chain.
173-
if [ $SRS_CROSS_BUILD = YES ]; then
174-
echo "CentOS doesn't support crossbuild for arm/mips, please use Ubuntu instead."
175-
return 1
176-
fi
177153

178154
OS_IS_CENTOS=YES
179155
echo "Installing tools for Centos."
@@ -291,12 +267,6 @@ function OSX_prepare()
291267
fi
292268
return 0;
293269
fi
294-
295-
# cross build for arm, install the cross build tool chain.
296-
if [ $SRS_CROSS_BUILD = YES ]; then
297-
echo "OSX doesn't support crossbuild for arm/mips, please use Ubuntu instead."
298-
return 1
299-
fi
300270

301271
OS_IS_OSX=YES
302272
echo "Installing tools for OSX."
@@ -455,37 +425,19 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
455425
_ST_EXTRA_CFLAGS="$_ST_EXTRA_CFLAGS -DMD_VALGRIND"
456426
fi
457427
# Patched ST from https://github.com/ossrs/state-threads/tree/srs
458-
if [ $SRS_CROSS_BUILD = YES ]; then
459-
# ok, arm specified, if the flag filed does not exists, need to rebuild.
460-
if [[ -f ${SRS_OBJS}/_flag.st.cross.build.tmp && -f ${SRS_OBJS}/st/libst.a ]]; then
461-
echo "The state-threads for arm is ok.";
462-
else
463-
echo "Building state-threads for arm.";
464-
(
465-
rm -rf ${SRS_OBJS}/state-threads-1.9.1 && cd ${SRS_OBJS} &&
466-
tar xf ../3rdparty/state-threads-1.9.1.tar.gz && cd state-threads-1.9.1 && chmod +w * &&
467-
patch -p0 < ../../3rdparty/patches/6.st.osx10.14.build.patch &&
468-
make ${_ST_MAKE} CC=${SrsArmCC} AR=${SrsArmAR} LD=${SrsArmLD} RANDLIB=${SrsArmRANDLIB} EXTRA_CFLAGS="${_ST_EXTRA_CFLAGS}" &&
469-
cd .. && rm -f st && ln -sf state-threads-1.9.1/obj st &&
470-
rm -f state-threads && ln -sf state-threads-1.9.1 state-threads &&
471-
cd .. && touch ${SRS_OBJS}/_flag.st.cross.build.tmp
472-
)
473-
fi
428+
if [[ ! -f ${SRS_OBJS}/_flag.st.cross.build.tmp && -f ${SRS_OBJS}/st/libst.a ]]; then
429+
echo "The state-threads is ok.";
474430
else
475-
if [[ ! -f ${SRS_OBJS}/_flag.st.cross.build.tmp && -f ${SRS_OBJS}/st/libst.a ]]; then
476-
echo "The state-threads is ok.";
477-
else
478-
echo "Building state-threads.";
479-
(
480-
rm -rf ${SRS_OBJS}/state-threads-1.9.1 && cd ${SRS_OBJS} &&
481-
tar xf ../3rdparty/state-threads-1.9.1.tar.gz && cd state-threads-1.9.1 && chmod +w * &&
482-
patch -p0 < ../../3rdparty/patches/6.st.osx10.14.build.patch &&
483-
make ${_ST_MAKE} EXTRA_CFLAGS="${_ST_EXTRA_CFLAGS}" &&
484-
cd .. && rm -f st && ln -sf state-threads-1.9.1/obj st &&
485-
rm -f state-threads && ln -sf state-threads-1.9.1 state-threads &&
486-
cd .. && rm -f ${SRS_OBJS}/_flag.st.cross.build.tmp
487-
)
488-
fi
431+
echo "Building state-threads.";
432+
(
433+
rm -rf ${SRS_OBJS}/state-threads-1.9.1 && cd ${SRS_OBJS} &&
434+
tar xf ../3rdparty/state-threads-1.9.1.tar.gz && cd state-threads-1.9.1 && chmod +w * &&
435+
patch -p0 < ../../3rdparty/patches/6.st.osx10.14.build.patch &&
436+
make ${_ST_MAKE} EXTRA_CFLAGS="${_ST_EXTRA_CFLAGS}" &&
437+
cd .. && rm -f st && ln -sf state-threads-1.9.1/obj st &&
438+
rm -f state-threads && ln -sf state-threads-1.9.1 state-threads &&
439+
cd .. && rm -f ${SRS_OBJS}/_flag.st.cross.build.tmp
440+
)
489441
fi
490442
# check status
491443
ret=$?; if [[ $ret -ne 0 ]]; then echo "Build state-threads failed, ret=$ret"; exit $ret; fi
@@ -508,7 +460,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
508460
mkdir -p ${SRS_OBJS}/nginx
509461
fi
510462
# make nginx
511-
__SRS_BUILD_NGINX=NO; if [ $SRS_CROSS_BUILD = NO ]; then if [ $SRS_NGINX = YES ]; then __SRS_BUILD_NGINX=YES; fi fi
463+
__SRS_BUILD_NGINX=NO; if [ $SRS_NGINX = YES ]; then __SRS_BUILD_NGINX=YES; fi
512464
if [ $__SRS_BUILD_NGINX = YES ]; then
513465
if [[ -f ${SRS_OBJS}/nginx/sbin/nginx ]]; then
514466
echo "The nginx-1.5.7 is ok.";
@@ -615,9 +567,6 @@ fi
615567
#####################################################################################
616568
# extra configure options
617569
CONFIGURE_TOOL="./config"
618-
if [ $SRS_CROSS_BUILD = YES ]; then
619-
CONFIGURE_TOOL="./Configure linux-armv4"
620-
fi
621570
if [ $SRS_OSX = YES ]; then
622571
CONFIGURE_TOOL="./Configure darwin64-`uname -m`-cc"
623572
fi
@@ -635,39 +584,19 @@ if [ $SRS_SSL = YES ]; then
635584
if [ $SRS_USE_SYS_SSL = YES ]; then
636585
echo "Warning: Use system libssl, without compiling openssl."
637586
else
638-
# check the cross build flag file, if flag changed, need to rebuild the st.
639-
if [ $SRS_CROSS_BUILD = YES ]; then
640-
# ok, arm specified, if the flag filed does not exists, need to rebuild.
641-
if [[ -f ${SRS_OBJS}/_flag.ssl.cross.build.tmp && -f ${SRS_OBJS}/openssl/lib/libssl.a ]]; then
642-
echo "The openssl-1.1.0e for arm is ok.";
643-
else
644-
echo "Building openssl-1.1.0e for ARM.";
645-
(
646-
rm -rf ${SRS_OBJS}/openssl-1.1.0e && cd ${SRS_OBJS} &&
647-
unzip -q ../3rdparty/openssl-1.1.0e.zip && cd openssl-1.1.0e &&
648-
$CONFIGURE_TOOL --prefix=`pwd`/_release -no-shared no-asm no-threads $OPENSSL_HOTFIX &&
649-
make CC=${SrsArmCC} GCC=${SrsArmGCC} AR="${SrsArmAR} r" \
650-
LD=${SrsArmLD} LINK=${SrsArmGCC} RANDLIB=${SrsArmRANDLIB} &&
651-
make install_sw &&
652-
cd .. && rm -rf openssl && ln -sf openssl-1.1.0e/_release openssl &&
653-
cd .. && touch ${SRS_OBJS}/_flag.ssl.cross.build.tmp
654-
)
655-
fi
587+
# cross build not specified, if exists flag, need to rebuild for no-arm platform.
588+
if [[ ! -f ${SRS_OBJS}/_flag.ssl.cross.build.tmp && -f ${SRS_OBJS}/openssl/lib/libssl.a ]]; then
589+
echo "Openssl-1.1.0e is ok.";
656590
else
657-
# cross build not specified, if exists flag, need to rebuild for no-arm platform.
658-
if [[ ! -f ${SRS_OBJS}/_flag.ssl.cross.build.tmp && -f ${SRS_OBJS}/openssl/lib/libssl.a ]]; then
659-
echo "Openssl-1.1.0e is ok.";
660-
else
661-
echo "Building openssl-1.1.0e.";
662-
(
663-
rm -rf ${SRS_OBJS}/openssl-1.1.0e && cd ${SRS_OBJS} &&
664-
unzip -q ../3rdparty/openssl-1.1.0e.zip && cd openssl-1.1.0e &&
665-
$CONFIGURE_TOOL --prefix=`pwd`/_release -no-shared no-threads $OPENSSL_HOTFIX &&
666-
make && make install_sw &&
667-
cd .. && rm -rf openssl && ln -sf openssl-1.1.0e/_release openssl &&
668-
cd .. && rm -f ${SRS_OBJS}/_flag.ssl.cross.build.tmp
669-
)
670-
fi
591+
echo "Building openssl-1.1.0e.";
592+
(
593+
rm -rf ${SRS_OBJS}/openssl-1.1.0e && cd ${SRS_OBJS} &&
594+
unzip -q ../3rdparty/openssl-1.1.0e.zip && cd openssl-1.1.0e &&
595+
$CONFIGURE_TOOL --prefix=`pwd`/_release -no-shared no-threads $OPENSSL_HOTFIX &&
596+
make && make install_sw &&
597+
cd .. && rm -rf openssl && ln -sf openssl-1.1.0e/_release openssl &&
598+
cd .. && rm -f ${SRS_OBJS}/_flag.ssl.cross.build.tmp
599+
)
671600
fi
672601
# check status
673602
ret=$?; if [[ $ret -ne 0 ]]; then echo "Build openssl-1.1.0e failed, ret=$ret"; exit $ret; fi

0 commit comments

Comments
 (0)