From patchwork Fri Feb 28 05:34:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thorsten Glaser X-Patchwork-Id: 13995729 Received: from evolvis.org (evolvis.org [217.144.135.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F1DF01EEE0 for ; Fri, 28 Feb 2025 05:34:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.144.135.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740720893; cv=none; b=GrJvBvnOiL1/CWeBAgrskLx+gTvQUQdaSe7IaLhttzmgZZ7rhKrlxCs2vDJ0XQmBoOAIesFXcydh/cRPEM6F1KoW206CXdIQ6v+aPdveKlxKjwbGm6mhsO00saAhi09b1B3f9xAn3Sp5jzPloIkvq0x5UeAxG4h7Qc5vQngGajA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740720893; c=relaxed/simple; bh=WNLP3tWKk7OKmSSLifP4HN/2GNE50Ch6khOyMOYbUUM=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=PCVSwZUwEDm2wvKXtphL3t5K3jnyg7SoyPmkxhxfgbNFupiunIWvs/dfyDkoF0ceql+cULTkvPQhLMIv8ulcoE3+qiaQKhZKdpEZJwTJx+OzkJwh9ToJkLs0SSrTB1A3LULR4fijrPkM1zyVI4Ep5HlZL1N98GSyu6hdWtP23jY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=none smtp.mailfrom=debian.org; arc=none smtp.client-ip=217.144.135.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=debian.org Received: from x61p.mirbsd.org (xdsl-212-8-144-17.nc.de [212.8.144.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X448 server-signature RSA-PSS (2048 bits)) (Client did not present a certificate) (Authenticated sender: x61p@relay.evolvis.org) by evolvis.org (Postfix) with ESMTPSA id C5731100061 for ; Fri, 28 Feb 2025 05:34:43 +0000 (UTC) Received: by x61p.mirbsd.org (Postfix, from userid 1000) id 43099147132; Fri, 28 Feb 2025 06:34:43 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by x61p.mirbsd.org (Postfix) with ESMTP id 3CB81147131 for ; Fri, 28 Feb 2025 06:34:43 +0100 (CET) Date: Fri, 28 Feb 2025 06:34:43 +0100 (CET) From: Thorsten Glaser To: git@vger.kernel.org Subject: gitweb.js build mistake Message-ID: <070641d0-730c-7d92-af4a-9157dc1edd3d@debian.org> Content-Language: de-Zsym-DE-1901-u-em-text-rg-denw-tz-utc, en-Zsym-GB-u-cu-eur-em-text-fw-mon-hc-h23-ms-metric-mu-celsius-rg-denw-tz-utc-va-posix Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hi, the new gitweb.js build (moved into a shell script) now appends said shell script to the end of the gitweb.js that’s actually installed, causing js syntax errors and no small amount of confusion. This is because (rightfully) the output got a new dependency… > $(MAK_DIR_GITWEB)static/gitweb.js: $(MAK_DIR_GITWEB)generate-gitweb-js.sh … but the rule uses $^ to append sources. Possible fix attached. bye, //mirabilos From ed9863971d37ed53628a5871a4a569ccd6287f53 Mon Sep 17 00:00:00 2001 From: mirabilos Date: Fri, 28 Feb 2025 05:33:10 +0000 Subject: [PATCH] Unbreak content of gitweb.js The former $^ adds all prerequisites, including the (proper) new dependency on the generator script. Signed-off-by: mirabilos --- gitweb/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitweb/Makefile b/gitweb/Makefile index d5748e9359..2a8f97cef8 100644 --- a/gitweb/Makefile +++ b/gitweb/Makefile @@ -118,7 +118,7 @@ $(MAK_DIR_GITWEB)gitweb.cgi: $(MAK_DIR_GITWEB)gitweb.perl $(MAK_DIR_GITWEB)static/gitweb.js: $(MAK_DIR_GITWEB)generate-gitweb-js.sh $(MAK_DIR_GITWEB)static/gitweb.js: $(addprefix $(MAK_DIR_GITWEB),$(GITWEB_JSLIB_FILES)) $(QUIET_GEN)$(RM) $@ $@+ && \ - $(MAK_DIR_GITWEB)generate-gitweb-js.sh $@+ $^ && \ + $(MAK_DIR_GITWEB)generate-gitweb-js.sh $@+ $(addprefix $(MAK_DIR_GITWEB),$(GITWEB_JSLIB_FILES)) && \ mv $@+ $@ ### Installation rules -- 2.30.2