From 85f769af3d9acfa2feab4c753883b984c9b074ae Mon Sep 17 00:00:00 2001 From: Markham Date: Wed, 26 Jun 2024 19:30:19 +0200 Subject: [PATCH] activate lto for libcst; deactivate lto for hd1 ffmpeg --- archive-patches/ntp/0001-mkver_in.patch | 16 ---------------- make/ffmpeg.mk | 12 ++++++++++-- make/libcoolstream.mk | 8 ++++---- 3 files changed, 14 insertions(+), 22 deletions(-) delete mode 100644 archive-patches/ntp/0001-mkver_in.patch diff --git a/archive-patches/ntp/0001-mkver_in.patch b/archive-patches/ntp/0001-mkver_in.patch deleted file mode 100644 index 71a583c..0000000 --- a/archive-patches/ntp/0001-mkver_in.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/scripts/build/mkver.in -+++ b/scripts/build/mkver.in -@@ -15,12 +15,7 @@ - *) ConfStr="${ConfStr}-@VER_SUFFIX@" ;; - esac - --if [ -n "$SOURCE_DATE_EPOCH" ]; then -- ConfStr="$ConfStr `LC_TIME=C TZ=UTC date -d@$SOURCE_DATE_EPOCH 2>/dev/null`" || -- ConfStr="$ConfStr `LC_TIME=C TZ=UTC date -r $SOURCE_DATE_EPOCH`" --else -- ConfStr="$ConfStr `LC_TIME=C TZ=UTC date`" --fi -+ConfStr="$ConfStr" - - if [ ! -f .version ]; then - echo 0 > .version diff --git a/make/ffmpeg.mk b/make/ffmpeg.mk index 3dade2f..127b710 100644 --- a/make/ffmpeg.mk +++ b/make/ffmpeg.mk @@ -440,8 +440,10 @@ FFMPEG_CONFIGURE += --cpu=cortex-a9 --enable-vfp --extra-cflags='-mfpu=vfpv3-d16 endif ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1)) +FF_TARGET_CFLAGS = "-pipe -O3 $(TARGET_ABI) $(TARGET_EXTRA_CFLAGS) $(CXX11_ABI) -g -I$(TARGETPREFIX)/include" +FF_TARGET_LDFLAGS = "-O1 -Wl,-rpath,$(TARGETLIB) -Wl,-rpath-link,$(TARGETLIB) -L$(TARGETLIB) -Wl,--gc-sections" FFMPEG_CONFIGURE += --disable-iconv -FFMPEG_CONFIGURE += --cpu=armv6 --disable-vfp --extra-cflags="-I$(TARGETPREFIX)/include" +FFMPEG_CONFIGURE += --cpu=armv6 --disable-vfp endif ifeq ($(BOXTYPE), armbox) @@ -524,7 +526,13 @@ ffmpeg-coolstream: $(ARCHIVE)/ffmpeg-$(FFMPEG_VER).tar.xz | $(TARGETPREFIX) echo -e "==> $(TERM_RED)Applying Patch:$(TERM_NORMAL) $$i"; \ patch -p1 < $$i; \ done; \ - $(BUILDENV) \ + $(BUILDENV) && \ + if [ "$(BOXSERIES)" = "hd1" ]; then \ + CFLAGS=$(FF_TARGET_CFLAGS); \ + CPPFLAGS=$(FF_TARGET_CFLAGS); \ + CXXFLAGS=$(FF_TARGET_CFLAGS); \ + LDFLAGS=$(FF_TARGET_LDFLAGS); \ + fi; \ ./configure \ $(FFMPEG_CONFIGURE) \ $(FFMPEG_CONF_OPTS); \ diff --git a/make/libcoolstream.mk b/make/libcoolstream.mk index 7ff067f..9777cbd 100644 --- a/make/libcoolstream.mk +++ b/make/libcoolstream.mk @@ -16,11 +16,11 @@ EXTRA_INCLUDE_PATH = -I$(TARGETPREFIX)/include EXTRA_LIBRARY_PATH = -L$(TARGETPREFIX)/lib ifeq ($(BOXSERIES), hd1) -LOCAL_CXXFLAGS = -LOCAL_LDFLAGS = +LOCAL_CXXFLAGS = -flto +LOCAL_LDFLAGS = -flto -Wno-odr else ifeq ($(BOXSERIES), hd2) -LOCAL_CXXFLAGS = -Wno-error -Wno-attributes -LOCAL_LDFLAGS = +LOCAL_CXXFLAGS = -flto -Wno-error -Wno-attributes +LOCAL_LDFLAGS = -flto -Wno-odr endif #BOXFAMILY = apollo -- 2.39.5