[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [UNIKRAFT/LIB-PCRE V2] Makefile.uk: Update symbolic link generation


  • To: "minios-devel@xxxxxxxxxxxxxxxxxxxx" <minios-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: "Jung, Alexander" <a.jung@xxxxxxxxxxxxxxx>
  • Date: Tue, 12 May 2020 12:07:48 +0000
  • Accept-language: en-GB, en-US
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=lancaster.ac.uk; dmarc=pass action=none header.from=lancaster.ac.uk; dkim=pass header.d=lancaster.ac.uk; arc=none
  • Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=No+uKsSORLduwxRJgNlYY2KDu0G4HXMgNy9U/uiYcAI=; b=N9MJqGREP0CNTXSddj5z+M3EFPfdHDA14bvaP4pu+BUgzzewJWCcOePW6NHSBE2Oms89/tkfSZjoyIv08VoHaaT+M4kjgE8Um8+fabNfho4onqgPKpZ+ijHfCtdUCDR5TJYyt4EvTJAtcH+uIaVJl4SGgkq71aH1Kk96XkUVtQ38EpZ6Q4A5pWgiqSWGCqY3AsX8yulrkNZuo5OvDKw+MvWn/DOVu9VXktDlqPjPkdK5dA5CRgQ35KSK3tg4HzOyhDNaI+zimItew59lofvZRVhgc6CbavaCbB/8HTjla0UvJGl3xBAHSYCWhooYMIxXltsemoSqV25ZIe4Od0RahA==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S/uNqRus5JUne+4lseee6CeAfdTrx5auP5tYnBhi8+M0HW/ppr857GNAriVJzrSsOrFtcRk14et5IXxBjSYNoH6I67mdLfpsghf4MlgVJZEleKvAxeg1SLByK3cy7tsK3pfcOVs/+Ej+xtVSXhGHTgW7k8KQIYIpt4HUdjFONNvnLtXvJk4Ow9CF5CGDKEZxuKrwDNb2igfFe28QvQ3/RgYCuH/yua9/b/s3ej8oNWxuuFe7jN+ToEBUncQUCuepRiohmEnNLpESV+3lZoaI3NVnAcENNLzhdByErBNYkAdcIKSN7+2GsLbQZgwUDKEkQwnIfVC0fBZWyf2BCzeY4w==
  • Authentication-results: lists.xenproject.org; dkim=none (message not signed) header.d=none;lists.xenproject.org; dmarc=none action=none header.from=lancaster.ac.uk;
  • Cc: "felipe.huici@xxxxxxxxx" <felipe.huici@xxxxxxxxx>, gaulthier gain <gaulthier.gain@xxxxxxxxx>, "costin.lupu@xxxxxxxxx" <costin.lupu@xxxxxxxxx>
  • Delivery-date: Tue, 12 May 2020 12:07:58 +0000
  • List-id: Mini-os development list <minios-devel.lists.xenproject.org>
  • Thread-index: AQHWKFXzyVFLyf+a4UGXdyCYUKMImQ==
  • Thread-topic: [UNIKRAFT/LIB-PCRE V2] Makefile.uk: Update symbolic link generation

There are two solves for this problem, this is the first and 
better approach.

The alternative is simply add pcre_chartables.c.dist to the list
of LIBPCRE_PREPARED_DEPS.  This will prevent the file from being
targeted by make on subsequent builds (wherein this patch fixes).
However, after reviewing the pcre source code itself, it also
uses the -f flag to distribute the .dist file thus making this
the better solve.

Thanks!

Reviewed-by: Alexander Jung <a.jung@xxxxxxxxxxx>

On 27.04.20, 15:57, "minios-devel-bounces@xxxxxxxxxxxxxxxxxxxx on behalf of 
gaulthier.gain@xxxxxxxxx" <minios-devel-bounces@xxxxxxxxxxxxxxxxxxxx on behalf 
of gaulthier.gain@xxxxxxxxx> wrote:

From: gaulthier gain <gaulthier.gain@xxxxxxxxx>

During the creation of the "pcre_chartables.c" symlink, an error
can appear if the file already exists. This patch fixes this issue
by adding the -f option which removes existing destination files.

Changes v2:
- In addition, we also updated the label with "HOSTLN".

Signed-off-by: gaulthier gain <gaulthier.gain@xxxxxxxxx>
---
 Makefile.uk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.uk b/Makefile.uk
index fee51c8..0444c7d 100644
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -122,8 +122,8 @@ $(LIBPCRE_EXTRACTED)/config.status: $(LIBPCRE_BUILD)/.origin

 # Create pcre_chartables.c symlink
 $(LIBPCRE_EXTRACTED)/pcre_chartables.c: $(LIBPCRE_EXTRACTED)/config.status
-       $(call verbose_cmd,LINK,libpcre: $(notdir $@), \
-               cd $(LIBPCRE_EXTRACTED) && ln -s pcre_chartables.c.dist $@)
+       $(call verbose_cmd,HOSTLN,libpcre: $(notdir $@), \
+               cd $(LIBPCRE_EXTRACTED) && ln -fs pcre_chartables.c.dist $@)

 LIBPCRE_PREPARED_DEPS = \
        $(LIBPCRE_EXTRACTED)/config.status \
-- 
2.17.1



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.