From patchwork Fri Feb 24 03:22:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antero Mejr X-Patchwork-Id: 47253 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 16AF416BA8; Fri, 24 Feb 2023 03:24:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BDC8616B9D for ; Fri, 24 Feb 2023 03:24:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVOgo-0003GI-1w; Thu, 23 Feb 2023 22:24:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVOgk-0003G2-OS for guix-patches@gnu.org; Thu, 23 Feb 2023 22:24:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVOgk-0006Bm-DR for guix-patches@gnu.org; Thu, 23 Feb 2023 22:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVOgk-00051m-9L for guix-patches@gnu.org; Thu, 23 Feb 2023 22:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61745] [PATCH 4/5] gnu: Add lib9. Resent-From: Antero Mejr Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Feb 2023 03:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61745@debbugs.gnu.org Cc: Antero Mejr Received: via spool by 61745-submit@debbugs.gnu.org id=B61745.167720898519248 (code B ref 61745); Fri, 24 Feb 2023 03:24:02 +0000 Received: (at 61745) by debbugs.gnu.org; 24 Feb 2023 03:23:05 +0000 Received: from localhost ([127.0.0.1]:35720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVOfp-00050N-4Y for submit@debbugs.gnu.org; Thu, 23 Feb 2023 22:23:05 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:39646) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVOfn-0004z7-1E for 61745@debbugs.gnu.org; Thu, 23 Feb 2023 22:23:04 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (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 4PNFZl2bzMz9slk for <61745@debbugs.gnu.org>; Fri, 24 Feb 2023 04:22:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1677208975; 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=vgetSH48vQGAkNebe8jmBtOpjitwBoFE0W/EOhPLk0E=; b=VoMdoyk8z2fhPK9f1YmU72AJsOrtZChTk1sfzgtvRjrW8CLOzwgBeblZGZ1oaMoaVobq7G AphgVCW5E+8W4vVD+px0XLtg+31JCUXx2UExMra5xMF8gIUy3Nab9d6GyJ1291ACBEk1oW VsbOG7i/koA0/6osP9rStrS2W4GAV4/v+egBRBdhYug/y4vxV2IWirAGZjQdleX3v4bqf5 a0wu+ithXa4rUHk6oF4WBgUfx/9KU9Blbqafy65mExM1ZqqHeAYlJbI3euMV23Yla/ZgRH 0it+7CfnfiEIdp2KZ5hc8JDQ5ag9dLIkhN/S3HmkkFAbejQQQAKxgNtioYErxQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1677208973; 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=vgetSH48vQGAkNebe8jmBtOpjitwBoFE0W/EOhPLk0E=; b=CVwC2lUyPUuvPBZB0lwQ25oZbs+oE/PyFQRylkvqakjOz944/rbOp2ULxNCnREbV52Amni UrkeN+wB5m6T9OPAhmqPw+x6Ssc8j9yalSeCnY+2QRUF0JFSGAbDRHShvvvyOS46KLiINc 1D6hPsFqTPs0uJGznHpMlQEsaRNjuZeq8CxUBDbmPBiXQWTpZG8IcXcmO0WRqubGNkPNZI Gz4rnHjiyxGHvfyhnHhk7avgFnTcQbbGACd1dC+HGTrCqbh1PZcfpVQatjANpmIEm3Q6lC fHEFIiH4xEtFe5kydTrE2N4/4304wUJeVZ6wvyoummcYWDxdRXl5jKZ4qaIsUw== Date: Fri, 24 Feb 2023 03:22:19 +0000 Message-Id: <20230224032220.14820-4-antero@mailbox.org> In-Reply-To: <20230224032220.14820-1-antero@mailbox.org> References: <20230224032220.14820-1-antero@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: io7mo3i43arniccoegdr5sgjmqgkj7is X-MBO-RS-ID: ffe00867362e66bfa18 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Antero Mejr X-ACL-Warn: , Antero Mejr via Guix-patches X-Patchwork-Original-From: Antero Mejr via Guix-patches via From: Antero Mejr Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/suckless.scm (lib9): New variable. --- gnu/packages/suckless.scm | 72 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 8844482cc9..7f79e9d7e9 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -1252,3 +1252,75 @@ (define-public svkbd (description "svkbd is a simple virtual keyboard, intended to be used in environments, where no keyboard is available.") (license license:expat))) + +(define-public lib9 + ;; no release since 2010 + (let ((commit "63916da7bd6d73d9a405ce83fc4ca34845667cce") + (revision "0")) + (package + (name "lib9") + (version (git-version "7" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.suckless.org/9base/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04j8js4s3jmlzi3m46q81bq76rn41an58ffhkbj9p5wwr5hvplh8")))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ;no tests + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "config.mk" + (("^PREFIX.*=.*$") + (string-append "PREFIX=\"" #$output "\"\n")) + (("^OBJTYPE.*=.*$") + #$@(cond + ((target-x86-64?) + #~(string-append "OBJTYPE=x86_64\n")) + ((target-x86?) + #~(string-append "OBJTYPE=386\n")) + ((target-powerpc?) + #~(string-append "OBJTYPE=power\n")) + ((target-arm32?) + #~(string-append "OBJTYPE=arm\n")))) + (("^CFLAGS.*+=.*$") + (string-append + "CFLAGS+=-O2 -g -I. -fPIC -c -DPLAN9PORT " + "-DPREFIX=\\\"" #$output "\\\"\n")) + (("^LDFLAGS.*+=.*$") + "LDFLAGS+=\n") + (("^CC.*=.*$") + (string-append "CC=" #$(cc-for-target) "\n"))) + (substitute* "lib9/libc.h" + (("#define main.*p9main") + "")) + (substitute* "lib9/main.c" + (("p9main\\(argc, argv\\);") + "") + (("extern void p9main\\(int, char\\*\\*\\);") + "")) + (substitute* "lib9/Makefile" + (("lib9.a") + "lib9.so") + (("LIB9OFILES=\\\\") + "LIB9OFILES=convM2D.o \\") + (("@\\$\\{AR\\} \\$\\{LIB\\} \\$\\{OFILES\\}") + "gcc -shared ${OFILES} -o lib9.so")))) + (add-after 'patch 'chdir + (lambda _ + (chdir "lib9"))) + (delete 'configure)))) ;no configure script + (home-page "https://tools.suckless.org/9base/") + (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux" + "powerpc-linux")) + (synopsis "Unix port of Plan 9's formatted I/O C library") + (description + "This package provides a ported version of the Plan 9 lib9 C library. +It also contains the Plan 9 libbio, libregexp, libfmt and libutf libraries.") + (license (list license:expat ;modifications + license:lpl1.02))))) ;original plan9 code