From f7dbc78c948646ae5b369dbd3ec528db1a50571a Mon Sep 17 00:00:00 2001 From: Caoruihong Date: Thu, 24 Jun 2021 00:25:54 +0800 Subject: [PATCH] chore: pass sysroot and arch related cflags by BUILD.gn build should not modify files in the repository, we made this posible now. sysroot and arch related cflags are pass by BUILD.gn now. Signed-off-by: Caoruihong Change-Id: Ib0b8a9553468dcca03e141025e7a7d8250d8f95f --- .gitignore | 1 + Makefile | 12 +++++++++--- cfg.mak | 5 ----- configure_llvm | 2 +- ffmpeg-y/.gitignore | 11 +++++++++++ ffmpeg-y/Makefile | 6 ++++-- ffmpeg-y/disable_decoder_config.sh | 2 +- ffmpeg-y/enable_decoder_config.sh | 4 ++-- 8 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 .gitignore delete mode 100755 cfg.mak create mode 100644 ffmpeg-y/.gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..6e1cabc0c1 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +cfg.mak diff --git a/Makefile b/Makefile index 0a67f66b3a..7f5de57b26 100755 --- a/Makefile +++ b/Makefile @@ -1,6 +1,13 @@ LOCAL_DIR := $(shell pwd) MIDDLEWARE_DIR := $(LOCAL_DIR) -include $(MIDDLEWARE_DIR)/cfg.mak + +CFG_CHIP_TYPE=hi3516dv300 +CFG_OS_TYPE=linux +CFG_COMPILE_TYPE=clang +CFG_LINUX_COMPILER_VER=himix410 +CFG_OHOS_BUILD_PATH= + +-include $(MIDDLEWARE_DIR)/cfg.mak GREEN="\e[32;1m" DONE="\e[39m" @@ -43,8 +50,7 @@ clean: fi $(ORG_FFMPEG): - cp $(CONFIGURE_FILE) $(FFMPEG_VER)/configure - @if [ -d $(FFMPEG_VER) ]; then cd $@; chmod 777 ./* -R; ./$(FF_CONFIG_SH) $(CFG_CHIP_TYPE) $(CFG_OS_TYPE) $(CFG_COMPILE_TYPE) $(CFG_LINUX_COMPILER_VER) $(CFG_OHOS_BUILD_PATH); cd -; fi + @if [ -d $(FFMPEG_VER) ]; then cd $@; ln -snf ../$(CONFIGURE_FILE) config.sh; CFG_CONFIGURE=./config.sh $(if $(CFG_OHOS_BUILD_PATH),LD=$(CFG_OHOS_BUILD_PATH)/clang,) ./$(FF_CONFIG_SH) $(CFG_CHIP_TYPE) $(CFG_OS_TYPE) $(CFG_COMPILE_TYPE) $(CFG_LINUX_COMPILER_VER) $(CFG_OHOS_BUILD_PATH); cd -; fi @if [ $(FF_ADAPT_LITEOS) = 'y' ]; then cd $@; ./adapt_liteos_config.sh; cd -; fi $(MAKE) $(MFLAGS) -j16 -C $(COMPILE_ROOT)/$@ $(MAKE) $(MFLAGS) -C $(@) install diff --git a/cfg.mak b/cfg.mak deleted file mode 100755 index 867e63aa64..0000000000 --- a/cfg.mak +++ /dev/null @@ -1,5 +0,0 @@ -CFG_CHIP_TYPE=hi3516dv300 -CFG_OS_TYPE=linux -CFG_COMPILE_TYPE=clang -CFG_LINUX_COMPILER_VER=himix410 -CFG_OHOS_BUILD_PATH= diff --git a/configure_llvm b/configure_llvm index 0eafe60ab5..60dfa94f01 100755 --- a/configure_llvm +++ b/configure_llvm @@ -7272,7 +7272,7 @@ CC=$cc CXX=$cxx AS=$as OBJCC=$objcc -LD=clang +LD=${LD:=clang} DEPCC=$dep_cc DEPCCFLAGS=$DEPCCFLAGS \$(CPPFLAGS) DEPAS=$as diff --git a/ffmpeg-y/.gitignore b/ffmpeg-y/.gitignore new file mode 100644 index 0000000000..29adca9d5a --- /dev/null +++ b/ffmpeg-y/.gitignore @@ -0,0 +1,11 @@ +*.so +*.d +*.pc +*.ver +*.version +.config +*_list.c +install/ +config.* +libavutil/avconfig.h +libavutil/ffversion.h diff --git a/ffmpeg-y/Makefile b/ffmpeg-y/Makefile index fe6d664cbf..737ca3d8aa 100755 --- a/ffmpeg-y/Makefile +++ b/ffmpeg-y/Makefile @@ -40,8 +40,10 @@ all: all-yes include $(SRC_PATH)/tools/Makefile include $(SRC_PATH)/ffbuild/common.mak ifeq ($(LLVM_COMPILER), y) -CFLAGS += --target=arm-liteos --sysroot=../../../../../prebuilts/lite/sysroot -LDFLAGS += --target=arm-liteos --sysroot=../../../../../prebuilts/lite/sysroot +SYSROOT_PATH ?= ../../../../../prebuilts/lite/sysroot +ARCH_CFLAGS ?= --target=arm-liteos +CFLAGS += --sysroot=$(SYSROOT_PATH) $(ARCH_CFLAGS) +LDFLAGS += --sysroot=$(SYSROOT_PATH) $(ARCH_CFLAGS) endif FF_EXTRALIBS := $(FFEXTRALIBS) FF_DEP_LIBS := $(DEP_LIBS) diff --git a/ffmpeg-y/disable_decoder_config.sh b/ffmpeg-y/disable_decoder_config.sh index e7def942f6..7a7e330810 100755 --- a/ffmpeg-y/disable_decoder_config.sh +++ b/ffmpeg-y/disable_decoder_config.sh @@ -98,4 +98,4 @@ export http_proxy="" export https_proxy="" export no_proxy="" -./configure ${configure_attr} --extra-cflags="-mfloat-abi=softfp -mfpu=neon-vfpv4 -fPIC -fstack-protector-all -s -ftrapv" --extra-ldflags="-Wl,-z,relro,-z,now -fPIC" +${CFG_CONFIGURE:=./configure} ${configure_attr} --extra-cflags="-mfloat-abi=softfp -mfpu=neon-vfpv4 -fPIC -fstack-protector-all -s -ftrapv" --extra-ldflags="-Wl,-z,relro,-z,now -fPIC" diff --git a/ffmpeg-y/enable_decoder_config.sh b/ffmpeg-y/enable_decoder_config.sh index 238650f1c0..d82387af81 100755 --- a/ffmpeg-y/enable_decoder_config.sh +++ b/ffmpeg-y/enable_decoder_config.sh @@ -58,12 +58,12 @@ if [ "${CFG_CHIP_TYPE}" == "hi3518ev300" ]; then echo "hi3518ev300 =? ${CFG_CHIP_TYPE}" configure_attr+=" --arch=arm --cpu=cortex-a7 " echo ${configure_attr} --extra-cflags="-mfloat-abi=softfp -mfpu=neon-vfpv4" -./configure ${configure_attr} --extra-cflags="-mfloat-abi=softfp -mfpu=neon-vfpv4 -fPIC -fstack-protector-all -s -ftrapv" --extra-ldflags="-fPIC -Wl,-z,relro,-z,now --shared" +${CFG_CONFIGURE:=./configure} ${configure_attr} --extra-cflags="-mfloat-abi=softfp -mfpu=neon-vfpv4 -fPIC -fstack-protector-all -s -ftrapv" --extra-ldflags="-fPIC -Wl,-z,relro,-z,now --shared" fi if [ "${CFG_CHIP_TYPE}" == "hi3516cv300" ]; then echo "hi3516cv300 =? ${CFG_CHIP_TYPE}" configure_attr+=" --arch=arm --cpu=arm926ej-s --cross-prefix=${CFG_SDK_TOOLCHAIN} " -./configure ${configure_attr} --extra-cflags="-nostdlib -nostdinc -fPIC -mlong-calls -fstack-protector-all -s -ftrapv" --extra-ldflags="-fPIC -Wl,-z,relro,-z,now --shared" +${CFG_CONFIGURE:=./configure} ${configure_attr} --extra-cflags="-nostdlib -nostdinc -fPIC -mlong-calls -fstack-protector-all -s -ftrapv" --extra-ldflags="-fPIC -Wl,-z,relro,-z,now --shared" fi