Bug#392592: a simpler patch
On Tue, Jan 02, 2007 at 03:34:07PM -0700, dann frazier wrote:
> Here's a patch that simply uses hardcoded definitions instead of
> doing the dynamic tests that require architecture-specific scripts.
We hardcode the compiler version also.
> --- linux-source-2.6.18/arch/ia64/Makefile.orig 2007-01-02 14:40:50.000000000 -0700
> +++ linux-source-2.6.18/arch/ia64/Makefile 2007-01-02 15:01:37.000000000 -0700
> @@ -28,8 +28,12 @@
> -falign-functions=32 -frename-registers -fno-optimize-sibling-calls
> CFLAGS_KERNEL := -mconstant-gp
>
> -GAS_STATUS = $(shell $(srctree)/arch/ia64/scripts/check-gas "$(CC)" "$(OBJDUMP)")
> -CPPFLAGS += $(shell $(srctree)/arch/ia64/scripts/toolchain-flags "$(CC)" "$(OBJDUMP)" "$(READELF)")
> +# Hardcoded for Debian, to avoid introducing arch-specific scripts into
> +# the headers package. See #392592 for details.
> +#GAS_STATUS = $(shell $(srctree)/arch/ia64/scripts/check-gas "$(CC)" "$(OBJDUMP)")
> +#CPPFLAGS += $(shell $(srctree)/arch/ia64/scripts/toolchain-flags "$(CC)" "$(OBJDUMP)" "$(READELF)")
> +GAS_STATUS = good
> +CPPFLAGS += -DHAVE_WORKING_TEXT_ALIGN -DHAVE_MODEL_SMALL_ATTRIBUTE -DHAVE_SERIALIZE_DIRECTIVE
Patches never comment out things, they always remove them.
> ifeq ($(GAS_STATUS),buggy)
> $(error Sorry, you need a newer version of the assember, one that is built from \
Just remove that part completely.
> @@ -77,7 +81,8 @@
> $(Q)$(MAKE) $(build)=$(boot) $@
>
> unwcheck: vmlinux
> - -$(Q)READELF=$(READELF) $(srctree)/arch/ia64/scripts/unwcheck.py $<
> +# -$(Q)READELF=$(READELF) $(srctree)/arch/ia64/scripts/unwcheck.py $<
> + @echo Warning: unwcheck test skipped to workaround missing arch scripts, see \#392592
Warning not neccesary, just drop the whole target.
Bastian
--
It is a human characteristic to love little animals, especially if
they're attractive in some way.
-- McCoy, "The Trouble with Tribbles", stardate 4525.6
Reply to: