Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id 67BFF780FFD for <~alpine/aports@lists.alpinelinux.org>; Thu, 13 Jan 2022 05:44:26 +0000 (UTC) Received: from smtp102.mailbox.org (smtp102.mailbox.org [80.241.60.233]) (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-202.mailbox.org (Postfix) with ESMTPS id 4JZCsS3qSYzQl11; Thu, 13 Jan 2022 06:38:52 +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=1642052330; 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=+LhagEVPB7NVpdfl7Mp7xVyuENpW0VklIgdOwEDhefk=; b=aRsUwk6HTcAVVuSmzY1O2Vqa1u9k2BiA5k/PQcsmPon/dFKdlREFH5PtU1FsIlWUY5eMrX Hru+lWoUYvSSt3w6cI2xTfZ9iBZ8tg21dZ0vMWufW9PZNqBdVNFt5oIGECVrXZFjPaRXWg 7pP8aya9tr1Q3uxEJAfsumY5lblYD7YOvIzcNBPuOT1OzEkvO30UeYHFQskVE4acjuNvqE Y/I34wjk3HKexJpVtpBNinWx3ogywpXrk2Dkzxnj4rlespwu+ssZ8hQOGqzct4r/b9RZxV dWeYvwXQSM730M1+kGTsTC4I5hGS+hPVg00zak0xT33SngvWf4ZczQ/1Gchzlw== From: Cormac Stephenson To: ~alpine/aports@lists.alpinelinux.org Cc: Cormac Stephenson Subject: [PATCH 2/2] testing/kakoune: patch Makefile to not overwrite CXXFLAGS Date: Thu, 13 Jan 2022 05:38:03 +0000 Message-Id: <20220113053801.1428-2-c7s@kasku.net> In-Reply-To: <20220113053801.1428-1-c7s@kasku.net> References: <20220113053801.1428-1-c7s@kasku.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit --- testing/kakoune/0001-fix-CXXFLAGS.patch | 25 +++++++++++++++++++++++++ testing/kakoune/APKBUILD | 2 ++ 2 files changed, 27 insertions(+) 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..b44d33851e 100644 --- a/testing/kakoune/APKBUILD +++ b/testing/kakoune/APKBUILD @@ -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