From mboxrd@z Thu Jan  1 00:00:00 1970
From: Olivier Matz <olivier.matz@6wind.com>
Subject: Re: [PATCH v2] mk: fix parallel build of test resources
Date: Fri, 24 Jun 2016 16:06:18 +0200
Message-ID: <576D3E5A.6060108@6wind.com>
References: <1466721363-24546-1-git-send-email-thomas.monjalon@6wind.com>
 <1466767379-7552-1-git-send-email-thomas.monjalon@6wind.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
To: Thomas Monjalon <thomas.monjalon@6wind.com>, dev@dpdk.org
Return-path: <dev-bounces@dpdk.org>
Received: from mail.droids-corp.org (zoll.droids-corp.org [94.23.50.67])
 by dpdk.org (Postfix) with ESMTP id B728CC516
 for <dev@dpdk.org>; Fri, 24 Jun 2016 16:06:25 +0200 (CEST)
In-Reply-To: <1466767379-7552-1-git-send-email-thomas.monjalon@6wind.com>
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

Hi Thomas,

On 06/24/2016 01:22 PM, Thomas Monjalon wrote:
> --- a/app/test/Makefile
> +++ b/app/test/Makefile
> @@ -43,14 +43,14 @@ define linked_resource
>  SRCS-y += $(1).res.o
>  $(1).res.o: $(2)
>  	@  echo '  MKRES $$@'
> -	$Q ln -fs $$< resource.tmp
> +	$Q [ "$$(<D)" = . ] || ln -fs $$<

Maybe the symbolic link file in the build directory could be prefixed
with "lnk_"... (see following below)

>  	$Q $(OBJCOPY) -I binary -B $(RTE_OBJCOPY_ARCH) -O $(RTE_OBJCOPY_TARGET) \
>  		--rename-section                                         \
>  			.data=.rodata,alloc,load,data,contents,readonly  \
> -		--redefine-sym _binary_resource_tmp_start=beg_$(1)       \
> -		--redefine-sym _binary_resource_tmp_end=end_$(1)         \
> -		--redefine-sym _binary_resource_tmp_size=siz_$(1)        \
> -		resource.tmp $$@ && rm -f resource.tmp
> +		--redefine-sym _binary_$$(subst .,_,$$(<F))_start=beg_$(1) \
> +		--redefine-sym _binary_$$(subst .,_,$$(<F))_end=end_$(1)   \
> +		--redefine-sym _binary_$$(subst .,_,$$(<F))_size=siz_$(1)  \
> +		$$(<F) $$@
>  endef
>  
>  ifeq ($(CONFIG_RTE_APP_TEST_RESOURCE_TAR),y)
> @@ -76,7 +76,9 @@ SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) := commands.c
>  SRCS-y += test.c
>  SRCS-y += resource.c
>  SRCS-y += test_resource.c
> -$(eval $(call linked_resource,test_resource_c,resource.c))
> +test_resource.res: test_resource.c
> +	@ cp $< $@
> +$(eval $(call linked_resource,test_resource_c,test_resource.res))
>  $(eval $(call linked_tar_resource,test_resource_tar,test_resource.c))
>  SRCS-$(CONFIG_RTE_APP_TEST_RESOURCE_TAR) += test_pci.c
>  $(eval $(call linked_tar_resource,test_pci_sysfs,test_pci_sysfs))

...this would avoid to rename the resource file and make the patch
easier to understand.

Olivier