Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restored reverted patch to make for Ubuntu 18.04, Debian 10 and Raspbian only #1094

Merged
merged 2 commits into from
Oct 28, 2019
Merged

Restored reverted patch to make for Ubuntu 18.04, Debian 10 and Raspbian only #1094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
439e50a
Restored reverted patch to make for Ubuntu 18.04, Debian 10 and Raspb…
mattray Sep 13, 2019
7884084
Converted sed to patch format to adhere to standards
mattray Oct 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions config/patches/make/deb-make-glob.patch
View file
Open in desktop
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
View file
Open in desktop
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