Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 Dec 2011 18:26:51 +0000
From:      Jan Beich <jbeich@tormail.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/163341: [patch] net/py-pypcap: unbreak build on 10.0
Message-ID:  <1RbcWL-000L8z-H5@internal.tormail.net>
Resent-Message-ID: <201112161830.pBGIUBZ0012959@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         163341
>Category:       ports
>Synopsis:       [patch] net/py-pypcap: unbreak build on 10.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 16 18:30:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Jan Beich
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
>Description:
>How-To-Repeat:
http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.10.20111207031942/py27-pypcap-1.1_4.log

$ python2.7
>Fix:
--- fbsd10.diff begins here ---
Index: net/py-pypcap/files/patch-setup.py
===================================================================
RCS file: /a/.csup/ports/net/py-pypcap/files/patch-setup.py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-setup.py
--- net/py-pypcap/files/patch-setup.py	28 Jan 2010 03:58:50 -0000	1.2
+++ net/py-pypcap/files/patch-setup.py	16 Dec 2011 18:18:48 -0000
@@ -5,7 +5,7 @@
          if os.path.exists(os.path.join(cfg['include_dirs'][0], 'pcap-int.h')):
              d['HAVE_PCAP_INT_H'] = 1
 -        buf = open(os.path.join(cfg['include_dirs'][0], 'pcap.h')).read()
-+        if os.uname()[2][0] >= '8':
++        if int(os.uname()[2].split('.')[0]) >= 8:
 +            buf = open(os.path.join(cfg['include_dirs'][1], 'pcap.h')).read()
 +        else:
 +            buf = open(os.path.join(cfg['include_dirs'][0], 'pcap.h')).read()
--- fbsd10.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
 >>> import os
 >>> os.uname()[2]
 '10.0-CURRENT'
 >>> os.uname()[2][0]
 '1'
 >>> os.uname()[2].split('.')[0]
 '10'
 >>> os.uname()[2].split('.')[0] >= '8'
 False
 >>> int(os.uname()[2].split('.')[0]) >= 8
 True
 >>> '9' >= '8'
 True
 >>> 9 >= 8
 True
 >>> '10' >= '8'
 False
 >>> 10 >= 8
 True



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1RbcWL-000L8z-H5>