darktemplar/apt
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Apply apt-0.5.15lorg2-alt-buildlib.patch

Browse Source 
Added in commit e97a90d:
0.5.15lorg2-alt3

- Resolved a few issues introduced after cnc6.
This commit is contained in:
Gleb Fotengauer-Malinovskiy 2014-05-16 19:46:05 +04:00
parent c55405a8c6
commit 4947a45206
2 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apt-0.5.15lorg2-alt-buildlib.patch
View File

@ -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

9
apt/buildlib/tools.m4
View File

@ -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