Attachment 206378 Details for Bug 239725 – Unbreak for amd64

[patch] Unbreak for amd64

py-pypcap-1.2.3.patch (text/plain), 1.98 KB, created by Muhammad Moinur Rahman on 2019-08-08 20:42:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Muhammad Moinur Rahman

Created: 2019-08-08 20:42:08 UTC

Size: 1.98 KB

patch

obsolete

>Index: files/patch-setup.py
>===================================================================
>--- files/patch-setup.py	(nonexistent)
>+++ files/patch-setup.py	(working copy)
>@@ -0,0 +1,52 @@
>+--- setup.py.orig	2019-08-08 14:33:11 UTC
>++++ setup.py
>+@@ -29,11 +29,6 @@ def recursive_search(path, target_files):
>+ def find_prefix_and_pcap_h():
>+     prefixes = chain.from_iterable((
>+         ('/usr', sys.prefix),
>+-        glob.glob('/opt/libpcap*'),
>+-        glob.glob('../libpcap*'),
>+-        glob.glob('../wpdpack*'),
>+-        glob.glob('/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/*'),
>+-        glob.glob('/Library/Developer/CommandLineTools/SDKs/*'),
>+     ))
>+ 
>+     # Find 'pcap.h'
>+@@ -54,32 +49,17 @@ def find_prefix_and_pcap_h():
>+ 
>+ 
>+ def find_lib_path_and_file(prefix):
>+-    if sys.maxsize > 2 ** 32:
>+-        candidates = [
>+-            'lib64',
>+-            'lib/x64',  # wpdpack
>+-            'lib/x86_64-linux-gnu'
>+-            'lib',
>+-            'lib/i386-linux-gnu',
>+-            ''
>+-        ]
>+-    else:
>+-        candidates = [
>+-            'lib',
>+-            'lib/i386-linux-gnu',
>+-            ''
>+-        ]
>++    candidates = [
>++        'lib',
>++        ''
>++    ]
>+     lib_sub_dirs = [
>+         os.path.join(prefix, d) for d in candidates
>+     ]
>+-    # For Mac OSX the default system pcap lib is in /usr/lib
>+-    lib_sub_dirs.append('/usr/lib')
>+ 
>+     lib_files = [
>+         'libpcap.a',
>+-        'libpcap.so',
>+-        'libpcap.dylib',
>+-        'wpcap.lib'
>++        'libpcap.so'
>+     ]
>+     lib_file_path = recursive_search_dirs(lib_sub_dirs, lib_files)
>+     if not lib_file_path:
>
>Property changes on: files/patch-setup.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 239725: 206378 | 207470