From patchwork Sun Oct 1 22:55:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 5364 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.61.8 with SMTP id n8csp896940jan; Sun, 1 Oct 2017 15:55:50 -0700 (PDT) X-Received: by 10.28.105.200 with SMTP id z69mr7751358wmh.20.1506898549948; Sun, 01 Oct 2017 15:55:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506898549; cv=none; d=google.com; s=arc-20160816; b=eyhjgnQOt7BeY+R+WifjQo06cTR0yXnn5BSLEmvcHD72dAVQ/nUk/qdsLPGi4wZ1RA HepgyGXw0DSAyF/YLcxgdU371wfAWIKpB4scBMS//CWJ+trumdfBlAxVSqbfKBkVs8Km +5qf2RRn0QoXMIRCOyusMhaGonSYNgFB7CtzAhR9yI4QXir68DmBpFuOtozPk3URGs/d GvVNCrfa9xIGM4+XjircB5xjd73AdhPa62u3sOpgIxDgSm50GjpcecENdHs39gPFdkfi G/EzXwV3VCz2n5Zt2N+GJz48OamQNx662jpTagk0d2uh+6sB3p7N5VCUTbQhHl/YSwWp Cvnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=nc7zv133omh/DBw6h+qxTC9ZoqI4Qph/5m6rODYY1j8=; b=vsKpEJBwEKVcVY1zUW6mgzRWCzJTcIj02CqVPBwEISzStOMzQkAfKM2MZ3NPw4bd1I /EUXa0HxZYjulYGiyYpJufLJJNgHUbS1RuQOxh923lHzHvDpttKOC/BvaA/HOWja1ebA bxvS0CBU5T/by3cMfteOUrILSCzIZUwpu3VhpZto0EHXw1FlKrwz8tEjqtXwlfhQmCjY shbX3hF7iM1/QHp7rjROyofLcjGiSP7SdXehkqOueMfdtH2txuQrJYSn5nvp9rYnWvxd wPoZs42OjhXGdIiJLxcP5fKBDLgrQ8oAG+ddKPAAzcA5MYtwQUeB2D8Rx+O/KewGpuXa 3Drw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=LTBxIlyQ; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t4si7588366wrb.421.2017.10.01.15.55.49; Sun, 01 Oct 2017 15:55:49 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=LTBxIlyQ; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 565EA689D4C; Mon, 2 Oct 2017 01:55:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4BEA36882AC for ; Mon, 2 Oct 2017 01:55:27 +0300 (EEST) Received: by mail-qk0-f196.google.com with SMTP id a12so232617qka.4 for ; Sun, 01 Oct 2017 15:55:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=I4TsAr6B83P77lxIasbqS0Dj2fG8pIZ8UmTjZBjdsT4=; b=LTBxIlyQ/w7rQ88FZYj2LW5O3D1GTwxL/QJUClWEb3wkSHQkIGo+X3WQNjvzW0k1zz w7h3Do6uC5FOXdANeOiQa2AGrWVFq86Uo7Sktuvc4p/rl9xU89H+Cq3ce2FjbSOezFdA pbKjTXPHxs4qgwfOjwLD+7wn3N6pBLU+2doax33ZL7F7al55j/RPE9wVX08US6i6zY0f chLtgdH66i5ufXGFRzPOyrff9Pfex2DEKqSXgHS3ZoNyL95ZFPRY0d+lRIz0FvbZVCht 3Zi3hcOd3lxQrjAYg5vjUiBIGH6imGmhttQJWYQRnf5Bt7wrtIKcBnj9U42yuV+5wPEy Hfvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=I4TsAr6B83P77lxIasbqS0Dj2fG8pIZ8UmTjZBjdsT4=; b=TmnUuQH08j8nLL7REBHMbysN9PBtLLzhTwzZQXee+aPJOY2PdsZ1R2NvZBEGKJc64W /IaImLfDKfPdjE6XnyS8xpsQ77HRihw9rURenXr17cZmMJ55SZC/VkJWQqDJBKaMfJ2t OZqtCH+DSZ00wlWLJ30eE/F2/dP4Db4JOvtArZi/U0WexjjIlSu+HitFj6jpnym/frbe nrY38s9oVYfh/LoZGbDueg5HCCOuU/F7VLm8jzB+41AVvak8gZYIjJfxVZ2H7KbGAfrU UZOVWbuzcyJHjPX8DQJ5JkgTSKo7cUuEuPZbhEaYanSOacXYICwV2kVdvnsM0C7MWOoh JlqA== X-Gm-Message-State: AMCzsaWigfBBEqKjQeoYlHuzvLiNSg0RClNh8MQAEqPH2qdTBsBjUBeT +YyUvIYZgeaRC7HiijuZFR6sYg== X-Google-Smtp-Source: AOwi7QBr8ev2Y4OVHMnWffAPkFqlCthO4mPS3RIgc1xCm7kxtXgbZ8T2gE3IqjKR0HVq4cWZgCYb2g== X-Received: by 10.55.204.9 with SMTP id r9mr10079928qki.33.1506898540113; Sun, 01 Oct 2017 15:55:40 -0700 (PDT) Received: from localhost.localdomain ([181.231.68.242]) by smtp.gmail.com with ESMTPSA id u51sm6268245qth.67.2017.10.01.15.55.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 01 Oct 2017 15:55:39 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 1 Oct 2017 19:55:29 -0300 Message-Id: <20171001225529.9288-1-jamrial@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [FFmpeg-devel] [PATCH] build: don't strip binaries during compilation X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Do it during install instead, like with the libraries. There's no benefit making a stripped copy of the CLI tools in the build folder. Doing it during install saves build time and storage space. Signed-off-by: James Almer --- FATE slots will love this, especially those running on disk space deprived VMs. Makefile | 6 +----- doc/examples/Makefile | 7 ++----- fftools/Makefile | 10 +++++----- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 3007da50f7..1c6bc2fbb9 100644 --- a/Makefile +++ b/Makefile @@ -96,11 +96,7 @@ include $(SRC_PATH)/doc/examples/Makefile libavcodec/utils.o libavformat/utils.o libavdevice/avdevice.o libavfilter/avfilter.o libavutil/utils.o libpostproc/postprocess.o libswresample/swresample.o libswscale/utils.o : libavutil/ffversion.h -$(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF) - $(CP) $< $@ - $(STRIP) $@ - -%$(PROGSSUF)_g$(EXESUF): $(FF_DEP_LIBS) +$(PROGS): %$(PROGSSUF)$(EXESUF): $(FF_DEP_LIBS) $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS) VERSION_SH = $(SRC_PATH)/ffbuild/version.sh diff --git a/doc/examples/Makefile b/doc/examples/Makefile index ff958d33c6..c813da4505 100644 --- a/doc/examples/Makefile +++ b/doc/examples/Makefile @@ -21,16 +21,14 @@ DOC_EXAMPLES-$(CONFIG_TRANSCODE_AAC_EXAMPLE) += transcode_aac DOC_EXAMPLES-$(CONFIG_TRANSCODING_EXAMPLE) += transcoding DOC_EXAMPLES := $(DOC_EXAMPLES-yes:%=doc/examples/%$(PROGSSUF)$(EXESUF)) -DOC_EXAMPLES_G := $(DOC_EXAMPLES-yes:%=doc/examples/%$(PROGSSUF)_g$(EXESUF)) ALL_DOC_EXAMPLES := $(DOC_EXAMPLES) $(DOC_EXAMPLES-:%=doc/examples/%$(PROGSSUF)$(EXESUF)) -ALL_DOC_EXAMPLES_G := $(DOC_EXAMPLES_G) $(DOC_EXAMPLES-:%=doc/examples/%$(PROGSSUF)_g$(EXESUF)) PROGS += $(DOC_EXAMPLES) EXAMPLES_FILES := $(wildcard $(SRC_PATH)/doc/examples/*.c) $(SRC_PATH)/doc/examples/README EXAMPLE_MAKEFILE := $(SRC_PATH)/doc/examples/Makefile $(foreach P,$(DOC_EXAMPLES),$(eval OBJS-$(P:%$(PROGSSUF)$(EXESUF)=%) = $(P:%$(PROGSSUF)$(EXESUF)=%).o)) -$(DOC_EXAMPLES_G): %$(PROGSSUF)_g$(EXESUF): %.o +$(DOC_EXAMPLES): %$(PROGSSUF)$(EXESUF): %.o examples: $(DOC_EXAMPLES) @@ -40,8 +38,7 @@ OBJDIRS += doc/examples DOXY_INPUT += $(DOC_EXAMPLES:%$(PROGSSUF)$(EXESUF)=%.c) examplesclean: - $(RM) $(ALL_DOC_EXAMPLES) $(ALL_DOC_EXAMPLES_G) - $(RM) $(CLEANSUFFIXES:%=doc/examples/%) + $(RM) $(ALL_DOC_EXAMPLES) $(CLEANSUFFIXES:%=doc/examples/%) docclean:: examplesclean diff --git a/fftools/Makefile b/fftools/Makefile index 094f6d6265..37ff131165 100644 --- a/fftools/Makefile +++ b/fftools/Makefile @@ -8,7 +8,6 @@ PROGS += $(AVPROGS) AVBASENAMES = ffmpeg ffplay ffprobe ffserver ALLAVPROGS = $(AVBASENAMES:%=%$(PROGSSUF)$(EXESUF)) -ALLAVPROGS_G = $(AVBASENAMES:%=%$(PROGSSUF)_g$(EXESUF)) OBJS-ffmpeg += fftools/ffmpeg_opt.o fftools/ffmpeg_filter.o fftools/ffmpeg_hw.o OBJS-ffmpeg-$(CONFIG_CUVID) += fftools/ffmpeg_cuvid.o @@ -22,11 +21,11 @@ OBJS-ffserver += fftools/ffserver_config.o define DOFFTOOL OBJS-$(1)-$(CONFIG_OPENCL) += fftools/cmdutils_opencl.o OBJS-$(1) += fftools/cmdutils.o fftools/$(1).o $(OBJS-$(1)-yes) -$(1)$(PROGSSUF)_g$(EXESUF): $$(OBJS-$(1)) +$(1)$(PROGSSUF)$(EXESUF): $$(OBJS-$(1)) $$(OBJS-$(1)): | fftools $$(OBJS-$(1)): CFLAGS += $(CFLAGS-$(1)) -$(1)$(PROGSSUF)_g$(EXESUF): LDFLAGS += $(LDFLAGS-$(1)) -$(1)$(PROGSSUF)_g$(EXESUF): FF_EXTRALIBS += $(EXTRALIBS-$(1)) +$(1)$(PROGSSUF)$(EXESUF): LDFLAGS += $(LDFLAGS-$(1)) +$(1)$(PROGSSUF)$(EXESUF): FF_EXTRALIBS += $(EXTRALIBS-$(1)) -include $$(OBJS-$(1):.o=.d) endef @@ -47,6 +46,7 @@ install-progs-$(CONFIG_SHARED): install-libs install-progs: install-progs-yes $(AVPROGS) $(Q)mkdir -p "$(BINDIR)" $(INSTALL) -c -m 755 $(AVPROGS) "$(BINDIR)" + $(STRIP) $(addprefix "$(BINDIR)/", $(AVPROGS)) uninstall: uninstall-progs @@ -54,4 +54,4 @@ uninstall-progs: $(RM) $(addprefix "$(BINDIR)/", $(ALLAVPROGS)) clean:: - $(RM) $(ALLAVPROGS) $(ALLAVPROGS_G) $(CLEANSUFFIXES:%=fftools/%) + $(RM) $(ALLAVPROGS) $(CLEANSUFFIXES:%=fftools/%)