Re: [PATCH] Fix eglibc 2.12 "manual" build for GNU Make 3.82

[Bryan Hundven <bryanhundven at gmail dot com>]

On Fri, Jan 21, 2011 at 8:18 PM, Anthony Foiani
<anthony.foiani@gmail.com> wrote:
> # HG changeset patch
> # User Anthony Foiani <anthony.foiani@gmail.com>
> # Date 1295664786 25200
> # Node ID f6e5d28381fecb584830a72786ecdca328d34921
> # Parent Â1e73ceb6ecb81b9dc4171ad65c57e5c5be4ecb76
> Fix eglibc 2.12 "manual" build for GNU Make 3.82
>
> Fedora 14 ships with GNU Make v3.82, which is more particular
> about certain constructs in makefiles.
>
> The patch for the manual build originally came from:
>
> http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=blob_plain;f=source/base/glibc/make-3.82-fix.patch;hb=8217c32ecc2e14962847ba3d8a272eb64a3dba4f
>
> Signed-off-by: Anthony Foiani <anthony.foiani@gmail.com>
>
> diff -r 1e73ceb6ecb8 -r f6e5d28381fe patches/eglibc/2_12/100-make-3_82-manual.patch
> --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/eglibc/2_12/100-make-3_82-manual.patch  ÂFri Jan 21 19:53:06 2011 -0700
> @@ -0,0 +1,14 @@
> +diff -Naur glibc-2.12.1/manual/Makefile glibc-2.12.1-p/manual/Makefile
> +--- glibc-2.12.1/manual/Makefile    2010-07-27 13:34:39.000000000 +0200
> ++++ glibc-2.12.1-p/manual/Makefile   2010-09-13 13:58:50.909000206 +0200
> +@@ -232,7 +232,9 @@
> + .PHONY: stubs
> + stubs: $(objpfx)stubs
> + endif
> +-$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%:
> ++$(objpfx)stubs ../po/manual.pot:
> ++ Â Â Âtouch $@
> ++$(objpfx)stamp%:
> + Â Â Â $(make-target-directory)
> + Â Â Â touch $@
> +
>
> --
> For unsubscribe information see http://sourceware.org/lists.html#faq
>
>


This patch won't work for 2.12.2 and newer. Fix in upstream from
eglibc in glibc: e389efdffdcafae116ce8155276d97469e759891

I tried this with the latest 2.9.x and it applied but made something else bail.
I will try 2.10 and 2.11 later. Need to finish glibc-unite testing.

For those on debian you can help testing by downloading and extracting
make-3.82 source.

./configure --prefix=${HOME}/make
make
make install
export PATH="${HOME}/make/bin:${PATH}"
cd <ct-ng target build directory>
pushd ${CT_WORK_DIR}
rm -rf tools
popd
MAKE=${HOME}/make/bin/make ct-ng build

<report> ;)

-Bryan

--
For unsubscribe information see http://sourceware.org/lists.html#faq