X-Original-To: alpine-aports@lists.alpinelinux.org
Received: from mail-qk0-f178.google.com (mail-qk0-f178.google.com [209.85.220.178])
	by lists.alpinelinux.org (Postfix) with ESMTP id 0E3085C4E60
	for <alpine-aports@lists.alpinelinux.org>; Sat, 24 Feb 2018 17:50:24 +0000 (GMT)
Received: by mail-qk0-f178.google.com with SMTP id g2so14571225qkd.12
        for <alpine-aports@lists.alpinelinux.org>; Sat, 24 Feb 2018 09:50:24 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20161025;
        h=from:to:subject:date:message-id;
        bh=MUcQh+CzD0xSm6bzgUJav1zj3oRtvFTpaxsXSW+VRVM=;
        b=IF6anhvui7SHTBBmIxHbGoFwNpWFVfKH+SJF5dO0BN/cUKqox+qD14yhJMlK8mqAe7
         qH1EUDtImqO87kTa2f2mwDKhV3huLTaitEXcdpGprcbYZoApZiEpvDyIxMb9q6TWkxKi
         FlOKHUZ0fnWXwaW/G/31i3fIiIkMewxXRVJeYKW7OGiAaU/LeN1lU1TwV6ohqE4JNKZL
         MX2WuZtdW57I3PlZG3/NApt1O2g3vHjyoG1qogz4f+ACRZrvjdt8U7MgZkmTKliNtv1b
         xEAQzam/2WVJb5ERMJJ40CM5WMJSclLy26hw2ksSxeBlwQncrizZbQHjyMVRTNu8s2/P
         MSpA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:from:to:subject:date:message-id;
        bh=MUcQh+CzD0xSm6bzgUJav1zj3oRtvFTpaxsXSW+VRVM=;
        b=ASpGtYan14S78cZEzi56444g9RIhnJobYLXKl6whwHAPy9XvixjPQoHg8PXb+VwNnG
         1iMMCHXc1Yj85id6YBPDFugc3Faw8S5Cw4U0z149egMX8F32AjILaIJFbtj6b9ciP3Ua
         biIcJFLI91eZ0GEQmh6MzNPfvjmj+5jSqqXavDgkKxea42Yq3NL5xEqMGxXHYkDiw/zV
         Wk0D2r+89ndCddrjAzp9Bm/TAeLYLTYhN3SyEumKSiuAYGC/bsUj8rEiYlLO4GFyzk+9
         pK7U4fCv2pvmoYafGHV1wqKrKGogjD5WaPWFxsyIquQmZUewJgbPjgPkyMcBnPi7j6G7
         pNOQ==
X-Gm-Message-State: APf1xPDV8Zkjr7E0mLD5SOTFXOat0JrWXCZKK0xgqr10VZYh/J+1wGWM
	MdnIx6GNpAvSVPXwFHdwDG9azg==
X-Google-Smtp-Source: AG47ELsu6D52FQa5XDTKk2SYSShL7v06vygtUezIrPBtbhhSHD2kEQq0Bti7gw8GaRoIF+xzDI2G4w==
X-Received: by 10.55.21.102 with SMTP id f99mr8648662qkh.185.1519494623331;
        Sat, 24 Feb 2018 09:50:23 -0800 (PST)
Received: from localhost.localdomain (c-71-60-35-21.hsd1.pa.comcast.net. [71.60.35.21])
        by smtp.googlemail.com with ESMTPSA id l80sm3041354qki.92.2018.02.24.09.50.22
        for <alpine-aports@lists.alpinelinux.org>
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Sat, 24 Feb 2018 09:50:22 -0800 (PST)
From: Daniel Sabogal <dsabogalcc@gmail.com>
To: alpine-aports@lists.alpinelinux.org
Subject: [alpine-aports] [PATCH] main/gcc: fix c89/c99 wrappers
Date: Sat, 24 Feb 2018 12:53:40 -0500
Message-Id: <20180224175340.25302-1-dsabogalcc@gmail.com>
X-Mailer: git-send-email 2.16.2
X-Mailinglist: alpine-aports
Precedence: list
List-Id: Alpine Development <alpine-aports.lists.alpinelinux.org>
List-Unsubscribe: 
	<mailto:alpine-aports+unsubscribe@lists.alpinelinux.org?subject=unsubscribe>
List-Post: <mailto:alpine-aports@lists.alpinelinux.org>
List-Help: <mailto:alpine-aports+help@lists.alpinelinux.org?subject=help>
List-Subscribe: 
	<mailto:alpine-aports+subscribe@lists.alpinelinux.org?subject=subscribe>

Prevent variables in the here-document from being expanded.
Keep indentation and use $() for consistency.
---
 main/gcc/APKBUILD | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index e5ffb0abf0..9838eefeb2 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -6,7 +6,7 @@ pkgver=6.4.0
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname="$pkgname$_target"
-pkgrel=6
+pkgrel=7
 pkgdesc="The GNU Compiler Collection"
 url="http://gcc.gnu.org"
 arch="all"
@@ -393,7 +393,7 @@ package() {
 		done
 	else
 		# add c89/c99 wrapper scripts
-		cat >"$pkgdir"/usr/bin/c89 <<EOF
+		cat >"$pkgdir"/usr/bin/c89 <<'EOF'
 #!/bin/sh
 fl="-std=c89"
 for opt; do
@@ -405,13 +405,13 @@ for opt; do
 done
 exec gcc $fl ${1+"$@"}
 EOF
-		cat >"$pkgdir"/usr/bin/c99 <<-EOF
+		cat >"$pkgdir"/usr/bin/c99 <<'EOF'
 #!/bin/sh
 fl="-std=c99"
 for opt; do
 	case "$opt" in
 	-std=c99|-std=iso9899:1999) fl="";;
-	-std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
+	-std=*) echo "$(basename $0) called with non ISO C99 option $opt" >&2
 		exit 1;;
 	esac
 done
-- 
2.16.2



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---