rpms/libsigc++20/devel libsigc++20-2.0.18-gcc43.patch, NONE, 1.1 libsigc++.spec, 1.13, 1.14
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Thu Jan 3 18:17:04 UTC 2008
Author: spot
Update of /cvs/pkgs/rpms/libsigc++20/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7851
Modified Files:
libsigc++.spec
Added Files:
libsigc++20-2.0.18-gcc43.patch
Log Message:
Resolve gcc43 failures.
libsigc++20-2.0.18-gcc43.patch:
--- NEW FILE libsigc++20-2.0.18-gcc43.patch ---
diff -up libsigc++-2.0.18/sigc++/signal.h.BAD libsigc++-2.0.18/sigc++/signal.h
--- libsigc++-2.0.18/sigc++/signal.h.BAD 2008-01-03 11:52:41.000000000 -0500
+++ libsigc++-2.0.18/sigc++/signal.h 2008-01-03 11:53:04.000000000 -0500
@@ -11,16 +11,6 @@
#include <sigc++/functors/slot.h>
#include <sigc++/functors/mem_fun.h>
-//SIGC_TYPEDEF_REDEFINE_ALLOWED:
-// TODO: This should have its own test, but I can not create one that gives the error instead of just a warning. murrayc.
-// I have just used this because there is a correlation between these two problems.
-#ifdef SIGC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD
- //Compilers, such as older versions of SUN Forte C++, that do not allow this also often
- //do not allow a typedef to have the same name as a class in the typedef's definition.
- //For Sun Forte CC 5.7 (SUN Workshop 10), comment this out to fix the build.
- #define SIGC_TYPEDEF_REDEFINE_ALLOWED 1
-#endif
-
namespace sigc {
/** STL-style iterator for slot_list.
diff -up libsigc++-2.0.18/configure.ac.BAD libsigc++-2.0.18/configure.ac
--- libsigc++-2.0.18/configure.ac.BAD 2008-01-03 11:22:37.000000000 -0500
+++ libsigc++-2.0.18/configure.ac 2008-01-03 11:38:06.000000000 -0500
@@ -99,6 +99,7 @@ dnl Using C++ compiler
AC_PROG_CXX
AC_LANG_CPLUSPLUS
+SIGC_CXX_TYPEDEF_REDEFINE_ALLOWED()
SIGC_CXX_GCC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD()
SIGC_CXX_MSVC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD()
SIGC_CXX_SELF_REFERENCE_IN_MEMBER_INITIALIZATION()
diff -up libsigc++-2.0.18/scripts/cxx.m4.BAD libsigc++-2.0.18/scripts/cxx.m4
--- libsigc++-2.0.18/scripts/cxx.m4.BAD 2008-01-03 11:03:10.000000000 -0500
+++ libsigc++-2.0.18/scripts/cxx.m4 2008-01-03 11:50:43.000000000 -0500
@@ -120,3 +120,30 @@ AC_TRY_COMPILE(
AC_MSG_RESULT([$sigcm_cxx_self_reference_in_member_initialization])
])
])
+
+AC_DEFUN([SIGC_CXX_TYPEDEF_REDEFINE_ALLOWED],[
+AC_MSG_CHECKING([if C++ compiler supports typedef redefines.])
+AC_TRY_COMPILE(
+[
+ namespace ns {
+
+ template <typename T>
+ struct foo {};
+
+ struct bar
+ {
+ typedef foo<double> foo;
+ };
+
+ };
+],
+[],
+[
+ sigcm_cxx_typedef_redefine_allowed=yes
+ AC_DEFINE([SIGC_TYPEDEF_REDEFINE_ALLOWED],[1],[does the c++ compiler support typedef redefines.])
+ AC_MSG_RESULT([$sigcm_cxx_typedef_redefine_allowed])
+],[
+ sigcm_cxx_typedef_redefine_allowed=no
+ AC_MSG_RESULT([$sigcm_cxx_typedef_redefine_allowed])
+])
+])
diff -up libsigc++-2.0.18/configure.BAD libsigc++-2.0.18/configure
--- libsigc++-2.0.18/configure.BAD 2007-09-10 11:26:27.000000000 -0400
+++ libsigc++-2.0.18/configure 2008-01-03 11:51:00.000000000 -0500
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for libsigc++ 2.0.18.
+# Generated by GNU Autoconf 2.61 for libsigc++ 2.0.18.
#
# Report bugs to <libsigc-list at gnome.org>.
#
@@ -12,7 +12,8 @@
## M4sh Initialization. ##
## --------------------- ##
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -21,10 +22,13 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
+
# PATH needs CR
@@ -217,7 +221,7 @@ test \$exitcode = 0) || { (exit 1); exit
else
as_candidate_shells=
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -235,7 +239,6 @@ IFS=$as_save_IFS
# Try only shells that exist, to save several forks.
if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
{ ("$as_shell") 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -244,10 +247,12 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
:
_ASEOF
@@ -255,7 +260,6 @@ _ASEOF
CONFIG_SHELL=$as_shell
as_have_required=yes
if { "$as_shell" 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -264,10 +268,12 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
:
(as_func_return () {
@@ -514,19 +520,28 @@ else
as_mkdir_p=false
fi
-# Find out whether ``test -x'' works. Don't use a zero-byte file, as
-# systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
- as_executable_p="test -x"
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
else
- as_executable_p=:
+ if ls -dL / >/dev/null 2>&1; then
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+ test -d "$1/.";
+ else
+ case $1 in
+ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
# Sed expression to map a string onto a valid CPP name.
[...4691 lines suppressed...]
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
sigcm_cxx_self_reference_in_member_initialization=yes
@@ -21261,27 +20757,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
sigc_cv_cxx_has_namespace_std="yes"
else
echo "$as_me: failed program was:" >&5
@@ -21351,27 +20830,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
sigc_cv_cxx_has_sun_reverse_iterator="yes"
else
echo "$as_me: failed program was:" >&5
@@ -21575,7 +21037,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF
## M4sh Initialization. ##
## --------------------- ##
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -21584,10 +21047,13 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
+
# PATH needs CR
@@ -21811,19 +21277,28 @@ else
as_mkdir_p=false
fi
-# Find out whether ``test -x'' works. Don't use a zero-byte file, as
-# systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
- as_executable_p="test -x"
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
else
- as_executable_p=:
+ if ls -dL / >/dev/null 2>&1; then
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+ test -d "$1/.";
+ else
+ case $1 in
+ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -21839,7 +21314,7 @@ exec 6>&1
# values after options handling.
ac_log="
This file was extended by libsigc++ $as_me 2.0.18, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -21868,7 +21343,7 @@ current configuration.
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
- -V, --version print version number, then exit
+ -V, --version print version number and configuration settings, then exit
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
@@ -21892,7 +21367,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
libsigc++ config.status 2.0.18
-configured by $0, generated by GNU Autoconf 2.60,
+configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2006 Free Software Foundation, Inc.
@@ -22179,7 +21654,7 @@ am__fastdepCC_FALSE!$am__fastdepCC_FALSE
CPP!$CPP$ac_delim
PLATFORM_WIN32_TRUE!$PLATFORM_WIN32_TRUE$ac_delim
PLATFORM_WIN32_FALSE!$PLATFORM_WIN32_FALSE$ac_delim
-GREP!$GREP$ac_delim
+SED!$SED$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -22221,6 +21696,7 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+GREP!$GREP$ac_delim
EGREP!$EGREP$ac_delim
LN_S!$LN_S$ac_delim
ECHO!$ECHO$ac_delim
@@ -22244,7 +21720,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 21; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 22; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Index: libsigc++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsigc++20/devel/libsigc++.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libsigc++.spec 14 Sep 2007 12:17:36 -0000 1.13
+++ libsigc++.spec 3 Jan 2008 18:16:17 -0000 1.14
@@ -1,6 +1,6 @@
Name: libsigc++20
Version: 2.0.18
-Release: 1
+Release: 2%{?dist}
Summary: Typesafe signal framework for C++
@@ -8,6 +8,7 @@
License: LGPLv2+
URL: http://libsigc.sourceforge.net/
Source0: http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.0/libsigc++-%version.tar.bz2
+Patch0: libsigc++20-2.0.18-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): /sbin/ldconfig
@@ -39,6 +40,7 @@
%prep
%setup -q -n libsigc++-%{version}
+%patch0 -p1
%build
@@ -81,6 +83,9 @@
%{_libdir}/*.so
%changelog
+* Thu Jan 3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.18-2
+- add test case for gcc4.3 failure conditional
+
* Fri Sep 14 2007 Denis Leroy <denis at poolshark.org> - 2.0.18-1
- Update to 2.0.18
More information about the fedora-extras-commits
mailing list