Skip to content

Commit

Permalink
Merge pull request #1094 from mattray/debian10
Browse files Browse the repository at this point in the history
Restored reverted patch to make for Ubuntu 18.04, Debian 10 and Raspbian only
  • Loading branch information
scotthain authored Oct 28, 2019
2 parents 39acd5f + 7884084 commit 433a18f
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 0 deletions.
31 changes: 31 additions & 0 deletions config/patches/make/deb-make-glob.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
--- make-4.2.1/glob/glob.c.ori 2019-10-17 23:06:07.841511314 +1100
+++ make-4.2.1/glob/glob.c 2019-10-17 23:06:21.249541600 +1100
@@ -208,28 +208,9 @@
#endif /* __GNU_LIBRARY__ || __DJGPP__ */


-#if !defined __alloca && !defined __GNU_LIBRARY__
-
-# ifdef __GNUC__
-# undef alloca
-# define alloca(n) __builtin_alloca (n)
-# else /* Not GCC. */
-# ifdef HAVE_ALLOCA_H
# include <alloca.h>
-# else /* Not HAVE_ALLOCA_H. */
-# ifndef _AIX
-# ifdef WINDOWS32
-# include <malloc.h>
-# else
-extern char *alloca ();
-# endif /* WINDOWS32 */
-# endif /* Not _AIX. */
-# endif /* sparc or HAVE_ALLOCA_H. */
-# endif /* GCC. */
-
# define __alloca alloca

-#endif

#ifndef __GNU_LIBRARY__
# define __stat stat
6 changes: 6 additions & 0 deletions config/software/make.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@
build do
env = with_standard_compiler_flags(with_embedded_path)

# Work around an error caused by Glibc 2.27
# Thanks to: http://www.linuxfromscratch.org/lfs/view/8.2/chapter05/make.html
if debian_after_or_at_buster? || ubuntu_after_or_at_bionic? || raspbian?
patch source: "deb-make-glob.patch", plevel: 1, env: env
end

command "./configure" \
" --disable-nls" \
" --prefix=#{install_dir}/embedded", env: env
Expand Down

0 comments on commit 433a18f

Please sign in to comment.