From patchwork Sat Oct 7 09:10:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 5449 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp501176jah; Sat, 7 Oct 2017 02:10:29 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCB3mwzz0N9Ynl3zICrooOWJ94A4cCOTTFhMORFjsKOML2lANc3PY35ll3QeOagwj8H238j X-Received: by 10.223.136.85 with SMTP id e21mr2450100wre.37.1507367429805; Sat, 07 Oct 2017 02:10:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507367429; cv=none; d=google.com; s=arc-20160816; b=cY++kp2bGHpwkuTfhrqoMMy+HxL0ItH8pt2gLD18qSbDCRinAgPg76F/Az5Ir4jYqQ 9Jt+BZ1uBbiMmjOd5aK/WuvgQFmlV0Yc3bbWJtYe+2rT6nwjmJgMOuBHjkG5J7lJhCgZ dup4XIBOrNpxB6o/2cGXfSgCDP/wjrwsW5vHvhPokpxkMu0CVsP3JG1R/YNdZnkBQV6h 9GWAtX7KqYOLFdINJmO78VFgXwZXXcV8EG8RWx+YtA6Uh+TiJ20TB46lktWlglj3b8lO JTB2PbYP7GxmsQusfCbhsBJ902LzwHWGoc4yA8V3GDqSlRa5zKPTzKmyBG3EWPSIrMxW MvuQ== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=VwNll/6v9fOekcvYkQ1bp23ORraJbt1KKS7az6ejBEU=; b=voKB5n5WTAUDQqCrUe6x0Cb2btxtCcBk0yf0aYuT3+u1HP4BHNICRNVXnUtoRifhVy 42o2MqQm/AbuBk/E/Vf1lk2Kk+in8Gj+ETkHsyL2ccXOen5QCfHlI2R0B/U+YHg7cIOk pVfEto/ppWR7HbaK8iOKU5m0nDIBeSYMftKJ3KYa6MzoZCSzNI84KnUEG6u1JmWFb5ur XRuzIAMWkuOPCR6X+EpNfZZnSjmKv3qEfHpf7an/BK7DYzPU0AYWK2Waa3pQRqU1iWrW FoKt6PVxGM6ikfpw/6ruuOK4UVURXEisOepxiNLqveXmTbhEBpREiMCOlfbGhHg79oQJ wUzA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l124si2912649wmg.31.2017.10.07.02.10.29; Sat, 07 Oct 2017 02:10:29 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1C63268A4B3; Sat, 7 Oct 2017 12:10:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C66DC68A45E for ; Sat, 7 Oct 2017 12:10:19 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id DB4A2E1110; Sat, 7 Oct 2017 11:10:20 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2vGCuUqlH123; Sat, 7 Oct 2017 11:10:19 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id ABBA0E110C; Sat, 7 Oct 2017 11:10:19 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Oct 2017 11:10:15 +0200 Message-Id: <20171007091015.9390-1-cus@passwd.hu> X-Mailer: git-send-email 2.13.5 In-Reply-To: References: Subject: [FFmpeg-devel] [PATCHv2] Makefile: generate stripped CLI tools directly instead of copying unstripped ones first 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 Cc: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Now works with --disable-stripping. Signed-off-by: Marton Balint --- Makefile | 4 ++++ configure | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Makefile b/Makefile index 4a1253a052..642651d4cc 100644 --- a/Makefile +++ b/Makefile @@ -97,8 +97,12 @@ 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) +ifeq ($(STRIPTYPE),direct) + $(STRIP) -o $@ $< +else $(CP) $< $@ $(STRIP) $@ +endif %$(PROGSSUF)_g$(EXESUF): $(FF_DEP_LIBS) $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS) diff --git a/configure b/configure index 391c141e7a..3b685b0d24 100755 --- a/configure +++ b/configure @@ -3361,6 +3361,7 @@ x86asmexe_default="nasm" windres_default="windres" nvcc_default="nvcc" nvccflags_default="-gencode arch=compute_30,code=sm_30 -O2" +striptype="direct" # OS target_os_default=$(tolower $(uname -s)) @@ -5087,6 +5088,7 @@ case $target_os in ;; os/2*) strip="lxlite -CS" + striptype="" objformat="aout" add_cppflags -D_GNU_SOURCE add_ldflags -Zomf -Zbin-files -Zargs-wild -Zhigh-mem -Zmap @@ -6824,6 +6826,7 @@ fi # test "$quiet" != "yes" test -e Makefile || echo "include $source_path/Makefile" > Makefile enabled stripping || strip="echo skipping strip" +enabled stripping || striptype="" config_files="$TMPH ffbuild/config.mak doc/config.texi" @@ -6867,6 +6870,7 @@ ARFLAGS=$arflags AR_O=$ar_o RANLIB=$ranlib STRIP=$strip +STRIPTYPE=$striptype NVCC=$nvcc CP=cp -p LN_S=$ln_s