Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 549866
Collapse All | Expand All

(-)file_not_specified_in_diff (-24 / +3 lines)
Line  Link Here
0
-- a/configure.ac
0
++ b/configure.ac
Lines 62-88 dnl checks for programs Link Here
62
62
63
AC_PROG_CXX
63
AC_PROG_CXX
64
64
65
#  Transitionary check for the C++ ABI while we are switching provided
66
#  binaries from gcc-3.[23] to gcc-3.4 or later.  Currently gcc-3.[23]
67
#  is still the official compiler version to use, but experimental bi-
68
#  naries are released with a ".c2" suffix.
69
#  The CXX_ABI for gcc-3.[23] is 102, btw.
70
#  Note that the PACKAGE_RELEASE for the gcc-3.4 or later packages has
71
#  to be larger than that for the gcc-3.[23] packages (as long as both
72
#  are distributed) for smooth upgrade paths.
73
74
if test x"$CXX" = xg++; then
75
    AC_MSG_CHECKING([C++ ABI version])
76
    CXX_ABI="`$CXX -E -dM - < /dev/null | $AWK '/GXX_ABI/ { print $3 }'`"
77
    AC_MSG_RESULT([$CXX_ABI])
78
    if test x"$CXX_ABI" = x1002; then
79
        PACKAGE_CXX_ABI=".c2"
80
    else
81
        PACKAGE_CXX_ABI=""
82
    fi
83
    AC_SUBST(PACKAGE_CXX_ABI)
84
fi
85
86
AC_PROG_CC
65
AC_PROG_CC
87
AC_PROG_CPP
66
AC_PROG_CPP
88
AC_PROG_INSTALL
67
AC_PROG_INSTALL
89
-- a/non-free/Makefile.am
68
++ b/non-free/Makefile.am
Lines 65-71 $(NON_FREE_SOLIBS): Link Here
65
	  *)	echo "unsupported architecture" 1>&2; \
65
	  *)	echo "unsupported architecture" 1>&2; \
66
		exit 1;; \
66
		exit 1;; \
67
	esac; \
67
	esac; \
68
	$(LN_S) $(srcdir)/libesmod-$${arch}$(PACKAGE_CXX_ABI).so $@
68
	$(LN_S) $(srcdir)/libesmod-$${arch}.c2.so $@
69
69
70
install-exec-local: $(NON_FREE_SOLIBS)
70
install-exec-local: $(NON_FREE_SOLIBS)
71
	$(mkinstalldirs) $(DESTDIR)$(libdir)
71
	$(mkinstalldirs) $(DESTDIR)$(libdir)

Return to bug 549866