[SM-Commit] GIT changes to devel-glibc-2.15 grimoire by Sukneet Basuta (59636c6ac127baf4e215e3541d01d568ba9f13a0)

Sukneet Basuta scm at sourcemage.org
Tue Jul 10 01:55:54 EDT 2012


GIT changes to devel-glibc-2.15 grimoire by Sukneet Basuta <sukneet at sourcemage.org>:

 libs/glibc/HISTORY                  |    5 +++++
 libs/glibc/PRE_BUILD                |    8 +++++---
 libs/glibc/as_fn_executable_p.patch |   17 +++++++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

New commits:
commit 59636c6ac127baf4e215e3541d01d568ba9f13a0
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    glibc: add as_fn_executable_p() to configure
           so it can detect grep. I have no idea why or how its missing though.
    
    I found as_fn_executable_p in automake's cache, so I just added it to configure.
    
    The math libs don't compile for me. I'm assuming that it's missing the -lm flags to tell gcc to compile the files with the math lib. But I'm going to assume thats an error with my box for now and fix it later.

diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 0c8f813..4ee6340 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,8 @@
+2012-07-10 Sukneet Basuta <sukneet at sourcemage.org>
+	* PRE_BUILD: apply as_fn_executable_p.patch
+	* as_fn_executable_p.patch: add as_fn_executable_p() to configure
+	  so it can detect grep. I have no idea why or how its missing though.
+
 2012-07-01 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.16.0
 	* BUILD: --enable-obsolete-rpc added
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 87a0c69..f4b8c85 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -90,9 +90,11 @@ rm -rf $GLIBC_HEADERS_DIR/include/drm &&
 #
 # Now fixup the normal glibc
 #
-cd  $SOURCE_DIRECTORY                               &&
-patch  -p0  <  $SCRIPT_DIRECTORY/Makefile.patch     &&
-patch  -p1  <  $SCRIPT_DIRECTORY/as-test-x.patch &&
+cd  $SOURCE_DIRECTORY                              &&
+patch  -p0  <  $SPELL_DIRECTORY/Makefile.patch     &&
+patch  -p1  <  $SPELL_DIRECTORY/as-test-x.patch    &&
+# no idea why or how this is missing from configure
+patch  -p0  <  $SPELL_DIRECTORY/as_fn_executable_p.patch &&
 
 # disabled libgd detection/building memusagestat for now until a better
 # fix has been found, bug #8277
diff --git a/libs/glibc/as_fn_executable_p.patch b/libs/glibc/as_fn_executable_p.patch
new file mode 100644
index 0000000..bc5b896
--- /dev/null
+++ b/libs/glibc/as_fn_executable_p.patch
@@ -0,0 +1,17 @@
+--- configure   2012-07-10 01:17:03.777702901 -0400
++++ configure.patched   2012-07-10 01:29:06.658727860 -0400
+@@ -284,6 +284,14 @@
+   exit $1
+ } # as_fn_exit
+ 
++# as_fn_executable_p FILE
++# -----------------------
++# Test if FILE is an executable regular file.
++as_fn_executable_p ()
++{
++  test -f "$1" && test -x "$1"
++} # as_fn_executable_p
++
+ # as_fn_mkdir_p
+ # -------------
+ # Create "$as_dir" as a directory, including parents if necessary.


More information about the SM-Commit mailing list