From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 69C8432B93; Fri, 20 May 2022 09:53:32 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id A2B8832B3D; Fri, 20 May 2022 09:53:29 +0000 (UTC) Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by atuin.qyliss.net (Postfix) with ESMTPS id 8169632B82 for ; Fri, 20 May 2022 09:53:25 +0000 (UTC) Received: by mail-ej1-x62f.google.com with SMTP id jx22so1163365ejb.12 for ; Fri, 20 May 2022 02:53:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unikie.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fwIuwbhTfE2mzT4PtzU7bcYvwLP7D4Q2yqeNIWEDkxc=; b=G1A8N5KNPEtiRqs9FEyt1p7DpA0Uf21K1xkmlZo2gr1gZNmcFNMeF1zyB0VvUGXHZZ BGDQEnAj3jC/U/CbNZkSFlIhYQLydMRaHVUVPTXJ8b2vV8/6x0RUlZZ5HnaJUJIYKBKQ i+4RIkKO3c3//y9FmMs6K/Q/T2Q3hvkz8c9EcrXy2Ca7e/twO2Pwkv3yjEaS/9ub04Yi 4oc/2+hFv9XruCpxc8KkL7K/H/r4nI9NFB1/wVEE191QlF9/HqnY4ZkSBan329F/eSgs e9uSBcOmuREV877ewDWzeqnfMcyh7w5W935pjYoRvMvP7+NN5HObhWauOsx5DO1LQ8Vh iHcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fwIuwbhTfE2mzT4PtzU7bcYvwLP7D4Q2yqeNIWEDkxc=; b=UhLKCpjzp/MF8+IdIr6UPWr0H2sxElOrk0Z2RSIteKk1BrurFDNPECvUT4hJcmZR1F 1X54bNqdeP/3ruJNZA8Wzijp/vgEDqvkM79VlLw/nfmiAhOec3Z3BMSKtUE5aipI7UW3 oakot//wSwwVBeFmbuHjVLWZ7JdufvppkPtZLji1ufVvUukEtfP/FMPjNqbXzOql2gdW FCDz9VNiz1j5e3viK4Vkbt1+5jfNzdr3LdyiGIuAS4or2QeLoR5Y964a4V7w02PlnRWp lKttm7P2X+G4AI9VF/IHY8y35YHhFLAnzMWWcslJtQj8tl4glF0uamiwUErCvDMmSOxk EvAQ== X-Gm-Message-State: AOAM533JL3pc9kvj0aSKYHkQfLEx8z+k25S0L8QY15ptFOYu8Z07xFBY Mt+cMk/JBKpUPaKZIjVelBiGt7qkZ5P4j0jgmLo= X-Google-Smtp-Source: ABdhPJw2IvvZXlq5AHYL04B87zCVKG4jMVWPoAE9WIQ0GnFkUSCiTzDfY/LYS+l33+ORBB1p733h2w== X-Received: by 2002:a17:907:9490:b0:6fa:7970:3eb8 with SMTP id dm16-20020a170907949000b006fa79703eb8mr8240032ejc.457.1653040403674; Fri, 20 May 2022 02:53:23 -0700 (PDT) Received: from tervis-servu.ssrc.fi ([109.204.204.138]) by smtp.gmail.com with ESMTPSA id b24-20020aa7dc18000000b0042617ba63cfsm4005197edu.89.2022.05.20.02.53.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 May 2022 02:53:22 -0700 (PDT) From: Tero Tervala To: devel@spectrum-os.org Subject: [PATCH] Allow static building of dtc Date: Fri, 20 May 2022 12:52:57 +0300 Message-Id: <20220520095257.23038-1-tero.tervala@unikie.com> X-Mailer: git-send-email 2.33.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: C3DWCVOWSS3KAV26SMRNHVQRF6DIOVRU X-Message-ID-Hash: C3DWCVOWSS3KAV26SMRNHVQRF6DIOVRU X-MailFrom: tero.tervala@unikie.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Tero Tervala X-Mailman-Version: 3.3.5 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Signed-off-by: Tero Tervala --- ...01-Use-libfdt.a-if-building-staticly.patch | 54 +++++++++++++++++++ pkgs/development/compilers/dtc/default.nix | 4 ++ 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/compilers/dtc/0001-Use-libfdt.a-if-building-staticly.patch diff --git a/pkgs/development/compilers/dtc/0001-Use-libfdt.a-if-building-staticly.patch b/pkgs/development/compilers/dtc/0001-Use-libfdt.a-if-building-staticly.patch new file mode 100644 index 00000000000..4f0d6193030 --- /dev/null +++ b/pkgs/development/compilers/dtc/0001-Use-libfdt.a-if-building-staticly.patch @@ -0,0 +1,54 @@ +From 59258caa6e02b5a7d5afc0bfde777b250ef74bbb Mon Sep 17 00:00:00 2001 +From: Tero Tervala +Date: Wed, 18 May 2022 11:20:40 +0300 +Subject: [PATCH] Use libfdt.a if building staticly + +Signed-off-by: Tero Tervala +--- + Makefile | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index ea8c659..9474b63 100644 +--- a/Makefile ++++ b/Makefile +@@ -151,7 +151,7 @@ BIN += fdtoverlay + + SCRIPTS = dtdiff + +-all: $(BIN) libfdt ++all: libfdt $(BIN) + + # We need both Python and swig to build/install pylibfdt. + # This builds the given make ${target} if those deps are found. +@@ -198,6 +198,12 @@ LIBFDT_lib = $(LIBFDT_dir)/$(LIBFDT_LIB) + LIBFDT_include = $(addprefix $(LIBFDT_dir)/,$(LIBFDT_INCLUDES)) + LIBFDT_version = $(addprefix $(LIBFDT_dir)/,$(LIBFDT_VERSION)) + ++ifneq (,$(findstring -static,$(CFLAGS))) ++ LIBFDT_dep = $(LIBFDT_archive) ++else ++ LIBFDT_dep = $(LIBFDT_lib) ++endif ++ + include $(LIBFDT_dir)/Makefile.libfdt + + .PHONY: libfdt +@@ -261,11 +267,11 @@ convert-dtsv0: $(CONVERT_OBJS) + + fdtdump: $(FDTDUMP_OBJS) + +-fdtget: $(FDTGET_OBJS) $(LIBFDT_lib) ++fdtget: $(FDTGET_OBJS) $(LIBFDT_dep) + +-fdtput: $(FDTPUT_OBJS) $(LIBFDT_lib) ++fdtput: $(FDTPUT_OBJS) $(LIBFDT_dep) + +-fdtoverlay: $(FDTOVERLAY_OBJS) $(LIBFDT_lib) ++fdtoverlay: $(FDTOVERLAY_OBJS) $(LIBFDT_dep) + + dist: + git archive --format=tar --prefix=dtc-$(dtc_version)/ HEAD \ +-- +2.25.1 + diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index 04dca4772a9..33369fb1fcc 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-gx9LG3U9etWhPxm7Ox7rOu9X5272qGeHqZtOe68zFs4="; }; + patches = [ + ./0001-Use-libfdt.a-if-building-staticly.patch + ]; + buildInputs = [ libyaml ]; nativeBuildInputs = [ flex bison pkg-config which ] ++ lib.optionals pythonSupport [ python swig ]; -- 2.33.3