Sat Feb 5 13:21:13 2011 UTC ()
Kill Interix libc shlibname base OS_VERSION detection, broken for SUA.

It is based on ancient bsd.prefs.mk and not works as expected for SUA,
because all SUA (5.2, 6.0 and 6.1) have libc.so.5.2 (and also old version).
Moreover shlibname base OS version was introduced to speed up to avoid invoking
`uname', but in this script, `uname' always will be invoked.


(obache)
diff -r1.1.1.1 -r1.2 pkgsrc/pkgtools/osabi/INSTALL
cvs diff -r1.1.1.1 -r1.2 pkgsrc/pkgtools/osabi/INSTALL (expand / switch to unified diff)

--- pkgsrc/pkgtools/osabi/INSTALL 2010/04/30 03:18:26 1.1.1.1
+++ pkgsrc/pkgtools/osabi/INSTALL 2011/02/05 13:21:13 1.2
@@ -1,43 +1,34 @@ @@ -1,43 +1,34 @@
1# $NetBSD: INSTALL,v 1.1.1.1 2010/04/30 03:18:26 sbd Exp $ 1# $NetBSD: INSTALL,v 1.2 2011/02/05 13:21:13 obache Exp $
2 2
3UNAME="@UNAME@" 3UNAME="@UNAME@"
4case ${STAGE} in 4case ${STAGE} in
5PRE-INSTALL) 5PRE-INSTALL)
6 OS_VERSION=`${UNAME} -r` 6 OS_VERSION=`${UNAME} -r`
7 PKG_VERSION="${PKGNAME##*-}" 7 PKG_VERSION="${PKGNAME##*-}"
8 case `${UNAME} -s` in 8 case `${UNAME} -s` in
9 AIX) 9 AIX)
10 if ${TEST} -f /usr/bin/oslevel ;then 10 if ${TEST} -f /usr/bin/oslevel ;then
11 OS_VERSION=`/usr/bin/oslevel | \ 11 OS_VERSION=`/usr/bin/oslevel | \
12 sed -e's/\([0-9]*\.[0-9]*\).*/\1/'` 12 sed -e's/\([0-9]*\.[0-9]*\).*/\1/'`
13 else 13 else
14 OS_VERSION="`${UNAME} -v`.`${UNAME} -r`" 14 OS_VERSION="`${UNAME} -v`.`${UNAME} -r`"
15 OS_VERSION=`echo "${OS_VERSION}" | \ 15 OS_VERSION=`echo "${OS_VERSION}" | \
16 sed -e's/\([0-9]*\.[0-9]*\).*/\1/'` 16 sed -e's/\([0-9]*\.[0-9]*\).*/\1/'`
17 fi 17 fi
18 ;; 18 ;;
19 DragonFly|FreeBSD|Linux) 19 DragonFly|FreeBSD|Linux)
20 OS_VERSION=`echo "${OS_VERSION}" | sed -e's/-.*$//'` 20 OS_VERSION=`echo "${OS_VERSION}" | sed -e's/-.*$//'`
21 ;; 21 ;;
22 Interix) 
23 if ${TEST} -f /usr/lib/libc.so.3.5 ;then 
24 OS_VERSION="3.5" 
25 elif ${TEST} -f /usr/lib/libc.so.3.1 ;then 
26 OS_VERSION="3.1" 
27 else 
28 OS_VERSION="3.0" 
29 fi 
30 ;; 
31 OSF1) 22 OSF1)
32 OS_VERSION=`echo "${OS_VERSION}" | sed -e's/^V//'` 23 OS_VERSION=`echo "${OS_VERSION}" | sed -e's/^V//'`
33 ;; 24 ;;
34 HPUX) 25 HPUX)
35 OS_VERSION=`echo "${OS_VERSION}" | sed -e's/^B.//'` 26 OS_VERSION=`echo "${OS_VERSION}" | sed -e's/^B.//'`
36 ;; 27 ;;
37 esac 28 esac
38 29
39 if ${TEST} "${OS_VERSION}" != "${PKG_VERSION}" ;then  30 if ${TEST} "${OS_VERSION}" != "${PKG_VERSION}" ;then
40 echo "The Operating System version (${OS_VERSION}) does not match ${PKG_VERSION}" 31 echo "The Operating System version (${OS_VERSION}) does not match ${PKG_VERSION}"
41 exit 1 32 exit 1
42 fi 33 fi
43 ;; 34 ;;