[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[6203] ipcop/trunk/make.sh
From:       gespinasse () users ! sourceforge ! net
Date:       2011-12-29 21:40:58
Message-ID: E1RgNic-0000NT-3m () sfp-svn-5 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 6203
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6203&view=rev
Author:   gespinasse
Date:     2011-12-29 21:40:57 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
Fix detection of libc.so.6* and libc.a on Ubuntu Natty and later

Modified Paths:
--------------
    ipcop/trunk/make.sh

Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh	2011-12-28 20:41:49 UTC (rev 6202)
+++ ipcop/trunk/make.sh	2011-12-29 21:40:57 UTC (rev 6203)
@@ -1223,17 +1223,20 @@
 		SUCCESS=$[ ${SUCCESS} - 1 ]
 	fi
 
-	check_version "GNU libc" ${REQUIRED_GLIBC} `/lib/libc.so.6* | head -n1 | sed \
"s,.*version \([0-9]*\.[0-9]*\).*$,\1,g"` +	# run first libc found, another match if \
any, is given as parameter to the first and ignored +	# 2>/dev/null hide empty path \
that may happen (at least on 32-bits host) +	check_version "GNU libc" \
${REQUIRED_GLIBC} $($(find /lib /lib64 -name libc.so.6* 2>/dev/null) | head -n1 | sed \
"s,.*version \([0-9]*\.[0-9]*\).*$,\1,g")  RESULT=${?}
 	SUCCESS=$[ ${SUCCESS} - ${RESULT} ]
 	report_result ${RESULT}
-	echo -n "Checking static /usr/lib/glibc.a"
-	if [ -f /usr/lib/libc.a -o -f /usr/lib64/libc.a ]; then
+	echo -n "Checking static libc.a found on /usr/lib"
+	# Contrary to LFS, a static libc is needed to compile a portable toolchain (with a \
static ccache) +	if ( find /usr/lib -name libc.a > /dev/null 2>&1); then
 		beautify message DONE
 	else
 		beautify message FAIL
 		SUCCESS=$[ ${SUCCESS} - 1 ]
-		echo " missing /usr/lib/glibc.a, install a glibc-static package" | tee -a \
${LOGFILE} +		echo " missing libc.a, install a glibc-static package" | tee -a \
${LOGFILE}  fi
 
 	if bash +h -c "type grep" > /dev/null 2>&1; then

This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.


------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual 
desktops for less than the cost of PCs and save 60% on VDI infrastructure 
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread]