From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:33128) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i35U6-0002hY-I6 for guix-patches@gnu.org; Wed, 28 Aug 2019 17:28:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i35U4-00038C-EV for guix-patches@gnu.org; Wed, 28 Aug 2019 17:28:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42518) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i35U4-000381-8V for guix-patches@gnu.org; Wed, 28 Aug 2019 17:28:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i35U2-000536-BE for guix-patches@gnu.org; Wed, 28 Aug 2019 17:28:04 -0400 Subject: [bug#37169] [PATCH] gnu: Add lib3mf. Resent-Message-ID: MIME-Version: 1.0 References: <87y2zdfdno.fsf@gnu.org> In-Reply-To: <87y2zdfdno.fsf@gnu.org> From: Steve Sprang Date: Wed, 28 Aug 2019 14:27:09 -0700 Message-ID: Content-Type: multipart/mixed; boundary="000000000000e111520591340d9d" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 37169@debbugs.gnu.org --000000000000e111520591340d9d Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Aug 28, 2019 at 9:38 AM Ludovic Court=C3=A8s wrote: > > + (add-after 'unpack 'unpack-googletest > > + (lambda* (#:key inputs #:allow-other-keys) > > + (copy-recursively (assoc-ref inputs "googletest-source") > > + "UnitTests/googletest") > > Would it work to simply pass =E2=80=98googletest=E2=80=99 as an input? > If not, this approach is fine IMO. Unfortunately, no, the build process expects to see the googletest source in a sub-module directory. Attached a new patch with the fixes you suggested. --000000000000e111520591340d9d Content-Type: text/x-patch; charset="UTF-8"; name="0001-gnu-Add-lib3mf.patch" Content-Disposition: attachment; filename="0001-gnu-Add-lib3mf.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_jzvrrn3l0 RnJvbSBhNjkxMDIwODA5MzM0Yzk0YTMzYTk2MzJjOGE3ZmQ3NTEwMmZkOGYyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGV2ZSBTcHJhbmcgPHNjc0BzdGV2ZXNwcmFuZy5jb20+CkRh dGU6IEZyaSwgMjMgQXVnIDIwMTkgMTU6MjM6MDAgLTA3MDAKU3ViamVjdDogW1BBVENIXSBnbnU6 IEFkZCBsaWIzbWYuCgoqIGdudS9wYWNrYWdlcy9lbmdpbmVlcmluZy5zY20gKGxpYjNtZik6IE5l dyB2YXJpYWJsZS4KLS0tCiBnbnUvcGFja2FnZXMvZW5naW5lZXJpbmcuc2NtIHwgMzYgKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiAxIGZpbGUgY2hhbmdlZCwgMzYgaW5zZXJ0 aW9ucygrKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9lbmdpbmVlcmluZy5zY20gYi9nbnUv cGFja2FnZXMvZW5naW5lZXJpbmcuc2NtCmluZGV4IGExZjIyMmJlZDQuLjU0YmY1YTdiNjkgMTAw NjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9lbmdpbmVlcmluZy5zY20KKysrIGIvZ251L3BhY2thZ2Vz L2VuZ2luZWVyaW5nLnNjbQpAQCAtMTIsNiArMTIsNyBAQAogOzs7IENvcHlyaWdodCDCqSAyMDE4 LCAyMDE5IEFydW4gSXNhYWMgPGFydW5pc2FhY0BzeXN0ZW1yZWJvb3QubmV0PgogOzs7IENvcHly aWdodCDCqSAyMDE5IFRpbSBTdGFoZWwgPHN3ZWRuZWNrQHN3ZWRuZWNrLnh5ej4KIDs7OyBDb3B5 cmlnaHQgwqkgMjAxOSBKb3ZhbnkgTGVhbmRybyBHLkMgPGJpdDRiaXRAcmlzZXVwLm5ldD4KKzs7 OyBDb3B5cmlnaHQgwqkgMjAxOSBTdGV2ZSBTcHJhbmcgPHNjc0BzdGV2ZXNwcmFuZy5jb20+CiA7 OzsKIDs7OyBUaGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgR3VpeC4KIDs7OwpAQCAtMjEwOSwzICsy MTEwLDM4IEBAIHdoaWxlIGtlZXBpbmcgdGhlIHVzZXIgZXhwZXJpZW5jZSBhdCBtaW5kLiAgQ3V0 dGVyIGlzIGNyZWF0ZWQgYnkgcmV2ZXJzZQogZW5naW5lZXJzIGZvciByZXZlcnNlIGVuZ2luZWVy cy4iKQogICAgIChsaWNlbnNlIChsaXN0IGxpY2Vuc2U6Y2MtYnktc2EzLjAgIDt0aGUgIkljb25p YyIgaWNvbiBzZXQKICAgICAgICAgICAgICAgICAgICBsaWNlbnNlOmdwbDMrKSkpKSAgICA7ZXZl cnl0aGluZyBlbHNlCisKKyhkZWZpbmUtcHVibGljIGxpYjNtZgorICAocGFja2FnZQorICAgIChu YW1lICJsaWIzbWYiKQorICAgICh2ZXJzaW9uICIxLjguMSIpCisgICAgKHNvdXJjZQorICAgICAo b3JpZ2luCisgICAgICAobWV0aG9kIGdpdC1mZXRjaCkKKyAgICAgICh1cmkgKGdpdC1yZWZlcmVu Y2UgKHVybCAiaHR0cHM6Ly9naXRodWIuY29tLzNNRkNvbnNvcnRpdW0vbGliM21mLmdpdCIpCisg ICAgICAgICAgICAgICAgICAgICAgICAgIChjb21taXQgKHN0cmluZy1hcHBlbmQgInYiIHZlcnNp b24pKSkpCisgICAgICAoZmlsZS1uYW1lIChnaXQtZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpCisg ICAgICAoc2hhMjU2CisgICAgICAgKGJhc2UzMgorICAgICAgICAiMTF3cGs2bjlnYTJwNTdoMWRj cnAzN3c3N21paTByN3I2bWxyZ215a2Y3cnZpaTFyemdxZCIpKSkpCisgICAgKGJ1aWxkLXN5c3Rl bSBjbWFrZS1idWlsZC1zeXN0ZW0pCisgICAgKG5hdGl2ZS1pbnB1dHMKKyAgICAgYCgoImdvb2ds ZXRlc3Qtc291cmNlIiAsKHBhY2thZ2Utc291cmNlIGdvb2dsZXRlc3QpKSkpCisgICAgKGlucHV0 cworICAgICBgKCgibGlidXVpZCIgLHV0aWwtbGludXgpKSkKKyAgICAoYXJndW1lbnRzCisgICAg IGAoIzpwaGFzZXMKKyAgICAgICAobW9kaWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzCisgICAg ICAgICAoYWRkLWFmdGVyICd1bnBhY2sgJ3VucGFjay1nb29nbGV0ZXN0CisgICAgICAgICAgIChs YW1iZGEqICgjOmtleSBpbnB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQorICAgICAgICAgICAgIChj b3B5LXJlY3Vyc2l2ZWx5IChhc3NvYy1yZWYgaW5wdXRzICJnb29nbGV0ZXN0LXNvdXJjZSIpCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIlVuaXRUZXN0cy9nb29nbGV0ZXN0IikKKyAg ICAgICAgICAgICAjdCkpKSkpCisgICAgKHN5bm9wc2lzICJJbXBsZW1lbnRhdGlvbiBvZiB0aGUg M0QgTWFudWZhY3R1cmluZyBGb3JtYXQgKDNNRikgZmlsZSBzdGFuZGFyZCIpCisgICAgKGRlc2Ny aXB0aW9uCisgICAgICJMaWIzTUYgaXMgYSBDKysgaW1wbGVtZW50YXRpb24gb2YgdGhlIDNEIE1h bnVmYWN0dXJpbmcgRm9ybWF0ICgzTUYpIGZpbGUKK3N0YW5kYXJkLiAgSXQgb2ZmZXJzIGEgd2F5 IHRvIGludGVncmF0ZSAzTUYgcmVhZGluZyBhbmQgd3JpdGluZyBjYXBhYmlsaXRpZXMsIGFzCit3 ZWxsIGFzIGNvbnZlcnNpb24gYW5kIHZhbGlkYXRpb24gdG9vbHMgZm9yIGlucHV0IGFuZCBvdXRw dXQgZGF0YS4gIFRoZQorc3BlY2lmaWNhdGlvbiBjYW4gYmUgZG93bmxvYWRlZCBhdCBAdXJse2h0 dHA6Ly8zbWYuaW8vc3BlY2lmaWNhdGlvbi99LiIpCisgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly8z bWYuaW8vIikKKyAgICAobGljZW5zZSBsaWNlbnNlOmJzZC0yKSkpCi0tIAoyLjIzLjAKCg== --000000000000e111520591340d9d--