From patchwork Fri Dec 27 07:34:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 305422 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id C81992C00A4 for ; Fri, 27 Dec 2013 18:34:34 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 28AF68B51B; Fri, 27 Dec 2013 07:34:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QmswNl9eLywl; Fri, 27 Dec 2013 07:34:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 3F5088B536; Fri, 27 Dec 2013 07:34:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id CC1081BFA97 for ; Fri, 27 Dec 2013 07:34:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C3FE98B51B for ; Fri, 27 Dec 2013 07:34:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CXABmSuZSc4f for ; Fri, 27 Dec 2013 07:34:30 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail.internet.v.pl (mail.internet.v.pl [62.69.205.34]) by whitealder.osuosl.org (Postfix) with SMTP id 28B2E8B536 for ; Fri, 27 Dec 2013 07:34:29 +0000 (UTC) Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.internet.v.pl (Sendmail) with ESMTP id 60E41D99C6; Fri, 27 Dec 2013 08:34:28 +0100 (CET) Received: from mail.internet.v.pl ([127.0.0.1]) by localhost (poczta.v.pl [127.0.0.1]) (amavisd-new, port 10024) with SMTP id zuBwQj3qap+2; Fri, 27 Dec 2013 08:34:28 +0100 (CET) Received: from localhost.localdomain (93-181-142-99.internetia.net.pl [93.181.142.99]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.internet.v.pl (Sendmail) with ESMTPSA id 0397AD99C5; Fri, 27 Dec 2013 08:34:27 +0100 (CET) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Fri, 27 Dec 2013 08:34:11 +0100 Message-Id: <1388129651-4250-1-git-send-email-jerzy.grzegorek@trzebnica.net> X-Mailer: git-send-email 1.7.9.5 Subject: [Buildroot] [PATCH 1/1] package: unification of use $(subst [._-], [._-], $(_VERSION)) macro X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Currently, there are six packages which use subst macro to change their version. * Three of them (ebtables, icu, perl) use this macro "in place" : EBTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/ebtables/ebtables-$(subst .,-,$(EBTABLES_VERSION)) ICU_SOURCE = icu4c-$(subst .,_,$(ICU_VERSION))-src.tgz PERL_CROSS_OLD_POD = perl$(subst .,,$(PERL_CROSS_BASE_VERSION))delta.pod PERL_CROSS_NEW_POD = perl$(subst .,,$(PERL_VERSION))delta.pod * Two of them (boost, libnss) use an additional variable : BOOST_FILE_VERSION = $(subst .,_,$(BOOST_VERSION)) BOOST_SOURCE = boost_$(BOOST_FILE_VERSION).tar.bz2 LIBNSS_SITE_VERSION = $(subst .,_,$(LIBNSS_VERSION)) LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(LIBNSS_SITE_VERSION)_RTM/src * One package (duma) doesn't use it at all : DUMA_VERSION = 2_5_15 DUMA_SITE = http://downloads.sourceforge.net/project/duma/duma/2.5.15 This commit makes changes to use subst macro "in place", in all of them. Signed-off-by: Jerzy Grzegorek --- package/boost/boost.mk | 3 +-- package/duma/duma.mk | 6 +++--- package/libnss/libnss.mk | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 799eb13..273ceec 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -5,8 +5,7 @@ ################################################################################ BOOST_VERSION = 1.54.0 -BOOST_FILE_VERSION = $(subst .,_,$(BOOST_VERSION)) -BOOST_SOURCE = boost_$(BOOST_FILE_VERSION).tar.bz2 +BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2 BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION) BOOST_INSTALL_STAGING = YES BOOST_LICENSE = Boost Software License 1.0 diff --git a/package/duma/duma.mk b/package/duma/duma.mk index 93ae16e..d11987f 100644 --- a/package/duma/duma.mk +++ b/package/duma/duma.mk @@ -4,9 +4,9 @@ # ################################################################################ -DUMA_VERSION = 2_5_15 -DUMA_SOURCE = duma_$(DUMA_VERSION).tar.gz -DUMA_SITE = http://downloads.sourceforge.net/project/duma/duma/2.5.15 +DUMA_VERSION = 2.5.15 +DUMA_SOURCE = duma_$(subst .,_,$(DUMA_VERSION)).tar.gz +DUMA_SITE = http://downloads.sourceforge.net/project/duma/duma/$(DUMA_VERSION) DUMA_LICENSE = GPLv2+ LGPLv2.1+ DUMA_LICENSE_FILES = COPYING-GPL COPYING-LGPL diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 7215127..666df74 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -6,8 +6,7 @@ LIBNSS_VERSION = 3.14.5 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz -LIBNSS_SITE_VERSION = $(subst .,_,$(LIBNSS_VERSION)) -LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(LIBNSS_SITE_VERSION)_RTM/src +LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_SUBDIR = mozilla/security LIBNSS_DISTDIR = mozilla/dist LIBNSS_INSTALL_STAGING = YES