pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Interix>=5.2 have libc.so.5.2, but no higer revisio...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f676a655b031
branches:  trunk
changeset: 568430:f676a655b031
user:      obache <obache%pkgsrc.org@localhost>
date:      Sun Dec 13 08:19:45 2009 +0000

description:
Interix>=5.2 have libc.so.5.2, but no higer revision exists.
So gave up to detect OS_VERSION with shlib version if libc.so.5.2 exists.

diffstat:

 mk/bsd.prefs.mk |  14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diffs (32 lines):

diff -r 8c55a13d7e68 -r f676a655b031 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Sun Dec 13 08:13:07 2009 +0000
+++ b/mk/bsd.prefs.mk   Sun Dec 13 08:19:45 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.300 2009/09/24 17:24:13 tron Exp $
+# $NetBSD: bsd.prefs.mk,v 1.301 2009/12/13 08:19:45 obache Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -176,14 +176,18 @@
 
 .elif ${OPSYS} == "Interix"
 LOWER_OPSYS?=          interix
+LOWER_VENDOR?=         pc
+.  if exists(/usr/lib/libc.so.5.2) || exists(/usr/lib/x86/libc.so.5.2)
+LOWER_OPSYS_VERSUFFIX= ${LOWER_OS_VERSION:C/([0-9]*).*/\1/}
+.  else
 LOWER_OPSYS_VERSUFFIX?=        3
-LOWER_VENDOR?=         pc
-.  if exists(/usr/lib/libc.so.3.5)
+.    if exists(/usr/lib/libc.so.3.5)
 OS_VERSION=            3.5
-.  elif exists(/usr/lib/libc.so.3.1)
+.    elif exists(/usr/lib/libc.so.3.1)
 OS_VERSION=            3.1
-.  else
+.    else
 OS_VERSION=            3.0
+.    endif
 .  endif
 
 .elif !empty(OPSYS:MIRIX*)



Home | Main Index | Thread Index | Old Index