Bruce Dubbs wrote:
Douglas R. Reno wrote:
On Thu, May 21, 2015 at 6:10 PM, Bruce Dubbs <[email protected]> wrote:
Douglas R. Reno wrote:
Hi all,
I need to have someone else's opinion about how to add the patch into
the instructions. Since it needs configure.ac, autoreconf -fiv must be
run to regenerate configure, eliminating the changes made by the
glibc-2.21 patch. Therefore, I need to know how to reorganize the page
to accommodate the patch. I would like some kind of recommendation on
how to restructure the page.
The real fix would be to patch configure.ac for the glibc-2.21 correction
and then run autoreconf. Since the linux_4.x_compilation_fix works on
configure.ac, the glibc fixes could also be merged into a consolidated
patch.
Do you need help doing that?
Yes, I do believe that I need help with the consolidated patch and
such. I just copied and pasted the original patch, I had no clue that
it had tabs in it. I have resubmitted it with the corrections. Sorry
about that!
Oops, the tab characters are needed to match the file from upstream. The header
doesn't need the tabs though.
-- Bruce
diff -Naur valgrind-3.10.1.orig/configure.ac valgrind-3.10.1/configure.ac
--- valgrind-3.10.1.orig/configure.ac 2014-11-25 13:41:13.000000000 -0600
+++ valgrind-3.10.1/configure.ac 2015-05-21 21:33:33.966313354 -0500
@@ -303,20 +303,14 @@
kernel=`uname -r`
case "${kernel}" in
- 2.6.*|3.*)
- AC_MSG_RESULT([2.6.x/3.x family (${kernel})])
- AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x])
- ;;
-
- 2.4.*)
- AC_MSG_RESULT([2.4 family (${kernel})])
- AC_DEFINE([KERNEL_2_4], 1, [Define to 1 if you're using Linux 2.4.x])
- ;;
-
- *)
+ 0.*|1.*|2.0.*|2.1.*|2.2.*|2.3.*|2.4.*|2.5.*)
AC_MSG_RESULT([unsupported (${kernel})])
- AC_MSG_ERROR([Valgrind works on kernels 2.4, 2.6])
+ AC_MSG_ERROR([Valgrind needs a Linux kernel >= 2.6])
;;
+
+ *)
+ AC_MSG_RESULT([2.6 or later (${kernel})])
+ ;;
esac
;;
@@ -1017,6 +1011,13 @@
DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ ;;
+ 2.21)
+ AC_MSG_RESULT(2.21 family)
+ AC_DEFINE([GLIBC_2_21], 1, [Define to 1 if you're using glibc 2.21.x])
+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
;;
darwin)
AC_MSG_RESULT(Darwin)
--
http://lists.linuxfromscratch.org/listinfo/blfs-dev
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
