Source Mage code commit list

[Jaka Kranjc <scm AT sourcemage.org>]

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

 libs/glibc/HISTORY          |    7 ++++++
 libs/glibc/PRE_BUILD        |    2 -
 libs/glibc/gcc45.patch      |   49 
++++++++++++++++++++++++++++++++++++++++++++
 printer/ghostscript/BUILD   |    2 -
 printer/ghostscript/HISTORY |    3 ++
 5 files changed, 61 insertions(+), 2 deletions(-)

New commits:
commit 42ebf3d1c8ac2d0ab725e2d2eb5c33cae433cfe9
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    ghostscript: always build the JAPAN set of drivers #14764

commit 7e18ca9ab6da1dcc746c4d36417678109391795a
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    glibc: don't verify the kernel sources twice

commit 9a2f73cbc58ef9458c96d4fd626518a994cab020
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    glibc: fix the compilation with gcc 4.5 on x86 #15719

diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index a6e4140..e62a0ca 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,10 @@
+2010-06-01 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * PRE_BUILD: don't verify the kernel sources twice
+
+2010-05-31 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * gcc45.patch: fixed building with gcc 4.5 #15719
+       * PRE_BUILD: apply the patch
+
 2010-05-20 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.11.2, HEADERS_VERSION=2.6.34
 
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index c49726c..7b11ee3 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -20,7 +20,6 @@ if  [  "$GLIBC_NPTL"  =  "y"  ];  then
   if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
     cd  $GLIBC_HEADERS_DIR &&
     if [ ! -z $SOURCE3 ]; then
-      verify_file 3 || return 1 &&
       bzcat ${SOURCE_CACHE}/$SOURCE3 > ${SOURCE3%.bz2}
     fi  &&
     make mrproper
@@ -70,6 +69,7 @@ rm -rf $GLIBC_HEADERS_DIR/include/drm &&
 cd  $SOURCE_DIRECTORY                               &&
 patch  -p0  <  $SCRIPT_DIRECTORY/Makefile.patch     &&
 patch  -p1  <  $SCRIPT_DIRECTORY/as-test-x.patch &&
+patch -p1 < $SPELL_DIRECTORY/gcc45.patch &&
 
 # disabled libgd detection/building memusagestat for now until a better
 # fix has been found, bug #8277
diff --git a/libs/glibc/gcc45.patch b/libs/glibc/gcc45.patch
new file mode 100644
index 0000000..02920c1
--- /dev/null
+++ b/libs/glibc/gcc45.patch
@@ -0,0 +1,49 @@
+Submitted By:            Matt Burgess <matthew_at_linuxfromscratch_dot_org>
+Date:                    2010-04-18
+Initial Package Version: 2.11.1
+Upstream Status:         Not Submitted
+Origin:                  http://www.eglibc.org/archives/patches/msg00073.html
+Description:             Fixes the following build problem with GCC-4.5.0:
+
+/mnt/lfs/sources/libc-build/math/s_frexp.os.dt -MT 
/mnt/lfs/sources/libc-build/math/s_frexp.os
+./sysdeps/i386/fpu/s_frexp.S: Assembler messages:
+./sysdeps/i386/fpu/s_frexp.S:66: Error: invalid identifier for ".ifdef"
+./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first 
unrecognized character is `1'
+./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first 
unrecognized character is `1'
+./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first 
unrecognized character is `1'
+./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first 
unrecognized character is `.'
+./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first 
unrecognized character is `1'
+./sysdeps/i386/fpu/s_frexp.S:66: Error: expected comma after name `' in 
.size directive
+./sysdeps/i386/fpu/s_frexp.S:66: Error: ".endif" without ".if"
+./sysdeps/i386/fpu/s_frexp.S:66: Error: junk `.get_pc_thunk.dx' after 
expression
+make[2]: *** [/mnt/lfs/sources/libc-build/math/s_frexp.os] Error 1
+
+diff -Naur glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c 
glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c
+--- glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c       2009-12-08 
20:10:20.000000000 +0000
++++ glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c    2010-04-17 
11:34:06.882681001 +0000
+@@ -45,6 +45,11 @@
+ /* Embed an #include to pull in the alignment and .end directives. */
+ asm ("\n#include \"defs.h\"");
+ 
++asm ("\n#if defined __i686 && defined __ASSEMBLER__");
++asm ("\n#undef __i686");
++asm ("\n#define __i686 __i686");
++asm ("\n#endif");
++
+ /* The initial common code ends here. */
+ asm ("\n/*@HEADER_ENDS*/");
+ 
+diff -Naur glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h 
glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h
+--- glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h    2009-12-08 
20:10:20.000000000 +0000
++++ glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h 2010-04-17 
11:34:06.882681001 +0000
+@@ -29,6 +29,10 @@
+ #include <dl-sysdep.h>
+ #include <tls.h>
+ 
++#if defined __i686 && defined __ASSEMBLER__
++#undef __i686
++#define __i686 __i686
++#endif
+ 
+ /* For Linux we can use the system call table in the header file
+       /usr/include/asm/unistd.h
diff --git a/printer/ghostscript/BUILD b/printer/ghostscript/BUILD
index 0425686..bfb3e17 100755
--- a/printer/ghostscript/BUILD
+++ b/printer/ghostscript/BUILD
@@ -1,6 +1,6 @@
 # need a comma separated list
 OPTS="--with-drivers=`echo ${GS_PRINTERS} | \
-      sed "s/  */ /g;s/^ *//;s/ *$/ /;s/^NONE //;s/ /,/g"`FILES \
+      sed "s/  */ /g;s/^ *//;s/ *$/ /;s/^NONE //;s/ /,/g"`JAPAN,FILES \
       --enable-dynamic ${GS_OMNI} ${OPTS}" &&
 
 default_build &&
diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY
index 0f9bb05..fc08321 100644
--- a/printer/ghostscript/HISTORY
+++ b/printer/ghostscript/HISTORY
@@ -1,3 +1,6 @@
+2010-06-07 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * BUILD: always build the JAPAN set of drivers #14764
+
 2010-05-08 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: PATCHLEVEL++
        * PRE_BUILD: Added to patch