From 4947a452067b9d8c442c51caef7161315ec64ad4 Mon Sep 17 00:00:00 2001
From: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org>
Date: Fri, 16 May 2014 19:46:05 +0400
Subject: [PATCH] Apply apt-0.5.15lorg2-alt-buildlib.patch

Added in commit e97a90d:
0.5.15lorg2-alt3

- Resolved a few issues introduced after cnc6.
---
 apt-0.5.15lorg2-alt-buildlib.patch | 22 ----------------------
 apt/buildlib/tools.m4              |  9 +++------
 2 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 apt-0.5.15lorg2-alt-buildlib.patch

diff --git a/apt-0.5.15lorg2-alt-buildlib.patch b/apt-0.5.15lorg2-alt-buildlib.patch
deleted file mode 100644
index d537981..0000000
--- a/apt-0.5.15lorg2-alt-buildlib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- apt-0.5.15lorg2/buildlib/tools.m4.orig	2006-01-16 23:18:56 +0000
-+++ apt-0.5.15lorg2/buildlib/tools.m4	2006-04-01 21:44:55 +0000
-@@ -115,16 +115,13 @@ AC_DEFUN([rc_LIBSTDCPP_VER],
- 	[AC_MSG_CHECKING([libstdc++ version])
- 	dummy=if$$
- 	cat <<_LIBSTDCPP_>$dummy.cc
--#include <features.h>
--#include <stdio.h>
--#include <stdlib.h>
--int main(int argc, char **argv) { exit(0); }
-+#include <iostream>
-+int main(void) { std::cout << std::endl; return 0; }
- _LIBSTDCPP_
- 	${CXX-c++} $dummy.cc -o $dummy > /dev/null 2>&1
- 
- 	if test "$?" = 0; then
--		soname=`objdump -p ./$dummy |grep NEEDED|grep libstd`
--                LIBSTDCPP_VER=`echo $soname | sed -e 's/.*NEEDED.*libstdc++\(-libc.*\(-.*\)\)\?.so.\(.*\)/\3\2/'`
-+                LIBSTDCPP_VER=`objdump -p ./$dummy | sed -ne 's/.*NEEDED.*libstdc++\(-libc.*\(-.*\)\)\?.so.\(.*\)/\3\2/p'`
- 	fi
- 	rm -f $dummy $dummy.cc
- 
diff --git a/apt/buildlib/tools.m4 b/apt/buildlib/tools.m4
index ebee7c4..2b2e41a 100644
--- a/apt/buildlib/tools.m4
+++ b/apt/buildlib/tools.m4
@@ -119,16 +119,13 @@ AC_DEFUN([rc_LIBSTDCPP_VER],
 	[AC_MSG_CHECKING([libstdc++ version])
 	dummy=if$$
 	cat <<_LIBSTDCPP_>$dummy.cc
-#include <features.h>
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) { exit(0); }
+#include <iostream>
+int main(void) { std::cout << std::endl; return 0; }
 _LIBSTDCPP_
 	${CXX-c++} $dummy.cc -o $dummy > /dev/null 2>&1
 
 	if test "$?" = 0; then
-		soname=`objdump -p ./$dummy |grep NEEDED|grep libstd`
-                LIBSTDCPP_VER=`echo $soname | sed -e 's/.*NEEDED.*libstdc++\(-libc.*\(-.*\)\)\?.so.\(.*\)/\3\2/'`
+                LIBSTDCPP_VER=`objdump -p ./$dummy | sed -ne 's/.*NEEDED.*libstdc++\(-libc.*\(-.*\)\)\?.so.\(.*\)/\3\2/p'`
 	fi
 	rm -f $dummy $dummy.cc