rpms/gcl/devel gcl-2.6.8-alloca.patch, 1.3, 1.4 gcl-2.6.8-asm-signal-h.patch, 1.1, 1.2 gcl-2.6.8-ellipsis.patch, 1.1, 1.2 gcl-2.6.8-extension.patch, 1.3, 1.4 gcl-2.6.8-getcwd.patch, 1.1, 1.2 gcl-2.6.8-infrastructure.patch, 1.3, 1.4 gcl-2.6.8-latex.patch, 1.1, 1.2 gcl-2.6.8-loginname.patch, 1.1, 1.2 gcl-2.6.8-plt.patch, 1.3, 1.4 gcl-2.6.8-unrandomize.patch, 1.2, 1.3 gcl.spec, 1.42, 1.43 sources, 1.7, 1.8 gcl-2.6.8-sigprocmask-linux.patch, 1.1, NONE
Jerry James
jjames at fedoraproject.org
Tue Mar 23 17:50:57 UTC 2010
- Previous message: rpms/gcl/F-13 gcl-2.6.8-alloca.patch, 1.3, 1.4 gcl-2.6.8-asm-signal-h.patch, 1.1, 1.2 gcl-2.6.8-ellipsis.patch, 1.1, 1.2 gcl-2.6.8-extension.patch, 1.3, 1.4 gcl-2.6.8-getcwd.patch, 1.1, 1.2 gcl-2.6.8-infrastructure.patch, 1.3, 1.4 gcl-2.6.8-latex.patch, 1.1, 1.2 gcl-2.6.8-loginname.patch, 1.1, 1.2 gcl-2.6.8-plt.patch, 1.3, 1.4 gcl-2.6.8-unrandomize.patch, 1.2, 1.3 gcl.spec, 1.42, 1.43 sources, 1.7, 1.8 gcl-2.6.8-sigprocmask-linux.patch, 1.1, NONE
- Next message: File jd-2.6.5-svn3431_trunk.tgz uploaded to lookaside cache by mtasaka
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jjames
Update of /cvs/pkgs/rpms/gcl/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15451/devel
Modified Files:
gcl-2.6.8-alloca.patch gcl-2.6.8-asm-signal-h.patch
gcl-2.6.8-ellipsis.patch gcl-2.6.8-extension.patch
gcl-2.6.8-getcwd.patch gcl-2.6.8-infrastructure.patch
gcl-2.6.8-latex.patch gcl-2.6.8-loginname.patch
gcl-2.6.8-plt.patch gcl-2.6.8-unrandomize.patch gcl.spec
sources
Removed Files:
gcl-2.6.8-sigprocmask-linux.patch
Log Message:
* Tue Mar 23 2010 Jerry James <loganjerry at gmail.com> - 2.6.8-0.7.20100201cvs
- Update to 20100201 CVS snapshot for multiple bug fixes including, I hope,
bz 573534
- Drop upstreamed sigprocmask-linux patch
gcl-2.6.8-alloca.patch:
acconfig.h | 5
configure | 328 ++++++++++++++++++++++++++++++++++++++++++++++++---------
configure.in | 28 ----
h/gclincl.h.in | 28 ++++
4 files changed, 309 insertions(+), 80 deletions(-)
Index: gcl-2.6.8-alloca.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl-2.6.8-alloca.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gcl-2.6.8-alloca.patch 11 Aug 2009 21:28:46 -0000 1.3
+++ gcl-2.6.8-alloca.patch 23 Mar 2010 17:50:53 -0000 1.4
@@ -1,6 +1,6 @@
diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-2.6.8/acconfig.h
--- gcl-2.6.8.ORIG/acconfig.h 2009-02-23 12:39:42.000000000 -0700
-+++ gcl-2.6.8/acconfig.h 2009-08-11 10:55:32.525471470 -0600
++++ gcl-2.6.8/acconfig.h 2010-03-23 10:24:05.870956281 -0600
@@ -53,11 +53,10 @@
#undef HAVE_ALLOCA
#endif
@@ -16,8 +16,8 @@ diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-
#endif
diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
---- gcl-2.6.8.ORIG/configure 2009-08-11 10:55:12.612470012 -0600
-+++ gcl-2.6.8/configure 2009-08-11 10:55:32.540470956 -0600
+--- gcl-2.6.8.ORIG/configure 2010-03-23 10:21:51.365951257 -0600
++++ gcl-2.6.8/configure 2010-03-23 10:24:55.160971244 -0600
@@ -645,6 +645,7 @@
NIFLAGS
FINAL_CFLAGS
@@ -26,7 +26,7 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
NOTIFY
TCL_LIBS
TCL_DL_LIBS
-@@ -14045,10 +14046,12 @@
+@@ -12839,10 +12840,12 @@
# alloca
@@ -43,7 +43,7 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -14056,16 +14059,17 @@
+@@ -12850,16 +12853,17 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -64,7 +64,7 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -14073,44 +14077,141 @@
+@@ -12867,44 +12871,141 @@
esac
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
$as_echo "$ac_try_echo") >&5
@@ -223,7 +223,7 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -14118,17 +14219,163 @@
+@@ -12912,17 +13013,163 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -389,7 +389,7 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
rm -f conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
-@@ -14151,43 +14398,30 @@
+@@ -12945,43 +13192,30 @@
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -442,9 +442,9 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
# dlopen etc
diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
---- gcl-2.6.8.ORIG/configure.in 2009-08-11 10:55:12.621467749 -0600
-+++ gcl-2.6.8/configure.in 2009-08-11 10:55:32.543471585 -0600
-@@ -1869,33 +1869,7 @@
+--- gcl-2.6.8.ORIG/configure.in 2010-03-23 10:21:51.369945656 -0600
++++ gcl-2.6.8/configure.in 2010-03-23 10:24:36.903913875 -0600
+@@ -1917,33 +1917,7 @@
# alloca
@@ -480,8 +480,8 @@ diff -dur gcl-2.6.8.ORIG/configure.in gc
# dlopen etc
# idea make it so you do something dlopen(libX.so,RTLD_GLOBAL)
diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in gcl-2.6.8/h/gclincl.h.in
---- gcl-2.6.8.ORIG/h/gclincl.h.in 2009-08-11 10:55:12.622464351 -0600
-+++ gcl-2.6.8/h/gclincl.h.in 2009-08-11 10:55:32.545474389 -0600
+--- gcl-2.6.8.ORIG/h/gclincl.h.in 2010-03-23 10:21:51.370945835 -0600
++++ gcl-2.6.8/h/gclincl.h.in 2010-03-23 10:24:55.000000000 -0600
@@ -54,11 +54,10 @@
#undef HAVE_ALLOCA
#endif
@@ -518,7 +518,7 @@ diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in
/* Define to 1 if you have the <asm/sigcontext.h> header file. */
#undef HAVE_ASM_SIGCONTEXT_H
-@@ -347,6 +361,14 @@
+@@ -347,5 +361,13 @@
/* The size of `long', as computed by sizeof. */
#undef SIZEOF_LONG
@@ -532,4 +532,3 @@ diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
-
gcl-2.6.8-asm-signal-h.patch:
configure | 97 +++-------------------------------------------------
configure.in | 5 +-
h/386-linux.h | 1
h/m68k-linux.h | 1
o/test_memprotect.c | 1
5 files changed, 13 insertions(+), 92 deletions(-)
Index: gcl-2.6.8-asm-signal-h.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl-2.6.8-asm-signal-h.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcl-2.6.8-asm-signal-h.patch 11 Aug 2009 21:28:46 -0000 1.1
+++ gcl-2.6.8-asm-signal-h.patch 23 Mar 2010 17:50:53 -0000 1.2
@@ -1,7 +1,7 @@
diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
---- gcl-2.6.8.ORIG/configure 2009-08-11 10:57:23.131471438 -0600
-+++ gcl-2.6.8/configure 2009-08-11 11:01:13.331496734 -0600
-@@ -14608,27 +14608,19 @@
+--- gcl-2.6.8.ORIG/configure 2010-03-23 10:43:26.927961643 -0600
++++ gcl-2.6.8/configure 2010-03-23 10:46:56.620908629 -0600
+@@ -13333,27 +13333,19 @@
for ac_header in asm/signal.h
do
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -33,7 +33,7 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
-@@ -14649,96 +14641,20 @@
+@@ -13374,96 +13366,20 @@
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
@@ -132,18 +132,18 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
as_val=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$as_val"'`
if test "x$as_val" = x""yes; then
-@@ -14824,6 +14740,7 @@
+@@ -13549,6 +13465,7 @@
#include <asm/sigcontext.h>
#endif
#ifdef HAVE_ASM_SIGNAL_H
-+ #define __ASSEMBLY__
++ #define __ASSEMBLY__
#include <asm/signal.h>
#endif
diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
---- gcl-2.6.8.ORIG/configure.in 2009-08-11 10:57:23.139471057 -0600
-+++ gcl-2.6.8/configure.in 2009-08-11 10:59:52.436473014 -0600
-@@ -1592,7 +1592,7 @@
+--- gcl-2.6.8.ORIG/configure.in 2010-03-23 10:43:26.928958323 -0600
++++ gcl-2.6.8/configure.in 2010-03-23 10:45:45.463131717 -0600
+@@ -1640,7 +1640,7 @@
#if test $use = "386-linux" ; then
AC_CHECK_HEADERS(asm/sigcontext.h)
@@ -152,17 +152,19 @@ diff -dur gcl-2.6.8.ORIG/configure.in gc
AC_MSG_CHECKING([for sigcontext])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <signal.h>
-@@ -1617,6 +1617,7 @@
+@@ -1664,7 +1664,8 @@
+ #ifdef HAVE_ASM_SIGCONTEXT_H
#include <asm/sigcontext.h>
#endif
- #ifdef HAVE_ASM_SIGNAL_H
-+ #define __ASSEMBLY__
+- #ifdef HAVE_ASM_SIGNAL_H
++ #ifdef HAVE_ASM_SIGNAL_H
++ #define __ASSEMBLY__
#include <asm/signal.h>
#endif
]],
diff -dur gcl-2.6.8.ORIG/h/386-linux.h gcl-2.6.8/h/386-linux.h
---- gcl-2.6.8.ORIG/h/386-linux.h 2005-01-15 09:28:16.000000000 -0700
-+++ gcl-2.6.8/h/386-linux.h 2009-08-11 11:00:56.755526333 -0600
+--- gcl-2.6.8.ORIG/h/386-linux.h 2010-01-11 11:59:43.000000000 -0700
++++ gcl-2.6.8/h/386-linux.h 2010-03-23 10:46:02.926954534 -0600
@@ -23,6 +23,7 @@
#include <asm/sigcontext.h>
#endif
@@ -173,7 +175,7 @@ diff -dur gcl-2.6.8.ORIG/h/386-linux.h g
#endif
diff -dur gcl-2.6.8.ORIG/h/m68k-linux.h gcl-2.6.8/h/m68k-linux.h
--- gcl-2.6.8.ORIG/h/m68k-linux.h 2004-06-24 09:16:54.000000000 -0600
-+++ gcl-2.6.8/h/m68k-linux.h 2009-08-11 11:00:43.653478300 -0600
++++ gcl-2.6.8/h/m68k-linux.h 2010-03-23 10:46:23.606036242 -0600
@@ -23,6 +23,7 @@
#include <asm/sigcontext.h>
#endif
@@ -184,7 +186,7 @@ diff -dur gcl-2.6.8.ORIG/h/m68k-linux.h
#endif
diff -dur gcl-2.6.8.ORIG/o/test_memprotect.c gcl-2.6.8/o/test_memprotect.c
--- gcl-2.6.8.ORIG/o/test_memprotect.c 1999-12-06 15:44:13.000000000 -0700
-+++ gcl-2.6.8/o/test_memprotect.c 2009-08-11 11:00:26.419472680 -0600
++++ gcl-2.6.8/o/test_memprotect.c 2010-03-23 10:46:42.893914619 -0600
@@ -38,6 +38,7 @@
char *malloc();
gcl-2.6.8-ellipsis.patch:
external_funs.h | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
Index: gcl-2.6.8-ellipsis.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl-2.6.8-ellipsis.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcl-2.6.8-ellipsis.patch 11 Aug 2009 21:28:46 -0000 1.1
+++ gcl-2.6.8-ellipsis.patch 23 Mar 2010 17:50:54 -0000 1.2
@@ -1,18 +1,6 @@
-diff -dur gcl-2.6.8.ORIG/o/bind.c gcl-2.6.8/o/bind.c
---- gcl-2.6.8.ORIG/o/bind.c 2006-06-21 14:03:05.000000000 -0600
-+++ gcl-2.6.8/o/bind.c 2009-08-11 14:11:56.982474159 -0600
-@@ -708,7 +708,7 @@
- #define NOT_KEYWORD 1
-
- void
--parse_key(object *base, bool rest, bool allow_other_keys, register int n, ...)
-+parse_key(object *base, bool rest, bool allow_other_keys, int n, ...)
- {
- object temporary;
- va_list ap;
diff -dur gcl-2.6.8.ORIG/o/external_funs.h gcl-2.6.8/o/external_funs.h
--- gcl-2.6.8.ORIG/o/external_funs.h 2003-08-29 14:41:59.000000000 -0600
-+++ gcl-2.6.8/o/external_funs.h 2009-08-11 14:17:35.000473249 -0600
++++ gcl-2.6.8/o/external_funs.h 2010-03-23 10:59:09.745963641 -0600
@@ -167,8 +167,8 @@
extern object find_special GPR((object body, struct bind_temp *start, struct bind_temp *end));;
extern object let_bind GPR((object body, struct bind_temp *start, struct bind_temp *end));;
gcl-2.6.8-extension.patch:
acconfig.h | 5
configure | 1662 ++++++++++++++++++++++++++++++++++++++++++++++++---------
configure.in | 3
h/gclincl.h.in | 37 +
4 files changed, 1443 insertions(+), 264 deletions(-)
Index: gcl-2.6.8-extension.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl-2.6.8-extension.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gcl-2.6.8-extension.patch 11 Aug 2009 21:28:46 -0000 1.3
+++ gcl-2.6.8-extension.patch 23 Mar 2010 17:50:54 -0000 1.4
@@ -1,6 +1,6 @@
diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-2.6.8/acconfig.h
---- gcl-2.6.8.ORIG/acconfig.h 2009-08-11 10:56:39.718557844 -0600
-+++ gcl-2.6.8/acconfig.h 2009-08-11 10:56:49.066471771 -0600
+--- gcl-2.6.8.ORIG/acconfig.h 2010-03-23 10:26:09.289020132 -0600
++++ gcl-2.6.8/acconfig.h 2010-03-23 10:28:45.864038848 -0600
@@ -1,3 +1,6 @@
+/* Whether compiling on a glibc-based system */
+#undef _GNU_SOURCE
@@ -25,9 +25,9 @@ diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-
#define ISFINITE(a) isfinite(a)
#else
diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
---- gcl-2.6.8.ORIG/configure 2009-08-11 10:56:39.730500620 -0600
-+++ gcl-2.6.8/configure 2009-08-11 10:56:49.084463683 -0600
-@@ -691,9 +691,9 @@
+--- gcl-2.6.8.ORIG/configure 2010-03-23 10:26:09.294012136 -0600
++++ gcl-2.6.8/configure 2010-03-23 10:29:41.095971128 -0600
+@@ -689,9 +689,9 @@
GMPDIR
GMP
MAKEINFO
@@ -38,7 +38,7 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
CPP
OBJEXT
EXEEXT
-@@ -3524,6 +3524,7 @@
+@@ -3528,6 +3528,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -46,7 +46,7 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3761,187 +3762,6 @@
+@@ -3765,260 +3766,6 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -91,8 +91,8 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
-# FIXME -- remove when mingw compiler issues are fixed
-case "$use" in
- *mingw*)
-- TFPFLAG="";;
-- m68k*)#FIXME gcc 4.x bug workaround
+- TFPFLAG="";;
+- m68k*)#FIXME gcc 4.x bug workaround
- TFPFLAG="";;
- *)
- TFPFLAG="-fomit-frame-pointer";;
@@ -231,57 +231,44 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
- TCFLAGS="$TCFLAGS -fPIC"
-fi
-
- { $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
- $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
- if test "${ac_cv_path_GREP+set}" = set; then
-@@ -4076,85 +3896,6 @@
- EGREP="$ac_cv_path_EGREP"
-
-
--for ac_prog in makeinfo
--do
-- # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_MAKEINFO+set}" = set; then
-- $as_echo_n "(cached) " >&6
+-FDEBUG=`echo $CFLAGS | tr ' ' '\012' |grep "^\-g$"|tr '\012' ' '`
+-#CFLAGS=`echo $CFLAGS | tr ' ' '\012' |grep -v "^\-g$"`
+-FOMITF=`echo $CFLAGS | tr ' ' '\012' |grep "^\-fomit-frame-pointer$"|tr '\012' ' '`
+-CFLAGS=`echo $CFLAGS | tr ' ' '\012' |grep -v "^\-fomit-frame-pointer$"|tr '\012' ' '`
+-FOOPT3=`echo $CFLAGS | tr ' ' '\012' |grep "^\-O3$"|tr '\012' ' '`
+-CFLAGS=`echo $CFLAGS | tr ' ' '\012' |grep -v "^\-O3$"|tr '\012' ' '`
+-FOOPT2=`echo $CFLAGS | tr ' ' '\012' |grep "^\-O2$"|tr '\012' ' '`
+-CFLAGS=`echo $CFLAGS | tr ' ' '\012' |grep -v "^\-O2$"|tr '\012' ' '`
+-FOOPT1=`echo $CFLAGS | tr ' ' '\012' |grep "^\-O1$"|tr '\012' ' '`
+-TMP=`echo $CFLAGS | tr ' ' '\012' |grep "^\-O$"|tr '\012' ' '`
+-FOOPT1="$FOOPT1$TMP"
+-CFLAGS=`echo $CFLAGS | tr ' ' '\012' |grep -v "^\-O1$"|grep -v "^\-O$"|tr '\012' ' '`
+-FOOPT0=`echo $CFLAGS | tr ' ' '\012' |grep "^\-O0$"|tr '\012' ' '`
+-CFLAGS=`echo $CFLAGS | tr ' ' '\012' |grep -v "^\-O0$"|tr '\012' ' '`
+-
+-if test "$FOOPT0" != "" ; then
+- TO3FLAGS=`echo $TO3FLAGS | sed 's,\-O[123 ],-O0 ,g' | sed 's,\-O$,-O0 ,g'`
+- TO2FLAGS=`echo $TO2FLAGS | sed 's,\-O[123 ],-O0 ,g' | sed 's,\-O$,-O0 ,g'`
-else
-- if test -n "$MAKEINFO"; then
-- ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
+-if test "$FOOPT1" != "" ; then
+- TO3FLAGS=`echo $TO3FLAGS | sed 's,\-O[2-3],-O1,g'`
+- TO2FLAGS=`echo $TO2FLAGS | sed 's,\-O[2-3],-O1,g'`
-else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_MAKEINFO="$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
+-if test "$FOOPT2" != "" ; then
+- TO3FLAGS=`echo "$TO3FLAGS" | sed 's,\-O3,-O2,g'`
+- TO2FLAGS=`echo "$TO2FLAGS" | sed 's,\-O3,-O2,g'`
-fi
-fi
--MAKEINFO=$ac_cv_prog_MAKEINFO
--if test -n "$MAKEINFO"; then
-- { $as_echo "$as_me:$LINENO: result: $MAKEINFO" >&5
--$as_echo "$MAKEINFO" >&6; }
--else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-fi
-
+-if test "$FDEBUG" != "" ; then
+- TO3FLAGS=`echo $TO3FLAGS | sed 's,\-fomit-frame-pointer,,g'`
+- TO2FLAGS=`echo $TO2FLAGS | sed 's,\-fomit-frame-pointer,,g'`
+-fi
-
-- test -n "$MAKEINFO" && break
--done
--test -n "$MAKEINFO" || MAKEINFO=""false""
--
--
+-if test "$FOMITF" != "" ; then
+- TO3FLAGS="$TO3FLAGS $FOMITF"
+-fi
-
-# Step 1: set the variable "system" to hold the name and version number
-# for the system. This can usually be done via the "uname" command, but
@@ -317,10 +304,10 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
-if test "$use" = "powerpc-macosx" ; then
-
-
- { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
- $as_echo_n "checking for ANSI C header files... " >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
-@@ -4406,7 +4147,1483 @@
+ { $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+ $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+ if test "${ac_cv_path_GREP+set}" = set; then
+@@ -4404,7 +4151,1408 @@
done
@@ -1515,8 +1502,8 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
+# FIXME -- remove when mingw compiler issues are fixed
+case "$use" in
+ *mingw*)
-+ TFPFLAG="";;
-+ m68k*)#FIXME gcc 4.x bug workaround
++ TFPFLAG="";;
++ m68k*)#FIXME gcc 4.x bug workaround
+ TFPFLAG="";;
+ *)
+ TFPFLAG="-fomit-frame-pointer";;
@@ -1655,119 +1642,44 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
+ TCFLAGS="$TCFLAGS -fPIC"
+fi
+
-+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
-+$as_echo_n "checking for egrep... " >&6; }
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+ $as_echo_n "(cached) " >&6
-+else
-+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-+ then ac_cv_path_EGREP="$GREP -E"
-+ else
-+ if test -z "$EGREP"; then
-+ ac_path_EGREP_found=false
-+ # Loop through the user's path and test for each of PROGNAME-LIST
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_prog in egrep; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-+# Check for GNU ac_path_EGREP and select it if it is found.
-+ # Check for GNU $ac_path_EGREP
-+case `"$ac_path_EGREP" --version 2>&1` in
-+*GNU*)
-+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-+*)
-+ ac_count=0
-+ $as_echo_n 0123456789 >"conftest.in"
-+ while :
-+ do
-+ cat "conftest.in" "conftest.in" >"conftest.tmp"
-+ mv "conftest.tmp" "conftest.in"
-+ cp "conftest.in" "conftest.nl"
-+ $as_echo 'EGREP' >> "conftest.nl"
-+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+ ac_count=`expr $ac_count + 1`
-+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-+ # Best one so far, save it but keep looking for a better one
-+ ac_cv_path_EGREP="$ac_path_EGREP"
-+ ac_path_EGREP_max=$ac_count
-+ fi
-+ # 10*(2^10) chars as input seems more than enough
-+ test $ac_count -gt 10 && break
-+ done
-+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+ $ac_path_EGREP_found && break 3
-+ done
-+ done
-+done
-+IFS=$as_save_IFS
-+ if test -z "$ac_cv_path_EGREP"; then
-+ { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+else
-+ ac_cv_path_EGREP=$EGREP
-+fi
-+
-+ fi
-+fi
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-+$as_echo "$ac_cv_path_EGREP" >&6; }
-+ EGREP="$ac_cv_path_EGREP"
-+
-+
-+for ac_prog in makeinfo
-+do
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_MAKEINFO+set}" = set; then
-+ $as_echo_n "(cached) " >&6
-+else
-+ if test -n "$MAKEINFO"; then
-+ ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_MAKEINFO="$ac_prog"
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
++FDEBUG=`echo $CFLAGS | tr ' ' '\012' |grep "^\-g$"|tr '\012' ' '`
++#CFLAGS=`echo $CFLAGS | tr ' ' '\012' |grep -v "^\-g$"`
++FOMITF=`echo $CFLAGS | tr ' ' '\012' |grep "^\-fomit-frame-pointer$"|tr '\012' ' '`
++CFLAGS=`echo $CFLAGS | tr ' ' '\012' |grep -v "^\-fomit-frame-pointer$"|tr '\012' ' '`
++FOOPT3=`echo $CFLAGS | tr ' ' '\012' |grep "^\-O3$"|tr '\012' ' '`
++CFLAGS=`echo $CFLAGS | tr ' ' '\012' |grep -v "^\-O3$"|tr '\012' ' '`
++FOOPT2=`echo $CFLAGS | tr ' ' '\012' |grep "^\-O2$"|tr '\012' ' '`
++CFLAGS=`echo $CFLAGS | tr ' ' '\012' |grep -v "^\-O2$"|tr '\012' ' '`
++FOOPT1=`echo $CFLAGS | tr ' ' '\012' |grep "^\-O1$"|tr '\012' ' '`
++TMP=`echo $CFLAGS | tr ' ' '\012' |grep "^\-O$"|tr '\012' ' '`
++FOOPT1="$FOOPT1$TMP"
++CFLAGS=`echo $CFLAGS | tr ' ' '\012' |grep -v "^\-O1$"|grep -v "^\-O$"|tr '\012' ' '`
++FOOPT0=`echo $CFLAGS | tr ' ' '\012' |grep "^\-O0$"|tr '\012' ' '`
++CFLAGS=`echo $CFLAGS | tr ' ' '\012' |grep -v "^\-O0$"|tr '\012' ' '`
++
++if test "$FOOPT0" != "" ; then
++ TO3FLAGS=`echo $TO3FLAGS | sed 's,\-O[123 ],-O0 ,g' | sed 's,\-O$,-O0 ,g'`
++ TO2FLAGS=`echo $TO2FLAGS | sed 's,\-O[123 ],-O0 ,g' | sed 's,\-O$,-O0 ,g'`
++else
++if test "$FOOPT1" != "" ; then
++ TO3FLAGS=`echo $TO3FLAGS | sed 's,\-O[2-3],-O1,g'`
++ TO2FLAGS=`echo $TO2FLAGS | sed 's,\-O[2-3],-O1,g'`
++else
++if test "$FOOPT2" != "" ; then
++ TO3FLAGS=`echo "$TO3FLAGS" | sed 's,\-O3,-O2,g'`
++ TO2FLAGS=`echo "$TO2FLAGS" | sed 's,\-O3,-O2,g'`
+fi
+fi
-+MAKEINFO=$ac_cv_prog_MAKEINFO
-+if test -n "$MAKEINFO"; then
-+ { $as_echo "$as_me:$LINENO: result: $MAKEINFO" >&5
-+$as_echo "$MAKEINFO" >&6; }
-+else
-+ { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
+fi
+
++if test "$FDEBUG" != "" ; then
++ TO3FLAGS=`echo $TO3FLAGS | sed 's,\-fomit-frame-pointer,,g'`
++ TO2FLAGS=`echo $TO2FLAGS | sed 's,\-fomit-frame-pointer,,g'`
++fi
+
-+ test -n "$MAKEINFO" && break
-+done
-+test -n "$MAKEINFO" || MAKEINFO=""false""
-+
-+
++if test "$FOMITF" != "" ; then
++ TO3FLAGS="$TO3FLAGS $FOMITF"
++fi
+
+# Step 1: set the variable "system" to hold the name and version number
+# for the system. This can usually be done via the "uname" command, but
@@ -1805,7 +1717,7 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
{ $as_echo "$as_me:$LINENO: checking for malloc/malloc.h" >&5
$as_echo_n "checking for malloc/malloc.h... " >&6; }
if test "${ac_cv_header_malloc_malloc_h+set}" = set; then
-@@ -11493,7 +12710,6 @@
+@@ -10287,7 +11435,6 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -1813,7 +1725,7 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
#include <math.h>
int
-@@ -11632,7 +12848,6 @@
+@@ -10426,7 +11573,6 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -1822,9 +1734,9 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
int
diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
---- gcl-2.6.8.ORIG/configure.in 2009-08-11 10:56:39.736470510 -0600
-+++ gcl-2.6.8/configure.in 2009-08-11 10:56:49.107463193 -0600
-@@ -442,6 +442,7 @@
+--- gcl-2.6.8.ORIG/configure.in 2010-03-23 10:26:09.296083076 -0600
++++ gcl-2.6.8/configure.in 2010-03-23 10:29:26.141909779 -0600
+@@ -448,6 +448,7 @@
LDFLAGS=" "
fi
@@ -1832,7 +1744,7 @@ diff -dur gcl-2.6.8.ORIG/configure.in gc
AC_PROG_CC
AC_PROG_CPP
AC_SUBST(CC)
-@@ -1356,7 +1357,6 @@
+@@ -1404,7 +1405,6 @@
#
AC_MSG_CHECKING([for isnormal])
AC_RUN_IFELSE([AC_LANG_PROGRAM([[
@@ -1840,7 +1752,7 @@ diff -dur gcl-2.6.8.ORIG/configure.in gc
#include <math.h>
]],[[
float f;
-@@ -1384,7 +1384,6 @@
+@@ -1432,7 +1432,6 @@
AC_MSG_CHECKING([for isfinite])
AC_RUN_IFELSE([AC_LANG_PROGRAM([[
@@ -1849,8 +1761,8 @@ diff -dur gcl-2.6.8.ORIG/configure.in gc
]],[[
float f;
diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in gcl-2.6.8/h/gclincl.h.in
---- gcl-2.6.8.ORIG/h/gclincl.h.in 2009-08-11 10:56:39.738473077 -0600
-+++ gcl-2.6.8/h/gclincl.h.in 2009-08-11 10:56:49.109472547 -0600
+--- gcl-2.6.8.ORIG/h/gclincl.h.in 2010-03-23 10:26:09.297078376 -0600
++++ gcl-2.6.8/h/gclincl.h.in 2010-03-23 10:29:41.000000000 -0600
@@ -1,4 +1,7 @@
/* h/gclincl.h.in. Generated from configure.in by autoheader. */
+/* Whether compiling on a glibc-based system */
@@ -1875,10 +1787,11 @@ diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in
#include <math.h>
#define ISFINITE(a) isfinite(a)
#else
-@@ -372,5 +373,37 @@
+@@ -371,3 +372,35 @@
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
-
++
+/* Enable extensions on AIX 3, Interix. */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
@@ -1901,9 +1814,6 @@ diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in
+#endif
+
+
- /* Define to 1 if the X Window System is missing or not being used. */
- #undef X_DISPLAY_MISSING
-+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
gcl-2.6.8-getcwd.patch:
unixfsys.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
Index: gcl-2.6.8-getcwd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl-2.6.8-getcwd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcl-2.6.8-getcwd.patch 10 Jan 2009 05:23:18 -0000 1.1
+++ gcl-2.6.8-getcwd.patch 23 Mar 2010 17:50:54 -0000 1.2
@@ -1,6 +1,6 @@
diff -dur gcl-2.6.8.ORIG/o/unixfsys.c gcl-2.6.8/o/unixfsys.c
---- gcl-2.6.8.ORIG/o/unixfsys.c 2008-12-29 17:34:57.000000000 -0700
-+++ gcl-2.6.8/o/unixfsys.c 2008-12-29 17:39:10.000000000 -0700
+--- gcl-2.6.8.ORIG/o/unixfsys.c 2010-03-23 09:49:59.695957414 -0600
++++ gcl-2.6.8/o/unixfsys.c 2010-03-23 09:50:57.452959648 -0600
@@ -149,18 +149,6 @@
#define MAXPATHLEN 512
#endif
@@ -27,7 +27,7 @@ diff -dur gcl-2.6.8.ORIG/o/unixfsys.c gc
+#elif defined(HAVE_GETCWD)
+ getcwd(current_directory, MAXPATHLEN);
#else
- getwd(current_directory);
+ getcwd(current_directory,sizeof(current_directory));
#endif
@@ -361,6 +351,8 @@
FEerror ( "truename could not determine the current directory.", 1, "" );
@@ -36,5 +36,5 @@ diff -dur gcl-2.6.8.ORIG/o/unixfsys.c gc
+#elif defined(HAVE_GETCWD)
+ p = getcwd(directory, MAXPATHLEN);
#else
- p = getwd(directory);
+ p = getcwd(directory,sizeof(directory));
#endif
gcl-2.6.8-infrastructure.patch:
config.guess | 798 +-
config.sub | 260
configure |14781 ++++++++++++++++++++++++++++++++++++++++++-------------
configure.in | 545 +-
h/gclincl.h.in | 160
info/texinfo.tex | 9445 +++++++++++++++++++++++------------
install.sh | 634 +-
ltmain.sh | 9124 ++++++++++++++++++++++-----------
8 files changed, 25224 insertions(+), 10523 deletions(-)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.3 -r 1.4 gcl-2.6.8-infrastructure.patchIndex: gcl-2.6.8-infrastructure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl-2.6.8-infrastructure.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gcl-2.6.8-infrastructure.patch 11 Aug 2009 21:28:46 -0000 1.3
+++ gcl-2.6.8-infrastructure.patch 23 Mar 2010 17:50:54 -0000 1.4
@@ -1,20 +1,20 @@
diff -durN gcl-2.6.8.ORIG/config.guess gcl-2.6.8/config.guess
--- gcl-2.6.8.ORIG/config.guess 2005-08-11 09:02:25.000000000 -0600
-+++ gcl-2.6.8/config.guess 2009-08-11 10:39:53.975471624 -0600
++++ gcl-2.6.8/config.guess 2009-12-10 08:29:51.000000000 -0700
@@ -1,9 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# Free Software Foundation, Inc.
-timestamp='2005-04-22'
-+timestamp='2009-04-27'
++timestamp='2009-11-20'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-@@ -17,13 +18,15 @@
+@@ -17,23 +18,25 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
@@ -27,10 +27,25 @@ diff -durN gcl-2.6.8.ORIG/config.guess g
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-+
- # Originally written by Per Bothner <per at bothner.com>.
- # Please send patches to <config-patches at gnu.org>. Submit a context
- # diff and a properly formatted ChangeLog entry.
+-# Originally written by Per Bothner <per at bothner.com>.
+-# Please send patches to <config-patches at gnu.org>. Submit a context
+-# diff and a properly formatted ChangeLog entry.
++
++# Originally written by Per Bothner. Please send patches (context
++# diff format) to <config-patches at gnu.org> and include a ChangeLog
++# entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub. If it succeeds, it prints the system name on stdout, and
+ # exits with 0. Otherwise, it exits with 1.
+ #
+-# The plan is that this can be called by configure scripts if you
+-# don't specify an explicit build system type.
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+ me=`echo "$0" | sed -e 's,.*/,,'`
+
@@ -53,8 +56,8 @@
GNU config.guess ($timestamp)
@@ -83,6 +98,15 @@ diff -durN gcl-2.6.8.ORIG/config.guess g
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
+@@ -166,7 +170,7 @@
+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ eval $set_cc_for_build
+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+- | grep __ELF__ >/dev/null
++ | grep -q __ELF__
+ then
+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ # Return netbsd for either. FIX?
@@ -196,55 +200,23 @@
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
@@ -205,7 +229,7 @@ diff -durN gcl-2.6.8.ORIG/config.guess g
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
if test "`(/bin/universe) 2>/dev/null`" = att ; then
-@@ -338,32 +313,48 @@
+@@ -338,32 +313,51 @@
else
echo pyramid-pyramid-bsd
fi
@@ -238,6 +262,9 @@ diff -durN gcl-2.6.8.ORIG/config.guess g
- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
++ echo i386-pc-auroraux${UNAME_RELEASE}
++ exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ eval $set_cc_for_build
+ SUN_ARCH="i386"
@@ -264,7 +291,7 @@ diff -durN gcl-2.6.8.ORIG/config.guess g
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
Series*|S4*)
-@@ -372,10 +363,10 @@
+@@ -372,10 +366,10 @@
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
@@ -277,7 +304,7 @@ diff -durN gcl-2.6.8.ORIG/config.guess g
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-@@ -387,10 +378,10 @@
+@@ -387,10 +381,10 @@
echo sparc-sun-sunos${UNAME_RELEASE}
;;
esac
@@ -290,7 +317,7 @@ diff -durN gcl-2.6.8.ORIG/config.guess g
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
# "atarist" or "atariste" at least should have a processor
-@@ -401,40 +392,40 @@
+@@ -401,40 +395,40 @@
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
@@ -343,7 +370,7 @@ diff -durN gcl-2.6.8.ORIG/config.guess g
mips:*:*:UMIPS | mips:*:*:RISCos)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
-@@ -458,32 +449,33 @@
+@@ -458,32 +452,33 @@
exit (-1);
}
EOF
@@ -388,7 +415,7 @@ diff -durN gcl-2.6.8.ORIG/config.guess g
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
-@@ -499,29 +491,29 @@
+@@ -499,29 +494,29 @@
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
@@ -427,7 +454,7 @@ diff -durN gcl-2.6.8.ORIG/config.guess g
ia64:AIX:*:*)
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
-@@ -529,7 +521,7 @@
+@@ -529,7 +524,7 @@
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
@@ -436,7 +463,7 @@ diff -durN gcl-2.6.8.ORIG/config.guess g
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
eval $set_cc_for_build
-@@ -544,15 +536,19 @@
+@@ -544,15 +539,19 @@
exit(0);
}
EOF
@@ -460,7 +487,7 @@ diff -durN gcl-2.6.8.ORIG/config.guess g
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
-@@ -565,28 +561,28 @@
+@@ -565,28 +564,28 @@
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${IBM_ARCH}-ibm-aix${IBM_REV}
@@ -497,7 +524,7 @@ diff -durN gcl-2.6.8.ORIG/config.guess g
9000/[34678]??:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "${UNAME_MACHINE}" in
-@@ -648,9 +644,19 @@
+@@ -648,9 +647,19 @@
esac
if [ ${HP_ARCH} = "hppa2.0w" ]
then
@@ -516,11 +543,11 @@ diff -durN gcl-2.6.8.ORIG/config.guess g
+ # => hppa64-hp-hpux11.23
+
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-+ grep __LP64__ >/dev/null
++ grep -q __LP64__
then
HP_ARCH="hppa2.0w"
else
-@@ -658,11 +664,11 @@
+@@ -658,11 +667,11 @@
fi
fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -534,7 +561,7 @@ diff -durN gcl-2.6.8.ORIG/config.guess g
3050*:HI-UX:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
-@@ -690,161 +696,192 @@
+@@ -690,219 +699,248 @@
exit (0);
[...8602 lines suppressed...]
+}
+-% Page size parameters.
+% @documentencoding sets the definition of non-ASCII characters
+% according to the specified encoding.
+%
@@ -32181,11 +30645,10 @@ diff -durN gcl-2.6.8.ORIG/info/texinfo.t
+ \fi % lattwo
+ \fi % ascii
+}
-
--% Page size parameters.
++
+% A message to be logged when using a character that isn't available
+% the default font encoding (OT1).
- %
++%
+\def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}}
+
+% Take account of \c (plain) vs. \, (Texinfo) difference.
@@ -32946,7 +31409,7 @@ diff -durN gcl-2.6.8.ORIG/info/texinfo.t
+% Make non-ASCII characters printable again for compatibility with
+% existing Texinfo documents that may use them, even without declaring a
+% document encoding.
-+%
+ %
+\setnonasciicharscatcode \other
+
+
@@ -32955,7 +31418,7 @@ diff -durN gcl-2.6.8.ORIG/info/texinfo.t
\newdimen\defaultparindent \defaultparindent = 15pt
\chapheadingskip = 15pt plus 4pt minus 2pt
-@@ -5695,7 +8898,7 @@
+@@ -5695,7 +8918,7 @@
% Don't be so finicky about underfull hboxes, either.
\hbadness = 2000
@@ -32964,7 +31427,7 @@ diff -durN gcl-2.6.8.ORIG/info/texinfo.t
\widowpenalty=10000
\clubpenalty=10000
-@@ -5713,11 +8916,14 @@
+@@ -5713,11 +8936,14 @@
\fi
}
@@ -32983,7 +31446,7 @@ diff -durN gcl-2.6.8.ORIG/info/texinfo.t
\voffset = #3\relax
\topskip = #6\relax
\splittopskip = \topskip
-@@ -5736,6 +8942,17 @@
+@@ -5736,6 +8962,17 @@
\normaloffset = #4\relax
\bindingoffset = #5\relax
%
@@ -33001,7 +31464,7 @@ diff -durN gcl-2.6.8.ORIG/info/texinfo.t
\parindent = \defaultparindent
\setemergencystretch
}
-@@ -5743,76 +8960,140 @@
+@@ -5743,76 +8980,140 @@
% @letterpaper (the default).
\def\letterpaper{{\globaldefs = 1
\parskip = 3pt plus 2pt minus 1pt
@@ -33168,7 +31631,7 @@ diff -durN gcl-2.6.8.ORIG/info/texinfo.t
}}
% Set default to letter.
-@@ -5822,6 +9103,9 @@
+@@ -5822,6 +9123,9 @@
\message{and turning on texinfo input format.}
@@ -33178,7 +31641,7 @@ diff -durN gcl-2.6.8.ORIG/info/texinfo.t
% Define macros to output various characters with catcode for normal text.
\catcode`\"=\other
\catcode`\~=\other
-@@ -5840,10 +9124,10 @@
+@@ -5840,10 +9144,10 @@
\def\normalless{<}
\def\normalgreater{>}
\def\normalplus{+}
@@ -33192,7 +31655,7 @@ diff -durN gcl-2.6.8.ORIG/info/texinfo.t
% where something hairier probably needs to be done.
%
% #1 is what to print if we are indeed using \tt; #2 is what to print
-@@ -5875,8 +9159,9 @@
+@@ -5875,8 +9179,9 @@
\catcode`\_=\active
\def_{\ifusingtt\normalunderscore\_}
@@ -33203,7 +31666,7 @@ diff -durN gcl-2.6.8.ORIG/info/texinfo.t
\catcode`\|=\active
\def|{{\tt\char124}}
-@@ -5889,16 +9174,7 @@
+@@ -5889,16 +9194,7 @@
\catcode`\+=\active
\def+{{\tt \char 43}}
\catcode`\$=\active
@@ -33221,7 +31684,7 @@ diff -durN gcl-2.6.8.ORIG/info/texinfo.t
% If a .fmt file is being used, characters that might appear in a file
% name cannot be active until we have parsed the command line.
-@@ -5906,46 +9182,55 @@
+@@ -5906,46 +9202,55 @@
% \otherifyactive is called near the end of this file.
\def\otherifyactive{\catcode`+=\other \catcode`\_=\other}
@@ -33310,7 +31773,7 @@ diff -durN gcl-2.6.8.ORIG/info/texinfo.t
% Make _ and + \other characters, temporarily.
% This is canceled by @fixbackslash.
-@@ -5959,9 +9244,9 @@
+@@ -5959,9 +9264,9 @@
@global at let\ = @eatinput
% On the other hand, perhaps the file did not have a `\input texinfo'. Then
@@ -33322,7 +31785,7 @@ diff -durN gcl-2.6.8.ORIG/info/texinfo.t
% file name, in case not using a pre-dumped format.
%
@gdef at fixbackslash{%
-@@ -5973,20 +9258,34 @@
+@@ -5973,15 +9278,19 @@
% Say @foo, not \foo, in error messages.
@escapechar = `@@
@@ -33335,6 +31798,7 @@ diff -durN gcl-2.6.8.ORIG/info/texinfo.t
- at c Set initial fonts.
- at textfonts
- at rm
+-
+ at c Finally, make ` and ' active, so that txicodequoteundirected and
+ at c txicodequotebacktick work right in, e.g., @w{@code{`foo'}}. If we
+ at c don't make ` and ' active, @code will not get them as active chars.
@@ -33344,14 +31808,9 @@ diff -durN gcl-2.6.8.ORIG/info/texinfo.t
+ at markupsetuplqdefault
+ at markupsetuprqdefault
-+ at c Gnulib now utterly and painfully insists on no trailing whitespace.
-+ at c So we have to nuke it.
-
@c Local variables:
@c eval: (add-hook 'write-file-hooks 'time-stamp)
-+ at c eval: (add-hook 'write-file-hooks 'nuke-trailing-whitespace)
- @c page-delimiter: "^\\\\message"
- @c time-stamp-start: "def\\\\texinfoversion{"
+@@ -5990,3 +9299,9 @@
@c time-stamp-format: "%:y-%02m-%02d.%02H"
@c time-stamp-end: "}"
@c End:
@@ -33363,7 +31822,7 @@ diff -durN gcl-2.6.8.ORIG/info/texinfo.t
+ at end ignore
diff -durN gcl-2.6.8.ORIG/install.sh gcl-2.6.8/install.sh
--- gcl-2.6.8.ORIG/install.sh 1999-12-06 15:43:54.000000000 -0700
-+++ gcl-2.6.8/install.sh 2009-07-24 14:49:33.000000000 -0600
++++ gcl-2.6.8/install.sh 2010-03-23 09:57:24.762010157 -0600
@@ -1,19 +1,38 @@
-#! /bin/sh
-#
@@ -34069,7 +32528,7 @@ diff -durN gcl-2.6.8.ORIG/install.sh gcl
+# End:
diff -durN gcl-2.6.8.ORIG/ltmain.sh gcl-2.6.8/ltmain.sh
--- gcl-2.6.8.ORIG/ltmain.sh 2002-08-08 23:49:32.000000000 -0600
-+++ gcl-2.6.8/ltmain.sh 2009-07-26 16:39:21.000000000 -0600
++++ gcl-2.6.8/ltmain.sh 2010-01-22 09:05:36.000000000 -0700
@@ -1,42 +1,574 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun ltconfig.
@@ -34081,7 +32540,7 @@ diff -durN gcl-2.6.8.ORIG/ltmain.sh gcl-
-# This program is free software; you can redistribute it and/or modify
+# Generated from ltmain.m4sh.
+
-+# ltmain.sh (GNU libtool) 2.2.6
++# ltmain.sh (GNU libtool) 2.2.6b
+# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
@@ -34153,7 +32612,7 @@ diff -durN gcl-2.6.8.ORIG/ltmain.sh gcl-
+# compiler: $LTCC
+# compiler flags: $LTCFLAGS
+# linker: $LD (gnu? $with_gnu_ld)
-+# $progname: (GNU libtool) 2.2.6
++# $progname: (GNU libtool) 2.2.6b
+# automake: $automake_version
+# autoconf: $autoconf_version
+#
@@ -34162,9 +32621,9 @@ diff -durN gcl-2.6.8.ORIG/ltmain.sh gcl-
-# Check that we have a working $echo.
+PROGRAM=ltmain.sh
+PACKAGE=libtool
-+VERSION=2.2.6
++VERSION=2.2.6b
+TIMESTAMP=""
-+package_revision=1.3012
++package_revision=1.3017
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
gcl-2.6.8-latex.patch:
dwdoc.tex | 733 +++++++++++++++++++++++++++++++-------------------------------
1 file changed, 368 insertions(+), 365 deletions(-)
Index: gcl-2.6.8-latex.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl-2.6.8-latex.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcl-2.6.8-latex.patch 10 Jan 2009 05:23:18 -0000 1.1
+++ gcl-2.6.8-latex.patch 23 Mar 2010 17:50:55 -0000 1.2
@@ -1,9 +1,9 @@
diff -dur gcl-2.6.8.ORIG/xgcl-2/dwdoc.tex gcl-2.6.8/xgcl-2/dwdoc.tex
---- gcl-2.6.8.ORIG/xgcl-2/dwdoc.tex 2008-12-29 20:09:33.000000000 -0700
-+++ gcl-2.6.8/xgcl-2/dwdoc.tex 2008-12-29 20:09:01.000000000 -0700
+--- gcl-2.6.8.ORIG/xgcl-2/dwdoc.tex 2010-01-22 17:49:06.000000000 -0700
++++ gcl-2.6.8/xgcl-2/dwdoc.tex 2010-03-23 09:44:50.066911736 -0600
@@ -1,19 +1,16 @@
% dwdoc.tex Gordon S. Novak Jr.
- % 08 Oct 92; 08 Oct 93; 16 Nov 94; 05 Jan 95; 25 Jan 06; 26 Jan 06
+ % 08 Oct 92; 08 Oct 93; 16 Nov 94; 05 Jan 95; 25 Jan 06; 26 Jan 06; 08 Dec 08
-\documentstyle[12pt]{article}
-\setlength{\oddsidemargin}{0 in}
@@ -790,19 +790,25 @@ diff -dur gcl-2.6.8.ORIG/xgcl-2/dwdoc.te
\subsection{Color}
-@@ -551,58 +552,58 @@
+@@ -551,62 +552,62 @@
The color of the foreground (things that are drawn, such as lines or
characters) is set by:
-{\tt \hspace*{0.5in} (window-set-color w rgb \&optional background)} \\
+-{\tt \hspace*{0.5in} (window-set-color-rgb w r g b \&optional background)} \\
+\texttt{\hspace*{0.5in} (window-set-color w rgb \&optional background)} \\
++\texttt{\hspace*{0.5in} (window-set-color-rgb w r g b \&optional background)} \\
-{\tt rgb} is a list {\tt (red green blue)} of 16-bit unsigned integers in
-the range {\tt 0} to {\tt 65535}. {\tt background} is non-{\tt nil}
--to set the background color rather than the foreground color.
+\texttt{rgb} is a list \texttt{(red green blue)} of 16-bit unsigned integers in
-+the range \texttt{0} to \texttt{65535}. \texttt{background} is
-+non-\texttt{nil} to set the background color rather than the foreground color.
++the range \texttt{0} to \texttt{65535}. \texttt{background} is non-\texttt{nil}
+ to set the background color rather than the foreground color.
+
+-{\tt \hspace*{0.5in} (window-reset-color w)} \\
+-{\tt window-reset-color} resets a window's colors to the default values.
++\texttt{\hspace*{0.5in} (window-reset-color w)} \\
++\texttt{window-reset-color} resets a window's colors to the default values.
Colors are a scarce resource; there is only a finite number of
available colors, such as 256 colors. If you only use a small, fixed set
@@ -810,13 +816,11 @@ diff -dur gcl-2.6.8.ORIG/xgcl-2/dwdoc.te
if you create a lot of colors that are used only briefly, it will be
necessary to release them after they are no longer needed.
-{\tt window-set-color} will leave the global variable {\tt *window-xcolor*}
--set to an integer value that denotes an X color; this value should be
++\texttt{window-set-color} will leave the global variable \texttt{*window-xcolor*}
+ set to an integer value that denotes an X color; this value should be
-saved and used as the argument to {\tt window-free-color} to release
--the color after it is no longer needed.
-+\texttt{window-set-color} will leave the global variable
-+\texttt{*window-xcolor*} set to an integer value that denotes an X color; this
-+value should be saved and used as the argument to \texttt{window-free-color}
-+to release the color after it is no longer needed.
++saved and used as the argument to \texttt{window-free-color} to release
+ the color after it is no longer needed.
-{\tt \hspace*{0.5in} (window-free-color w \&optional xcolor)} \\
+\texttt{\hspace*{0.5in} (window-free-color w \&optional xcolor)} \\
@@ -872,7 +876,7 @@ diff -dur gcl-2.6.8.ORIG/xgcl-2/dwdoc.te
Example:
\begin{verbatim}
(window-draw-box-xy myw 48 48 204 204)
-@@ -612,130 +613,132 @@
+@@ -616,130 +617,132 @@
\section{Mouse Interaction}
@@ -1067,7 +1071,7 @@ diff -dur gcl-2.6.8.ORIG/xgcl-2/dwdoc.te
then destroys the window containing the mouse cursor. This function
should be used with care; it can destroy a non-user window, causing
processes associated with the window to be destroyed. It is useful
-@@ -746,7 +749,7 @@
+@@ -750,7 +753,7 @@
\section{Examples}
Several interactive programs using this software for their graphical
@@ -1076,7 +1080,7 @@ diff -dur gcl-2.6.8.ORIG/xgcl-2/dwdoc.te
under the heading Software Demos.
-@@ -756,31 +759,31 @@
+@@ -760,31 +763,31 @@
a web page. There are two approaches, either using an X server on
the computer of the person viewing the web page, or using WeirdX, a
Java program that emulates an X server. Details can be found at:
gcl-2.6.8-loginname.patch:
unixfsys.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Index: gcl-2.6.8-loginname.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl-2.6.8-loginname.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcl-2.6.8-loginname.patch 10 Jan 2009 05:23:18 -0000 1.1
+++ gcl-2.6.8-loginname.patch 23 Mar 2010 17:50:55 -0000 1.2
@@ -1,6 +1,6 @@
diff -dur gcl-2.6.8.ORIG/o/unixfsys.c gcl-2.6.8/o/unixfsys.c
---- gcl-2.6.8.ORIG/o/unixfsys.c 2008-12-29 17:42:18.000000000 -0700
-+++ gcl-2.6.8/o/unixfsys.c 2008-12-29 17:51:35.000000000 -0700
+--- gcl-2.6.8.ORIG/o/unixfsys.c 2010-03-23 09:51:48.291962248 -0600
++++ gcl-2.6.8/o/unixfsys.c 2010-03-23 09:53:39.421996999 -0600
@@ -214,7 +214,7 @@
#ifndef NO_PWD_H
@@ -10,13 +10,11 @@ diff -dur gcl-2.6.8.ORIG/o/unixfsys.c gc
int n;
char *q = namestring->st.st_self;
#ifndef __STDC__
-@@ -224,8 +224,7 @@
+@@ -224,7 +224,6 @@
struct passwd *pwent;
int m=0;
- q=namestring->st.st_self;
-- for (n=0; n< namestring->st.st_fillp; n++)
-+ for (n=1; n< namestring->st.st_fillp; n++)
+ for (n=1; n< namestring->st.st_fillp; n++)
if (q[n]=='/') break;
bcopy(q+1,name,n-1);
- name[n-1]= 0;
gcl-2.6.8-plt.patch:
plt.c | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
Index: gcl-2.6.8-plt.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl-2.6.8-plt.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gcl-2.6.8-plt.patch 30 Nov 2009 19:24:02 -0000 1.3
+++ gcl-2.6.8-plt.patch 23 Mar 2010 17:50:55 -0000 1.4
@@ -1,23 +1,11 @@
-diff -dur gcl-2.6.8.ORIG/o/makefile gcl-2.6.8/o/makefile
---- gcl-2.6.8.ORIG/o/makefile 2009-11-30 09:43:39.243683779 -0700
-+++ gcl-2.6.8/o/makefile 2009-11-30 09:44:35.280367565 -0700
-@@ -149,7 +149,7 @@
- $(CC) -c $(CFLAGS) $(DEFS) $*.c $(AUX_INFO)
-
- plt.h: plttest.o
-- nm $< | $(AWK) '/ U / {if ($$NF!=2) next;a=$$2;if (k) sub("^_","",a);\
-+ nm $< | $(AWK) '/ U / {if (NF!=2) next;a=$$2;if (k) sub("^_","",a);\
- print a}' \
- k=$(LEADING_UNDERSCORE) |\
- sort | \
diff -dur gcl-2.6.8.ORIG/o/plt.c gcl-2.6.8/o/plt.c
---- gcl-2.6.8.ORIG/o/plt.c 2008-08-03 09:16:22.000000000 -0600
-+++ gcl-2.6.8/o/plt.c 2009-11-30 09:51:31.262417304 -0700
+--- gcl-2.6.8.ORIG/o/plt.c 2009-12-11 09:10:05.000000000 -0700
++++ gcl-2.6.8/o/plt.c 2010-03-23 10:57:32.741972442 -0600
@@ -102,6 +102,12 @@
}
-+/* Parser statse */
++/* Parser states */
+#define NOTHING 0 /* initial state */
+#define PLT 1 /* reading plt */
+#define NEWLINE 2 /* reading empty line after .iplt */
@@ -26,7 +14,7 @@ diff -dur gcl-2.6.8.ORIG/o/plt.c gcl-2.6
int
parse_plt() {
-@@ -132,19 +138,26 @@
+@@ -132,15 +138,24 @@
return 0;
if (!(f=fopen(b1,"r")))
FEerror("Cannot open map file", 0);
@@ -34,30 +22,25 @@ diff -dur gcl-2.6.8.ORIG/o/plt.c gcl-2.6
+ for (i=NOTHING,j=0,li=Cnil;fgets(b,sizeof(b),f);) {
if (!memchr(b,10,sizeof(b)-1))
FEerror("plt buffer too small", 0);
-- if (memcmp(b," .plt",4) && !i)
+- if (!memcmp(b," .plt",4)) {
+- i=1;
+ if (i == NOTHING) {
+ if (memcmp(b," .plt",5) == 0)
+ i = PLT;
+ else if (memcmp(b," .iplt",6) == 0)
+ i = NEWLINE;
continue;
-+ }
- if (*b=='\r' || *b=='\n') {
+ }
+- if (*b!=' ' || b[1]!=' ' || !i) {
- i=0;
++ if (*b=='\r' || *b=='\n') {
+ i = (i == NEWLINE) ? PLT : NOTHING;
- continue;
-- } else
-- if (!i) {
-- i=1;
-- continue;
-- }
++ continue;
+ }
+ if (b[1] != ' ') {
+ /* There is at least one "annotation" line before the iplt information */
+ if (i != NEWLINE)
+ i = NOTHING;
-+ continue;
-+ }
+ continue;
+ }
if (sscanf(b,"%lx%n",&u,&n)!=1)
- FEerror("Cannot read address", 0);
- for (c=b+n;*c==32;c++);
gcl-2.6.8-unrandomize.patch:
configure | 19 +++++++--------
configure.in | 19 +++++++--------
h/unrandomize.h | 70 ++++++++++++++++++++++++++++++--------------------------
o/main.c | 7 +----
4 files changed, 58 insertions(+), 57 deletions(-)
Index: gcl-2.6.8-unrandomize.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl-2.6.8-unrandomize.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gcl-2.6.8-unrandomize.patch 27 Apr 2009 16:17:13 -0000 1.2
+++ gcl-2.6.8-unrandomize.patch 23 Mar 2010 17:50:56 -0000 1.3
@@ -1,7 +1,7 @@
diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
---- gcl-2.6.8.ORIG/configure 2009-04-27 09:50:47.000000000 -0600
-+++ gcl-2.6.8/configure 2009-04-27 09:51:31.000000000 -0600
-@@ -10024,9 +10024,11 @@
+--- gcl-2.6.8.ORIG/configure 2010-03-23 11:21:56.155975563 -0600
++++ gcl-2.6.8/configure 2010-03-23 11:22:09.803019259 -0600
+@@ -8749,9 +8749,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -10,11 +10,11 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
void gprof_cleanup() {}
int main(int argc,char *argv[],char *envp[]) {
- #include "h/unrandomize.h"
-+ UNRANDOMIZE_SBRK;
++ UNRANDOMIZE_SBRK;
return 0;}
_ACEOF
rm -f conftest$ac_exeext
-@@ -10091,12 +10093,11 @@
+@@ -8816,12 +8818,11 @@
/* end confdefs.h. */
#include <stdio.h>
@@ -29,7 +29,7 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
if (!(f=fopen("conftest1","w"))) return -1;
fprintf(f,"%u",sbrk(0));
return 0;}
-@@ -10153,12 +10154,11 @@
+@@ -8878,12 +8879,11 @@
/* end confdefs.h. */
#include <stdio.h>
@@ -44,7 +44,7 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
if (!(f=fopen("conftest1","w"))) return -1;
fprintf(f,"%u",sbrk(0));
return 0;}
-@@ -10309,6 +10309,7 @@
+@@ -9034,6 +9034,7 @@
#include <stdio.h>
#include <stdlib.h>
@@ -52,7 +52,7 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
void gprof_cleanup() {}
int
-@@ -10317,9 +10318,7 @@
+@@ -9042,9 +9043,7 @@
char *b,*b1;
FILE *fp;
@@ -64,9 +64,9 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
fp = fopen("conftest1","w");
diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
---- gcl-2.6.8.ORIG/configure.in 2009-04-27 09:50:47.000000000 -0600
-+++ gcl-2.6.8/configure.in 2009-04-27 09:51:09.000000000 -0600
-@@ -1104,9 +1104,11 @@
+--- gcl-2.6.8.ORIG/configure.in 2010-03-23 11:21:56.157974544 -0600
++++ gcl-2.6.8/configure.in 2010-03-23 11:22:09.804016306 -0600
+@@ -1152,9 +1152,11 @@
AC_MSG_CHECKING([for personality(ADDR_NO_RANDOMIZE) support])
AC_RUN_IFELSE([AC_LANG_SOURCE([[
@@ -75,11 +75,11 @@ diff -dur gcl-2.6.8.ORIG/configure.in gc
void gprof_cleanup() {}
int main(int argc,char *argv[],char *envp[]) {
- #include "h/unrandomize.h"
-+ UNRANDOMIZE_SBRK;
++ UNRANDOMIZE_SBRK;
return 0;}]])],CAN_UNRANDOMIZE_SBRK=1,CAN_UNRANDOMIZE_SBRK=0,CAN_UNRANDOMIZE_SBRK=0)
if test "$CAN_UNRANDOMIZE_SBRK" != 0 ; then
-@@ -1119,12 +1121,11 @@
+@@ -1167,12 +1169,11 @@
AC_MSG_CHECKING([that sbrk is (now) non-random])
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h>
@@ -94,7 +94,7 @@ diff -dur gcl-2.6.8.ORIG/configure.in gc
if (!(f=fopen("conftest1","w"))) return -1;
fprintf(f,"%u",sbrk(0));
return 0;}]])],SBRK=`cat conftest1`,SBRK=0,SBRK=0)
-@@ -1133,12 +1134,11 @@
+@@ -1181,12 +1182,11 @@
fi
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h>
@@ -109,7 +109,7 @@ diff -dur gcl-2.6.8.ORIG/configure.in gc
if (!(f=fopen("conftest1","w"))) return -1;
fprintf(f,"%u",sbrk(0));
return 0;}]])],SBRK1=`cat conftest1`,SBRK1=0,SBRK1=0)
-@@ -1180,6 +1180,7 @@
+@@ -1228,6 +1228,7 @@
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h>
#include <stdlib.h>
@@ -117,7 +117,7 @@ diff -dur gcl-2.6.8.ORIG/configure.in gc
void gprof_cleanup() {}
int
-@@ -1188,9 +1189,7 @@
+@@ -1236,9 +1237,7 @@
char *b,*b1;
FILE *fp;
@@ -129,63 +129,89 @@ diff -dur gcl-2.6.8.ORIG/configure.in gc
fp = fopen("conftest1","w");
diff -dur gcl-2.6.8.ORIG/h/unrandomize.h gcl-2.6.8/h/unrandomize.h
---- gcl-2.6.8.ORIG/h/unrandomize.h 2008-08-20 19:13:58.000000000 -0600
-+++ gcl-2.6.8/h/unrandomize.h 2009-04-27 09:51:09.000000000 -0600
-@@ -1,25 +1,33 @@
+--- gcl-2.6.8.ORIG/h/unrandomize.h 2010-01-12 07:19:15.000000000 -0700
++++ gcl-2.6.8/h/unrandomize.h 2010-03-23 11:22:41.350120555 -0600
+@@ -1,39 +1,45 @@
++#include <stdio.h>
+#include <stdlib.h>
#include <sys/personality.h>
#include <syscall.h>
#include <unistd.h>
#include <alloca.h>
+ #include <errno.h>
+-
-{
+- errno=0;
+-
+- {
+-
+- long pers = personality(0xffffffffUL);
+- if (pers==-1) {printf("personality failure %d\n",errno);exit(-1);}
+- if (!(pers & ADDR_NO_RANDOMIZE) && !getenv("GCL_UNRANDOMIZE")) {
+- errno=0;
+- if (personality(pers | ADDR_NO_RANDOMIZE) != -1 && personality(0xffffffffUL) & ADDR_NO_RANDOMIZE) {
+- int i;
+- char **n;
+- for (i=0;envp[i];i++);
+- n=alloca((i+2)*sizeof(*n));
+- n[i+1]=0;
+- n[i--]="GCL_UNRANDOMIZE=t";
+- for (;i>=0;i--)
+- n[i]=envp[i];
+-#ifdef GCL_GPROF
+- gprof_cleanup();
+#ifdef CAN_UNRANDOMIZE_SBRK
+# ifdef GCL_GPROF
+# define GPROF_CLEANUP gprof_cleanup()
+# else
+# define GPROF_CLEANUP
+# endif
-
-- long pers = personality(0xffffffffUL);
-- if (!(pers & ADDR_NO_RANDOMIZE) && !getenv("GCL_UNRANDOMIZE"))
-- if (personality(pers | ADDR_NO_RANDOMIZE) != -1 && personality(0xffffffffUL) & ADDR_NO_RANDOMIZE) {
-- int i;
-- char **n;
-- for (i=0;envp[i];i++);
-- n=alloca((i+2)*sizeof(*n));
-- n[i+1]=0;
-- n[i--]="GCL_UNRANDOMIZE=t";
-- for (;i>=0;i--)
-- n[i]=envp[i];
--#ifdef GCL_GPROF
-- gprof_cleanup();
-+#define UNRANDOMIZE_SBRK do \
-+{ \
-+ long pers = personality(0xffffffffUL); \
-+ if (!(pers & ADDR_NO_RANDOMIZE) && !getenv("GCL_UNRANDOMIZE")) \
-+ if (personality(pers | ADDR_NO_RANDOMIZE) != -1 && personality(0xffffffffUL) & ADDR_NO_RANDOMIZE) { \
-+ int i; \
-+ char **n; \
-+ for (i=0;envp[i];i++); \
-+ n=alloca((i+2)*sizeof(*n)); \
-+ n[i+1]=0; \
-+ n[i--]="GCL_UNRANDOMIZE=t"; \
-+ for (;i>=0;i--) \
-+ n[i]=envp[i]; \
-+ GPROF_CLEANUP; \
-+ execve(*argv,argv,n); \
++# define UNRANDOMIZE_SBRK do { \
++ errno=0; \
++ { \
++ long pers = personality(0xffffffffUL); \
++ if (pers==-1) {printf("personality failure %d\n",errno);exit(-1);} \
++ if (!(pers & ADDR_NO_RANDOMIZE) && !getenv("GCL_UNRANDOMIZE")) { \
++ errno=0; \
++ if (personality(pers | ADDR_NO_RANDOMIZE) != -1 && personality(0xffffffffUL) & ADDR_NO_RANDOMIZE) { \
++ int i; \
++ char **n; \
++ for (i=0;envp[i];i++); \
++ n=alloca((i+2)*sizeof(*n)); \
++ n[i+1]=0; \
++ n[i--]="GCL_UNRANDOMIZE=t"; \
++ for (;i>=0;i--) \
++ n[i]=envp[i]; \
++ GPROF_CLEANUP; \
++ errno=0; \
++ execve(*argv,argv,n); \
++ printf("execve failure %d\n",errno); \
++ exit(-1); \
++ } else { \
++ printf("personality change failure %d\n",errno); \
++ exit(-1); \
++ } \
++ } \
+ } \
-+ } while(0)
++ } while (0)
+#else
+# define UNRANDOMIZE_SBRK
#endif
-- execve(*argv,argv,n);
+- errno=0;
+- execve(*argv,argv,n);
+- printf("execve failure %d\n",errno);
+- exit(-1);
+- } else {
+- printf("personality change failure %d\n",errno);
+- exit(-1);
+- }
- }
--
+- }
-}
diff -dur gcl-2.6.8.ORIG/o/main.c gcl-2.6.8/o/main.c
---- gcl-2.6.8.ORIG/o/main.c 2008-07-31 13:12:59.000000000 -0600
-+++ gcl-2.6.8/o/main.c 2009-04-27 09:51:09.000000000 -0600
+--- gcl-2.6.8.ORIG/o/main.c 2010-01-12 07:19:15.000000000 -0700
++++ gcl-2.6.8/o/main.c 2010-03-23 11:22:09.805058642 -0600
@@ -51,6 +51,7 @@
#include <signal.h>
#endif
@@ -194,11 +220,13 @@ diff -dur gcl-2.6.8.ORIG/o/main.c gcl-2.
bool saving_system ;
-@@ -125,9 +126,7 @@
- #endif
- #endif
+@@ -143,11 +144,7 @@
+ #endif
+ *argv=kcl_self;
-#ifdef CAN_UNRANDOMIZE_SBRK
+-#include <stdio.h>
+-#include <stdlib.h>
-#include "unrandomize.h"
-#endif
+ UNRANDOMIZE_SBRK;
Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- gcl.spec 30 Nov 2009 19:24:02 -0000 1.42
+++ gcl.spec 23 Mar 2010 17:50:56 -0000 1.43
@@ -3,7 +3,7 @@
%global __global_cflags %(printf %%s '%__global_cflags' | sed 's/ -fstack-protector --param=ssp-buffer-size=4//')
# Prerelease of 2.6.8
-%global alphatag 20090701cvs
+%global alphatag 20100201cvs
Name: gcl
Version: 2.6.8
@@ -16,7 +16,7 @@ URL: http://www.gnu.org/softw
# The source for this package was pulled from upstream's CVS repository. Use
# the following commands to generate the tarball:
# cvs -d:pserver:anonymous at cvs.savannah.gnu.org:/sources/gcl export \
-# -r Version_2_6_8pre -D 2009-07-02 -d gcl-2.6.8 gcl
+# -r Version_2_6_8pre -D 2010-02-02 -d gcl-2.6.8 gcl
# tar cvf gcl-2.6.8.tar gcl-2.6.8
# xz gcl-2.6.8.tar
Source0: gcl-%{version}.tar.xz
@@ -25,68 +25,65 @@ Source1: gcl.el
# something useful. These files are present in CVS HEAD (i.e., the upcoming
# 2.7.0 release), but are missing in the 2.6 branch.
Source2: gcl-2.6.8-info.tar.xz
-# This patch was last sent upstream on 29 Dec 2008. It makes GCL use the
-# sigprocmask API instead of the deprecated sigblock API.
-Patch0: gcl-2.6.8-sigprocmask-linux.patch
# This patch was last sent upstream on 29 Dec 2008. It fixes a file descriptor
# leak, as well as combining 4 system calls into only 2 on an exec().
-Patch1: gcl-2.6.8-fd-leak.patch
+Patch0: gcl-2.6.8-fd-leak.patch
# This patch was last sent upstream on 29 Dec 2008. It updates one source file
# from LaTeX 2.09 to LaTeX 2e, thereby eliminating LaTeX warnings about running
# in compatibility mode.
-Patch2: gcl-2.6.8-latex.patch
+Patch1: gcl-2.6.8-latex.patch
# This patch was last sent upstream on 29 Dec 2008. It eliminates a few minor
# texinfo warnings.
-Patch3: gcl-2.6.8-texinfo.patch
+Patch2: gcl-2.6.8-texinfo.patch
# This patch was last sent upstream on 29 Dec 2008. It fixes a large number of
# compile- and run-time problems with the Emacs interface code.
-Patch4: gcl-2.6.8-elisp.patch
+Patch3: gcl-2.6.8-elisp.patch
# This patch was last sent upstream on 17 Jan 2009. It adds support for
# compiling and running on an SELinux-enabled host.
-Patch5: gcl-2.6.8-selinux.patch
+Patch4: gcl-2.6.8-selinux.patch
# This patch was last sent upstream on 29 Dec 2008. It uses the rename()
# system call when it is available to avoid spawning a subshell and suffering a
# context switch just to rename a file.
-Patch6: gcl-2.6.8-rename.patch
+Patch5: gcl-2.6.8-rename.patch
# This patch was last sent upstream on 29 Dec 2008. It eliminates a
# compilation problem due to the fact that, at high optimization levels,
# getcwd() is an inline function.
-Patch7: gcl-2.6.8-getcwd.patch
+Patch6: gcl-2.6.8-getcwd.patch
# This patch was last sent upstream on 29 Dec 2008. It fixes a potential
# buffer overflow when accessing files whose names start with a tilde (i.e.,
# user home directories).
-Patch8: gcl-2.6.8-loginname.patch
+Patch7: gcl-2.6.8-loginname.patch
# This patch was last sent upstream on 29 Dec 2008. It updates the autoconf
# and libtool files to newer versions. By itself, this patch accomplishes
# little of interest. However, some of the later patches change configure.in.
# Without this patch, autoconf appears to run successfully, but generates a
# configure script that contains invalid shell script syntax.
-Patch9: gcl-2.6.8-infrastructure.patch
+Patch8: gcl-2.6.8-infrastructure.patch
# This patch was last sent upstream on 29 Dec 2008. It simplifies the handling
# of alloca() detection in the configure script.
-Patch10: gcl-2.6.8-alloca.patch
+Patch9: gcl-2.6.8-alloca.patch
# This patch was last sent upstream on 29 Dec 2008. It rationalizes the
# handling of system extensions. For example, on glibc-based systems, some
# functionality is available only when _GNU_SOURCE is defined.
-Patch11: gcl-2.6.8-extension.patch
+Patch10: gcl-2.6.8-extension.patch
# This patch was last sent upstream on 29 Dec 2008. It fixes a compilation
# error on newer GCC systems due to an include inside a function. This affects
# the "unrandomize" sbrk() functionality, hence the name of the patch.
-Patch12: gcl-2.6.8-unrandomize.patch
+Patch11: gcl-2.6.8-unrandomize.patch
# This is a Fedora-specific patch. Do not delete C files produced from D files
# so they can be pulled into the debuginfo package.
-Patch13: gcl-2.6.8-debuginfo.patch
+Patch12: gcl-2.6.8-debuginfo.patch
# The need for this patch was last communicated to upstream on 21 May 2009.
# Without this patch, compilation fails due to conflicting type definitions
# between glibc and Linux kernel headers. This patch prevents the kernel
# headers from being used.
-Patch14: gcl-2.6.8-asm-signal-h.patch
+Patch13: gcl-2.6.8-asm-signal-h.patch
# This patch was last sent upstream on 13 Oct 2009. It fixes two bugs in the
# reading of PLT information.
-Patch15: gcl-2.6.8-plt.patch
+Patch14: gcl-2.6.8-plt.patch
# This patch was last sent upstream on 13 Oct 2009. It fixes several malformed
# function prototypes involving an ellipsis.
-Patch16: gcl-2.6.8-ellipsis.patch
+Patch15: gcl-2.6.8-ellipsis.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libSM-devel
BuildRequires: libXext-devel
@@ -185,10 +182,9 @@ gcl_exec_t.
%patch13 -p1
%patch14 -p1
%patch15 -p1
-%patch16 -p1
# Don't let the configure script add compiler flags we don't want
-sed -i -e 's/fomit-frame-pointer/fno-strict-aliasing/' -e 's/-O3/-O2/g' configure
+sed -i -e 's/"-fomit-frame-pointer"/"-fno-strict-aliasing"/' -e 's/-O3/-O2/g' configure
# Fix a path in the launch script
sed -i -e 's|/usr/lib/tk|%{_datadir}/tk|' debian/gcl.sh
@@ -344,6 +340,11 @@ fi
%changelog
+* Tue Mar 23 2010 Jerry James <loganjerry at gmail.com> - 2.6.8-0.7.20100201cvs
+- Update to 20100201 CVS snapshot for multiple bug fixes including, I hope,
+ bz 573534
+- Drop upstreamed sigprocmask-linux patch
+
* Mon Nov 30 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.7.20090701cvs
- Fix scripts to reflect actual installation order (bz 541050)
- Update PLT patch for GNU ld >= 2.19 (bz 542004)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources 11 Aug 2009 21:28:46 -0000 1.7
+++ sources 23 Mar 2010 17:50:57 -0000 1.8
@@ -1,2 +1,2 @@
-e795acac8df3f475d1ba82fc380deb4e gcl-2.6.8.tar.xz
+b9aa6574e8da1134ea5cbd9d1da7354a gcl-2.6.8.tar.xz
b965d4ea561a9c3e019c65be69fcfb1e gcl-2.6.8-info.tar.xz
--- gcl-2.6.8-sigprocmask-linux.patch DELETED ---
- Previous message: rpms/gcl/F-13 gcl-2.6.8-alloca.patch, 1.3, 1.4 gcl-2.6.8-asm-signal-h.patch, 1.1, 1.2 gcl-2.6.8-ellipsis.patch, 1.1, 1.2 gcl-2.6.8-extension.patch, 1.3, 1.4 gcl-2.6.8-getcwd.patch, 1.1, 1.2 gcl-2.6.8-infrastructure.patch, 1.3, 1.4 gcl-2.6.8-latex.patch, 1.1, 1.2 gcl-2.6.8-loginname.patch, 1.1, 1.2 gcl-2.6.8-plt.patch, 1.3, 1.4 gcl-2.6.8-unrandomize.patch, 1.2, 1.3 gcl.spec, 1.42, 1.43 sources, 1.7, 1.8 gcl-2.6.8-sigprocmask-linux.patch, 1.1, NONE
- Next message: File jd-2.6.5-svn3431_trunk.tgz uploaded to lookaside cache by mtasaka
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list