diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-devtools/make')
6 files changed, 169 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/make/make-3.81/make_fix_for_automake-1.12.patch b/import-layers/yocto-poky/meta/recipes-devtools/make/make-3.81/make_fix_for_automake-1.12.patch new file mode 100644 index 000000000..9b2e96431 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/make/make-3.81/make_fix_for_automake-1.12.patch @@ -0,0 +1,43 @@ +Upstream-Status: Pending + +automake 1.12 has depricated automatic de-ANSI-fication support + +this patch avoids these kinds of errors: + +| configure.in:48: error: automatic de-ANSI-fication support has been removed +... +| Makefile.am:19: error: automatic de-ANSI-fication support has been removed +| autoreconf: automake failed with exit status: 1 +| ERROR: autoreconf execution failed. + + +Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> +2012/05/04 + +Index: make-3.81/configure.in +=================================================================== +--- make-3.81.orig/configure.in ++++ make-3.81/configure.in +@@ -44,9 +44,6 @@ AC_AIX + AC_ISC_POSIX + AC_MINIX + +-# Needed for ansi2knr +-AM_C_PROTOTYPES +- + # Enable gettext, in "external" mode. + + AM_GNU_GETTEXT_VERSION(0.14.1) +Index: make-3.81/Makefile.am +=================================================================== +--- make-3.81.orig/Makefile.am ++++ make-3.81/Makefile.am +@@ -16,7 +16,7 @@ + # GNU Make; see the file COPYING. If not, write to the Free Software + # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + +-AUTOMAKE_OPTIONS = 1.8 dist-bzip2 check-news ansi2knr ++AUTOMAKE_OPTIONS = 1.8 dist-bzip2 check-news + ACLOCAL_AMFLAGS = -I config + + MAKE_HOST = @MAKE_HOST@ diff --git a/import-layers/yocto-poky/meta/recipes-devtools/make/make-3.81/makeinfo.patch b/import-layers/yocto-poky/meta/recipes-devtools/make/make-3.81/makeinfo.patch new file mode 100644 index 000000000..5dd760467 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/make/make-3.81/makeinfo.patch @@ -0,0 +1,22 @@ +Allow docs to build with makeinfo 5.X, fixing the error: + +doc/make.texi:8165: @itemx must follow @item + +Upstream-Status: Backport + +RP +2014/03/29 + +Index: make-3.81/doc/make.texi +=================================================================== +--- make-3.81.orig/doc/make.texi 2006-04-01 06:36:40.000000000 +0000 ++++ make-3.81/doc/make.texi 2014-03-29 09:39:51.007727012 +0000 +@@ -8162,7 +8162,7 @@ + rarely need to specify this option since @samp{make} does it for you; + see @ref{-w Option, ,The @samp{--print-directory} Option}.) + +-@itemx --no-print-directory ++@item --no-print-directory + @cindex @code{--no-print-directory} + Disable printing of the working directory under @code{-w}. + This option is useful when @code{-w} is turned on automatically, diff --git a/import-layers/yocto-poky/meta/recipes-devtools/make/make-4.1/0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch b/import-layers/yocto-poky/meta/recipes-devtools/make/make-4.1/0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch new file mode 100644 index 000000000..7a5f4ba05 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/make/make-4.1/0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch @@ -0,0 +1,63 @@ +From 292da6f6867b75a5af7ddbb639a1feae022f438f Mon Sep 17 00:00:00 2001 +From: Paul Smith <psmith@gnu.org> +Date: Mon, 20 Oct 2014 01:54:56 -0400 +Subject: [PATCH] * main.c (main): [SV 43434] Handle NULL returns from + ttyname(). + +Upstream-Status: Backport + +From: http://git.savannah.gnu.org/cgit/make.git/commit/?id=292da6f6867b75a5af7ddbb639a1feae022f438f + +--- + main.c | 15 ++++++++++----- + makeint.h | 3 ++- + 2 files changed, 12 insertions(+), 6 deletions(-) + +diff --git a/main.c b/main.c +index b2d169c..0cdb8a8 100644 +--- a/main.c ++++ b/main.c +@@ -1429,13 +1429,18 @@ main (int argc, char **argv, char **envp) + #ifdef HAVE_ISATTY + if (isatty (fileno (stdout))) + if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMOUT"))) +- define_variable_cname ("MAKE_TERMOUT", TTYNAME (fileno (stdout)), +- o_default, 0)->export = v_export; +- ++ { ++ const char *tty = TTYNAME (fileno (stdout)); ++ define_variable_cname ("MAKE_TERMOUT", tty ? tty : DEFAULT_TTYNAME, ++ o_default, 0)->export = v_export; ++ } + if (isatty (fileno (stderr))) + if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMERR"))) +- define_variable_cname ("MAKE_TERMERR", TTYNAME (fileno (stderr)), +- o_default, 0)->export = v_export; ++ { ++ const char *tty = TTYNAME (fileno (stderr)); ++ define_variable_cname ("MAKE_TERMERR", tty ? tty : DEFAULT_TTYNAME, ++ o_default, 0)->export = v_export; ++ } + #endif + + /* Reset in case the switches changed our minds. */ +diff --git a/makeint.h b/makeint.h +index 6223936..2009f41 100644 +--- a/makeint.h ++++ b/makeint.h +@@ -436,10 +436,11 @@ extern struct rlimit stack_limit; + /* The number of bytes needed to represent the largest integer as a string. */ + #define INTSTR_LENGTH CSTRLEN ("18446744073709551616") + ++#define DEFAULT_TTYNAME "true" + #ifdef HAVE_TTYNAME + # define TTYNAME(_f) ttyname (_f) + #else +-# define TTYNAME(_f) "true" ++# define TTYNAME(_f) DEFAULT_TTYNAME + #endif + + +-- +1.9.1 + diff --git a/import-layers/yocto-poky/meta/recipes-devtools/make/make.inc b/import-layers/yocto-poky/meta/recipes-devtools/make/make.inc new file mode 100644 index 000000000..849b74299 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/make/make.inc @@ -0,0 +1,12 @@ +SUMMARY = "GNU tool that controls the build process" +DESCRIPTION = "Make is a tool which controls the generation of executables and other non-source files of a \ +program from the program's source files. Make gets its knowledge of how to build your program from a file \ +called the makefile, which lists each of the non-source files and how to compute it from other files." +HOMEPAGE = "http://www.gnu.org/software/make/" +SECTION = "devel" + +SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2" + +inherit autotools gettext pkgconfig texinfo + +PROVIDES = "virtual/make" diff --git a/import-layers/yocto-poky/meta/recipes-devtools/make/make_3.81.bb b/import-layers/yocto-poky/meta/recipes-devtools/make/make_3.81.bb new file mode 100644 index 000000000..b8a79b0eb --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/make/make_3.81.bb @@ -0,0 +1,15 @@ +PR = "r1" + +LICENSE = "GPLv2 & LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \ + file://tests/COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ + file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4" + +require make.inc + +SRC_URI += "file://make_fix_for_automake-1.12.patch" +SRC_URI += "file://makeinfo.patch" + +SRC_URI[md5sum] = "354853e0b2da90c527e35aabb8d6f1e6" +SRC_URI[sha256sum] = "f3e69023771e23908f5d5592954d8271d3d6af09693cecfd29cee6fde8550dc8" + diff --git a/import-layers/yocto-poky/meta/recipes-devtools/make/make_4.1.bb b/import-layers/yocto-poky/meta/recipes-devtools/make/make_4.1.bb new file mode 100644 index 000000000..78fe0b547 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/make/make_4.1.bb @@ -0,0 +1,14 @@ +LICENSE = "GPLv3 & LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4" +require make.inc + +SRC_URI += "file://0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch" + +EXTRA_OECONF += "--without-guile" + +SRC_URI[md5sum] = "57a7a224a822f94789a587ccbcedff69" +SRC_URI[sha256sum] = "0bc7613389650ee6a24554b52572a272f7356164fd2c4132b0bcf13123e4fca5" + +BBCLASSEXTEND = "native nativesdk" |
