blob: 5a7f26eb4ca57cf7757e4357544796f7a692d35e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
Drop obsolete C++ ABI transistion code.
https://bugs.gentoo.org/549866
--- a/configure.ac
+++ b/configure.ac
@@ -62,27 +62,6 @@ dnl checks for programs
AC_PROG_CXX
-# Transitionary check for the C++ ABI while we are switching provided
-# binaries from gcc-3.[23] to gcc-3.4 or later. Currently gcc-3.[23]
-# is still the official compiler version to use, but experimental bi-
-# naries are released with a ".c2" suffix.
-# The CXX_ABI for gcc-3.[23] is 102, btw.
-# Note that the PACKAGE_RELEASE for the gcc-3.4 or later packages has
-# to be larger than that for the gcc-3.[23] packages (as long as both
-# are distributed) for smooth upgrade paths.
-
-if test x"$CXX" = xg++; then
- AC_MSG_CHECKING([C++ ABI version])
- CXX_ABI="`$CXX -E -dM - < /dev/null | $AWK '/GXX_ABI/ { print $3 }'`"
- AC_MSG_RESULT([$CXX_ABI])
- if test x"$CXX_ABI" = x1002; then
- PACKAGE_CXX_ABI=".c2"
- else
- PACKAGE_CXX_ABI=""
- fi
- AC_SUBST(PACKAGE_CXX_ABI)
-fi
-
AC_PROG_CC
AC_PROG_CPP
AC_PROG_INSTALL
--- a/non-free/Makefile.am
+++ b/non-free/Makefile.am
@@ -65,7 +65,7 @@ $(NON_FREE_SOLIBS):
*) echo "unsupported architecture" 1>&2; \
exit 1;; \
esac; \
- $(LN_S) $(srcdir)/libesmod-$${arch}$(PACKAGE_CXX_ABI).so $@
+ $(LN_S) $(srcdir)/libesmod-$${arch}.c2.so $@
install-exec-local: $(NON_FREE_SOLIBS)
$(mkinstalldirs) $(DESTDIR)$(libdir)
|
GitWeb
