diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2006-07-25 14:18:12 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2006-07-25 14:18:12 +0000 |
commit | 6cbe9664c74d68d41dcd37f6003b9edc0f1bc422 (patch) | |
tree | 1a40ff7bd83623967913ca96306cb1fb21b24eca /contrib/crossrpms | |
parent | Fix rpmgroup. (diff) | |
download | rtems-6cbe9664c74d68d41dcd37f6003b9edc0f1bc422.tar.bz2 |
New.
Diffstat (limited to 'contrib/crossrpms')
-rw-r--r-- | contrib/crossrpms/patches/automake-1.8.1-rtems-20040112-1.diff | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/contrib/crossrpms/patches/automake-1.8.1-rtems-20040112-1.diff b/contrib/crossrpms/patches/automake-1.8.1-rtems-20040112-1.diff new file mode 100644 index 0000000000..6704ce7bc4 --- /dev/null +++ b/contrib/crossrpms/patches/automake-1.8.1-rtems-20040112-1.diff @@ -0,0 +1,60 @@ +Index: automake.in +=================================================================== +RCS file: /cvs/automake/automake/automake.in,v +retrieving revision 1.1526.2.6 +diff -u -r1.1526.2.6 automake.in +--- automake.in 10 Jan 2004 13:41:52 -0000 1.1526.2.6 ++++ automake.in 12 Jan 2004 04:08:12 -0000 +@@ -768,12 +768,28 @@ + 'config_vars' => ['CCAS', 'CCASFLAGS'], + + 'flags' => ['CCASFLAGS'], +- # Users can set AM_ASFLAGS to includes DEFS, INCLUDES, ++ # Users can set AM_CCASFLAGS to includes DEFS, INCLUDES, + # or anything else required. They can also set AS. + 'compile' => '$(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)', + 'compiler' => 'CCASCOMPILE', + 'compile_flag' => '-c', +- 'extensions' => ['.s', '.S'], ++ 'extensions' => ['.s'], ++ ++ # With assembly we still use the C linker. ++ '_finish' => \&lang_c_finish); ++ ++# Preprocessed Assembler. ++register_language ('name' => 'cppasm', ++ 'Name' => 'Preprocessed Assembler', ++ 'config_vars' => ['CCAS', 'CCASFLAGS'], ++ ++ 'flags' => ['CCASFLAGS','CPPFLAGS'], ++ # Users can set AM_ASFLAGS to includes DEFS, INCLUDES, ++ # or anything else required. They can also set AS. ++ 'compile' => '$(CCAS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS)', ++ 'compiler' => 'CPPASCOMPILE', ++ 'compile_flag' => '-c', ++ 'extensions' => ['.S'], + + # With assembly we still use the C linker. + '_finish' => \&lang_c_finish); +@@ -1296,7 +1312,7 @@ + %transform, %lang); + + # If the source to a program consists entirely of code from a +- # `pure' language, for instance C++ for Fortran 77, then we ++ # `pure' language, for instance C++ or Fortran 77, then we + # don't need the C compiler code. However if we run into + # something unusual then we do generate the C code. There are + # probably corner cases here that do not work properly. +@@ -4866,6 +4882,12 @@ + + # Rewrite a single assembly file. + sub lang_asm_rewrite ++{ ++ return &lang_sub_obj; ++} ++ ++# Rewrite a single preprocessed assembly file. ++sub lang_cppasm_rewrite + { + return &lang_sub_obj; + } |