From mboxrd@z Thu Jan  1 00:00:00 1970
From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=)
Subject: Re: [PATCH] gnu: gcj: remove broken symlink and stump binaries.
Date: Thu, 30 Apr 2015 18:05:45 +0200
Message-ID: <87pp6ly52e.fsf@gnu.org>
References: <idjfv7heifn.fsf@bimsb-sys02.mdc-berlin.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41473)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1YnqyK-0007Ty-6d
	for guix-devel@gnu.org; Thu, 30 Apr 2015 12:05:57 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1YnqyE-0006zc-G6
	for guix-devel@gnu.org; Thu, 30 Apr 2015 12:05:56 -0400
Received: from fencepost.gnu.org ([2001:4830:134:3::e]:53164)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ludo@gnu.org>)
	id 1YnqyE-0006zY-C3
	for guix-devel@gnu.org; Thu, 30 Apr 2015 12:05:50 -0400
In-Reply-To: <idjfv7heifn.fsf@bimsb-sys02.mdc-berlin.net> (Ricardo Wurmus's
	message of "Thu, 30 Apr 2015 17:37:16 +0200")
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
To: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Cc: Guix-devel <guix-devel@gnu.org>

Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> skribis:

> This patch adds a build phase to GCJ removing a broken symlink and a
> couple of non-functional binaries, such as "gcc" or "g++".
>
> In a GCJ build these binaries are useless as GCJ is a GCC built only
> with Java support.  When GCJ is installed alongside gcc-toolchain, for
> example, there would be conflicts with GCJ's "gcc" stump binary
> shadowing the usable "gcc" binary from gcc-toolchain.
>
> Removing these binaries should be harmless as users of GCJ are unlikely
> to use "gcc" but "gcj" directly.

Sounds good.

> From 99b56cf4b17b1dbed7977dbce6e3c81fa4115aa7 Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
> Date: Thu, 30 Apr 2015 17:11:39 +0200
> Subject: [PATCH] gnu: gcj: Remove broken symlink and conflicting files.
>
> * gnu/packages/gcc.scm (gcj)[arguments]: Add a build phase to remove a br=
oken
>   symlink and generic stump binaries.

[...]

> +                (for-each delete-file
> +                          (map (cut string-append out <>)
> +                               '("/lib/jvm/jre/lib/amd64/libjawt.so"
> +                                 "/bin/c++"
> +                                 "/bin/cpp"
> +                                 "/bin/g++"
> +                                 "/bin/gcc"
> +                                 "/bin/gcc-ar"
> +                                 "/bin/gcc-nm"
> +                                 "/bin/gcc-ranlib"
> +                                 "/bin/x86_64-unknown-linux-gnu-c++"
> +                                 "/bin/x86_64-unknown-linux-gnu-g++"
> +                                 "/bin/x86_64-unknown-linux-gnu-gcc"
> +                                 "/bin/x86_64-unknown-linux-gnu-gcc-4.8.=
4"
> +                                 "/bin/x86_64-unknown-linux-gnu-gcc-ar"
> +                                 "/bin/x86_64-unknown-linux-gnu-gcc-nm"
> +                                 "/bin/x86_64-unknown-linux-gnu-gcc-ranl=
ib"))))

This is specific to x86_64-linux-gnu though.  Wouldn=E2=80=99t it be better=
 to
use a white list instead, or maybe keep it a black list but use
find-files and regexps?

Thanks,
Ludo=E2=80=99.