henri guyenne wrote: > Test OK for AWS and Gtkada building. > > Henri GUYENNE
Your patch seems line wrapped......Adding the ada variables looks goods,
but I cannot comment wether this are all needed variables or not. I'm
not into ada.
But some hunks reintroduce problems that have been fixed already in
upstream. Sorry, but this patch cannot be accepted this way.
Please rebase at least to ptxidist-1.99.12
>>From 418e37312dfae911cc88cd742f1d679489473dc7 Mon Sep 17 00:00:00 2001
> From: Henri GUYENNE <henri.guye...@free.fr>
> Date: Tue, 24 Mar 2009 09:05:12 +0100
> Subject: [PATCH] Add of gnat's variables in ptxdist
> Signed-off-by: Henri GUYENNE <henri.guye...@free.fr>
>
> ---
> rules/pre/Rules.make | 61
> ++++++++++++++++++++++++++++++++++++--------------
> 1 files changed, 44 insertions(+), 17 deletions(-)
>
> diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make
> index 5218e89..acd93b5 100644
> --- a/rules/pre/Rules.make
> +++ b/rules/pre/Rules.make
> @@ -1,5 +1,5 @@
> # -*-makefile-*-
> -# $Id$
> +# $Id: Rules.make 9245 2008-12-19 10:48:58Z mkl $
> #
> # This file contains global macro and environment definitions.
> #
> @@ -41,7 +41,7 @@ SYSROOT := $(PTXCONF_SYSROOT_TARGET)
> # prepare the search path
> # In order to work correctly in cross path all local cross tools must be find
> first!
> #
> -CROSS_PATH :=
> $(PTXCONF_SYSROOT_CROSS)/bin:$(PTXCONF_SYSROOT_CROSS)/sbin:$(PTXCONF_SYSROOT_CROSS)/lib/udev:$$PATH
> +CROSS_PATH :=
> $(PTXCONF_SYSROOT_CROSS)/bin:$(PTXCONF_SYSROOT_CROSS)/sbin:$$PATH
why did you changes this?
>
> #
> ----------------------------------------------------------------------------
> # Environment
> @@ -82,6 +82,18 @@ CROSS_OBJCOPY :=
> $(PTXCONF_COMPILER_PREFIX)objcopy
> CROSS_OBJDUMP := $(PTXCONF_COMPILER_PREFIX)objdump
> CROSS_STRIP := $(PTXCONF_COMPILER_PREFIX)strip
> CROSS_DLLTOOL := $(PTXCONF_COMPILER_PREFIX)dlltool
> +CROSS_GNAT := $(PTXCONF_COMPILER_PREFIX)gnat
> +CROSS_GNATBIND := $(PTXCONF_COMPILER_PREFIX)gnatbind
> +CROSS_GNATCHOP := $(PTXCONF_COMPILER_PREFIX)gnatchop
> +CROSS_GNATCLEAN := $(PTXCONF_COMPILER_PREFIX)gnatclean
> +CROSS_GNATFIND := $(PTXCONF_COMPILER_PREFIX)gnatfind
> +CROSS_GNATKR := $(PTXCONF_COMPILER_PREFIX)gnatkr
> +CROSS_GNATLINK := $(PTXCONF_COMPILER_PREFIX)gnatlink
> +CROSS_GNATLS := $(PTXCONF_COMPILER_PREFIX)gnatls
> +CROSS_GNATMAKE := $(PTXCONF_COMPILER_PREFIX)gnatmake
> +CROSS_GNATNAME := $(PTXCONF_COMPILER_PREFIX)gnatname
> +CROSS_GNATPREP := $(PTXCONF_COMPILER_PREFIX)gnatprep
> +CROSS_GNATXREF := $(PTXCONF_COMPILER_PREFIX)gnatxref
>
> CROSS_ENV_AR := AR=$(CROSS_AR)
> CROSS_ENV_AS := AS=$(CROSS_AS)
> @@ -96,6 +108,18 @@ CROSS_ENV_OBJCOPY := OBJCOPY=$(CROSS_OBJCOPY)
> CROSS_ENV_OBJDUMP := OBJDUMP=$(CROSS_OBJDUMP)
> CROSS_ENV_STRIP := STRIP=$(CROSS_STRIP)
> CROSS_ENV_DLLTOOL := DLLTOOL=$(CROSS_DLLTOOL)
> +CROSS_ENV_GNAT := GNAT=$(CROSS_GNAT)
> +CROSS_ENV_GNATBIND := GNATBIND=$(CROSS_GNATBIND)
> +CROSS_ENV_GNATCHOP := GNATCHOP=$(CROSS_GNATCHOP)
> +CROSS_ENV_GNATCLEAN := GNATCLEAN=$(CROSS_GNATCLEAN)
> +CROSS_ENV_GNATFIND := GNATFIND=$(CROSS_GNATFIND)
> +CROSS_ENV_GNATKR := GNATKR=$(CROSS_GNATKR)
> +CROSS_ENV_GNATLINK := GNATLINK=$(CROSS_GNATLINK)
> +CROSS_ENV_GNATLS := GNATLS=$(CROSS_GNATLS)
> +CROSS_ENV_GNATMAKE := GNATMAKE=$(CROSS_GNATMAKE)
> +CROSS_ENV_GNATNAME := GNATNAME=$(CROSS_GNATNAME)
> +CROSS_ENV_GNATPREP := GNATPREP=$(CROSS_GNATPREP)
> +CROSS_ENV_GNATXREF := GNATXREF=$(CROSS_GNATXREF)
> CROSS_ENV_CC_FOR_BUILD := CC_FOR_BUILD=$(call remove_quotes,$(HOSTCC))
> CROSS_ENV_CPP_FOR_BUILD := CPP_FOR_BUILD=$(call remove_quotes,$(HOSTCC))
> CROSS_ENV_LINK_FOR_BUILD:= LINK_FOR_BUILD=$(call remove_quotes,$(HOSTCC))
> @@ -119,7 +143,7 @@ endif
>
> ifneq ('','$(strip $(CROSS_CPPFLAGS))')
> CROSS_ENV_CPPFLAGS = CPPFLAGS='$(strip $(CROSS_CPPFLAGS))'
> -CROSS_ENF_CPPFLAGS_FOR_TARGET = CPPFLAGS_FOR_TARGET='$(strip
> $(CROSS_CPPFLAGS))'
> +CROSS_ENV_CPPFLAGS_FOR_TARGET = CPPFLAGS_FOR_TARGET='$(strip
> $(CROSS_CPPFLAGS))'
> endif
this has been fixed upstream, please rebase your patch.
>
> ifneq ('','$(strip $(CROSS_LDFLAGS))')
> @@ -148,6 +172,18 @@ CROSS_ENV_PROGS := \
> $(CROSS_ENV_OBJDUMP) \
> $(CROSS_ENV_STRIP) \
> $(CROSS_ENV_DLLTOOL) \
> + $(CROSS_ENV_GNAT) \
> + $(CROSS_ENV_GNATBIND) \
> + $(CROSS_ENV_GNATCHOP) \
> + $(CROSS_ENV_GNATCLEAN) \
> + $(CROSS_ENV_GNATFIND) \
> + $(CROSS_ENV_GNATKR) \
> + $(CROSS_ENV_GNATLINK) \
> + $(CROSS_ENV_GNATLS) \
> + $(CROSS_ENV_GNATMAKE) \
> + $(CROSS_ENV_GNATNAME) \
> + $(CROSS_ENV_GNATPREP) \
> + $(CROSS_ENV_GNATXREF) \
> $(CROSS_ENV_CC_FOR_BUILD) \
> $(CROSS_ENV_CPP_FOR_BUILD) \
> $(CROSS_ENV_LINK_FOR_BUILD)
> @@ -181,25 +217,20 @@ CROSS_ENV_AC := \
> ac_cv_func_getrlimit=yes \
> ac_cv_func_malloc_0_nonnull=yes \
> ac_cv_func_memcmp_clean=yes \
> - ac_cv_func_nonposix_getgrgid_r=no \
> - ac_cv_func_nonposix_getpwuid_r=no \
> - ac_cv_func_posix_getgrgid_r=yes \
> - ac_cv_func_posix_getpwnam_r=yes \
why do you remove these?
> ac_cv_func_posix_getpwuid_r=yes \
> ac_cv_func_printf_unix98=yes \
> ac_cv_func_realloc_0_nonnull=yes \
> - ac_cv_func_setgrent_void=yes \
> ac_cv_func_setpgrp_void=yes \
> ac_cv_func_setvbuf_reversed=no \
> ac_cv_func_vsnprintf_c99=yes \
> - ac_cv_have_abstract_sockets=yes \
> - ac_cv_sizeof_long_double=$(PTXCONF_SIZEOF_LONG_DOUBLE) \
> + ac_cv_sizeof_long_double=8 \
why this?
> ac_cv_sizeof_long_long=8 \
> ac_cv_sysv_ipc=yes \
> ac_cv_type_uintptr_t=yes \
> glib_cv_long_long_format="ll" \
> gt_cv_func_gettext_libintl=yes
>
> +
> CROSS_ENV_DESTDIR := \
> DESTDIR=$(SYSROOT)
>
> @@ -404,7 +435,7 @@ extract =
> \
> # $1: Packet Label; this macro gets $1_URL
> #
> get = \
> - ptxd_make_get $($(strip $(1))_URL)
> + ptxd_make_get "$($(strip $(1))_URL)"
what does this do?
>
>
> #
> @@ -644,11 +675,7 @@ patchin =
> \
> fi;
> \
> fi;
> \
>
> \
> - case "$(notdir $@)" in
> \
> - (host-*|cross-*) exit 0;;
> \
> - esac;
> \
why do you remove this?
> -
> \
> - find "$${PACKET_DIR}/" -name "configure" -a -type f -a \! -path
> "*/.pc/*" |
> while read conf; do \
> + find "$${PACKET_DIR}/" -name "configure" -a \! -path "*/.pc/*" | while
> read
> conf; do \
dito
> echo "Fixing up $${conf}";
> \
> sed -i
> \
> -e "s=sed -e \"s/\\\\(\.\*\\\\)/\\\\1;/\"=sed -e
> \"s/\\\\(.*\\\\)/'\"\$$ac_symprfx\"'\\\\1;/\"=" \
> @@ -659,7 +686,7 @@ patchin =
> \
> $(CHECK_PIPE_STATUS)
> \
> done;
> \
>
> \
> - find "$${PACKET_DIR}/" -name "ltmain.sh" -a -type f -a \! -path
> "*/.pc/*" |
> while read conf; do \
> + find "$${PACKET_DIR}/" -name "ltmain.sh" -a \! -path "*/.pc/*" | while
> read
> conf; do \
dito
> echo "Fixing up $${conf}";
> \
> sed -i
> \
> -e "s:\(need_relink\)=yes:\1=no:"
> \
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Linux Solutions for Science and Industry | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
-- ptxdist mailing list ptxdist@pengutronix.de
