Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id 73237780DE8 for <~alpine/aports@lists.alpinelinux.org>; Thu, 13 Jan 2022 15:12:17 +0000 (UTC) Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4JZSb51NKQzQkBQ; Thu, 13 Jan 2022 16:12:17 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kasku.net; s=MBO0001; t=1642086734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=osKam1DL4yHR2Zi6rFuckhkZAmeeBMvW9BM6ql8IrZ0=; b=izTlCT17ESs51iFJFGSaT/xn46dg5SuQODRJnryATXAeS8C7skFWjDm2IzrWhkKJp/3DQS uECyfdOtvMCB6APyE+P0jwMo1Qig3Kk7JctEUY43aUgPilW0bTlIe4VI8vG1T/ImBGp6ne PzVdSt6TCXN3rJiIuOlr8k4wMuJh1QjpzEoECre/GBr0tH1vOP3Lj5ZwjPnxFi4qIYFZ9M Bp5JDgw+mqIG7vxoKR7i/6vHAtHNcXiQ3hOV/vHaoUkxx9N8jx0XVx8te/RWEpq/na/VJG qUC90KtqMTzdFcxiipcuaQxWP0SXQpEsmaVvKtLY+qcFAjSKgD/GMcxGYwxKUQ== From: Cormac Stephenson To: ~alpine/aports@lists.alpinelinux.org Cc: Cormac Stephenson Subject: [PATCH v2 2/2] testing/kakoune: patch Makefile to not overwrite CXXFLAGS Date: Thu, 13 Jan 2022 15:10:59 +0000 Message-Id: <20220113151057.4483-2-c7s@kasku.net> In-Reply-To: <20220113151057.4483-1-c7s@kasku.net> References: <20220113151057.4483-1-c7s@kasku.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit --- v2 includes pkgrel bump testing/kakoune/0001-fix-CXXFLAGS.patch | 25 +++++++++++++++++++++++++ testing/kakoune/APKBUILD | 4 +++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 testing/kakoune/0001-fix-CXXFLAGS.patch diff --git a/testing/kakoune/0001-fix-CXXFLAGS.patch b/testing/kakoune/0001-fix-CXXFLAGS.patch new file mode 100644 index 0000000000..54299cb252 --- /dev/null +++ b/testing/kakoune/0001-fix-CXXFLAGS.patch @@ -0,0 +1,25 @@ +From 4f4e4cc5a52efa02b763440d5bf6f5923258eafc Mon Sep 17 00:00:00 2001 +From: Cormac Stephenson +Date: Thu, 13 Jan 2022 05:04:52 +0000 +Subject: [PATCH] fix CXXFLAGS + +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index 63bf1833..abea58aa 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -16,7 +16,7 @@ ifeq ($(debug),yes) + suffix := .debug + else + ifeq ($(debug),no) +- CXXFLAGS += -O3 ++ # CXXFLAGS += -O3 + suffix := .opt + else + $(error debug should be either yes or no) +-- +2.34.1 + diff --git a/testing/kakoune/APKBUILD b/testing/kakoune/APKBUILD index df042681b6..82bd0aaf46 100644 --- a/testing/kakoune/APKBUILD +++ b/testing/kakoune/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakub Skrzypnik pkgname=kakoune pkgver=2021.11.08 -pkgrel=0 +pkgrel=1 pkgdesc="Code editor heavily inspired by Vim, but with less keystrokes" url="http://kakoune.org" arch="all" @@ -11,6 +11,7 @@ makedepends="asciidoc" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/mawww/kakoune/archive/v$pkgver.tar.gz alpine-linux.kak + 0001-fix-CXXFLAGS.patch " build() { @@ -29,4 +30,5 @@ package() { sha512sums=" 7ddb5952f07caa0f2861e71805d6bac574f2b90e8eac2358c251c1a99c3b85a914dd313c28da3d7871fd65f9b0c598ae8dc287e847f3ec17ee38b28d2a9fa0ec kakoune-2021.11.08.tar.gz c5b11dc28adf785b4e83637fe1d5c9db334616d2d3f6c667823745e273f739c57d0d408b9bec8a65210e3c7ccb80a5b488ebbb3c0c5de8bdec13e1b4b4d02b77 alpine-linux.kak +23d05861de3c23c8193b1b6d7ca0d2b5b33548c0ae9a317186ccca6533b51daffb9064d3ab9e7ac0a0a794e119633089ca34673b6d9dd56041e2f9046b38b87b 0001-fix-CXXFLAGS.patch " -- 2.34.1