Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (14cc7d3318f834fdd54981d967188ae5f1e3afd1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (14cc7d3318f834fdd54981d967188ae5f1e3afd1)
  • Date: Tue, 9 Oct 2012 15:31:48 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

disk/grub2/HISTORY | 5 +++++
disk/grub2/PRE_BUILD | 5 +++++
disk/grub2/glibc-2.16.patch | 16 ++++++++++++++++
3 files changed, 26 insertions(+)

New commits:
commit 14cc7d3318f834fdd54981d967188ae5f1e3afd1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

grub2: Fix compilation with glibc 2.16+
gets removed from GNU libc, see
http://permalink.gmane.org/gmane.comp.lib.gnulib.bugs/30292)

make[4]: Entering directory `/usr/src/grub-2.00/grub-core/gnulib'
gcc -DHAVE_CONFIG_H -I. -I../.. -I../../intl -march=native
-mtune=native -m32 -pipe -Os -MT argp-eexst.o -MD -MP -MF
.deps/argp-eexst.Tpo -c -o argp-eexst.o argp-eexst.c
In file included from argp.h:22:0,
from argp-eexst.c:25:
./stdio.h:456:20: error: 'gets' undeclared here (not in a function)

diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY
index 334fd19..883a698 100644
--- a/disk/grub2/HISTORY
+++ b/disk/grub2/HISTORY
@@ -1,3 +1,8 @@
+2012-10-09 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply glibc-2.16.patch
+ * glibc-2.16.patch: Fix compilation with glibc 2.16+ (gets removed
from GNU
+ libc, see
http://permalink.gmane.org/gmane.comp.lib.gnulib.bugs/30292)
+
2012-06-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.00
less versbosity
diff --git a/disk/grub2/PRE_BUILD b/disk/grub2/PRE_BUILD
index 457375e..ceb321f 100755
--- a/disk/grub2/PRE_BUILD
+++ b/disk/grub2/PRE_BUILD
@@ -1,4 +1,9 @@
default_pre_build &&
+
+message "${MESSAGE_COLOR}Fix compilation with glibc 2.16+${DEFAULT_COLOR}" &&
+patch "${SOURCE_DIRECTORY}"/grub-core/gnulib/stdio.in.h \
+ "${SPELL_DIRECTORY}"/glibc-2.16.patch &&
+
cd ${SOURCE_DIRECTORY} &&
if [[ "${GRUB2_SVN}" = 'y' ]]; then
./autogen.sh
diff --git a/disk/grub2/glibc-2.16.patch b/disk/grub2/glibc-2.16.patch
new file mode 100644
index 0000000..92db840
--- /dev/null
+++ b/disk/grub2/glibc-2.16.patch
@@ -0,0 +1,16 @@
+diff -Naur grub-2.00.orig/grub-core/gnulib/stdio.in.h
grub-2.00/grub-core/gnulib/stdio.in.h
+--- grub-2.00.orig/grub-core/gnulib/stdio.in.h 2012-10-09 13:25:40.346175444
-0700
++++ grub-2.00/grub-core/gnulib/stdio.in.h 2012-10-09 13:26:23.112172937
-0700
+@@ -137,12 +137,6 @@
+ "use gnulib module fflush for portable POSIX compliance");
+ #endif
+
+-/* It is very rare that the developer ever has full control of stdin,
+- so any use of gets warrants an unconditional warning. Assume it is
+- always declared, since it is required by C89. */
+-#undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+-
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
+ # if !(defined __cplusplus && defined GNULIB_NAMESPACE)



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (14cc7d3318f834fdd54981d967188ae5f1e3afd1), Eric Sandall, 10/09/2012

Archive powered by MHonArc 2.6.24.

Top of Page