X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 2AEBFDC0060 for ; Mon, 1 Feb 2016 23:39:17 +0000 (UTC) Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id C10F8DC0017 for ; Mon, 1 Feb 2016 23:39:16 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id 128so11342576wmz.3 for ; Mon, 01 Feb 2016 15:39:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=PM5pxHhdOD7fmidVShugwuvovxGj5We9IQD15xRh5aA=; b=jwQXXdsOP/75u6BqRgx9bNtIOsljWIcKJgnyg+BtLvmeAEuxZi3owGeuYeoHmHzU6j vU50DocsjvI8oHJxcMx5TY2SJl/fGKP3AUjAIg1b2vzduWbm+lVkxsh3wUoYwiIG4MS7 5zy0rX8ueYKaXW35JllCttHfzsHX4cWjoJyhOVWSqEAqhnqIJoelmfFfO+P+2kbLl+UV 17645CSDa1xxfgERhIitj+BREt6npBvl7QGAg3A2ynhMXb4CBXmxyi7YAEf1jP83Adr3 sdtfhKlfVGfYGuep7y+Rf8e5JwiymMQF4tfDirQt/f9D95XUpFojfzMAAbwZNuLXZSoD Pk4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=PM5pxHhdOD7fmidVShugwuvovxGj5We9IQD15xRh5aA=; b=c4hYVfWTVDa3DPgGR3+MaXaHgplR8ILXNfHyJ5jLZBfSejLA6uilRQOh+GuWOvw5QO BIjsihwzh3ns5e16Lxg5CUinRKpyfyg8tDi9fRc7Ub2XszIDZi5zXavDjRnq9qT/CUU/ 2fPHv02pTQocyo8Ob9bmks1ukwkY/MCgPcW9YGFnZaj+9dbhmK8tnEkhpgny0EmXNjZM GKVkB/2oRKPgRVsOO5JXZGss+qgfTmMw1h/B2jM95eB6JFyp/rystC+nAXGJx7rAUgoa sIWTTW3PW7q5xMoTiEXMyqeciG6NVF6MvO195L1ZS7OdSIYQU56DglaIt6VdkQMDY11S zSqQ== X-Gm-Message-State: AG10YOR7xf4REgQZnC+SnuiPWlyWpEiMKOJRCX7siDjutdR5Zpby0ywTJpBie8k43FSGIQ== X-Received: by 10.28.14.138 with SMTP id 132mr13285141wmo.25.1454365963419; Mon, 01 Feb 2016 14:32:43 -0800 (PST) Received: from localhost.localdomain (manaka.greata.uk. [195.154.83.235]) by smtp.gmail.com with ESMTPSA id r10sm31142750wjz.24.2016.02.01.14.32.42 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Feb 2016 14:32:42 -0800 (PST) From: Muh Muhten To: alpine-aports@lists.alpinelinux.org Cc: Muh Muhten Subject: [alpine-aports] [PATCH 1/3] abuild: use standard-issue prepare by default Date: Mon, 1 Feb 2016 17:32:27 -0500 Message-Id: <1454365949-60951-1-git-send-email-muh.muhten@gmail.com> X-Mailer: git-send-email 2.5.4 (Apple Git-61) X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: A majority of APKBUILDs currently use exactly the prepare() provided by newapkbuild verbatim, even for packages where no patches exist, which has created the expectation that patches listed as sources are applied by default. This rev simply adds that default prepare() to abuild (and exposes it as default_prepare), with no configurability. If needed, default behaviour can be overridden by providing explicitly prepare(). --- abuild.in | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/abuild.in b/abuild.in index 1f330b1..1b94750 100644 --- a/abuild.in +++ b/abuild.in @@ -528,8 +528,21 @@ getpkgver() { fi } +default_prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) + msg "$i" + patch -p1 -i "$srcdir/$i" || return 1 + ;; + esac + done +} + prepare() { - : + default_prepare } build() { -- 2.5.4 (Apple Git-61) --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---