Revision: 26701
http://sourceforge.net/p/gar/code/26701
Author: dmichelsen
Date: 2020-09-09 10:03:28 +0000 (Wed, 09 Sep 2020)
Log Message:
-----------
file/trunk: Adjust package loading
Modified Paths:
--------------
csw/mgar/pkg/file/trunk/Makefile
csw/mgar/pkg/file/trunk/files/0002-Do-not-use-find_library-at-runtime.patch
Modified: csw/mgar/pkg/file/trunk/Makefile
===================================================================
--- csw/mgar/pkg/file/trunk/Makefile 2020-09-09 08:20:43 UTC (rev 26700)
+++ csw/mgar/pkg/file/trunk/Makefile 2020-09-09 10:03:28 UTC (rev 26701)
@@ -16,7 +16,7 @@
DISTFILES += $(DISTNAME).tar.gz
PATCHFILES += 0001-Use-PCRE.patch
-# PATCHFILES += 0002-Do-not-use-find_library-at-runtime.patch
+PATCHFILES += 0002-Do-not-use-find_library-at-runtime.patch
VENDOR_URL = http://www.darwinsys.com/file/
Modified:
csw/mgar/pkg/file/trunk/files/0002-Do-not-use-find_library-at-runtime.patch
===================================================================
--- csw/mgar/pkg/file/trunk/files/0002-Do-not-use-find_library-at-runtime.patch
2020-09-09 08:20:43 UTC (rev 26700)
+++ csw/mgar/pkg/file/trunk/files/0002-Do-not-use-find_library-at-runtime.patch
2020-09-09 10:03:28 UTC (rev 26701)
@@ -1,26 +1,27 @@
-From 4d7a3366cfa5a60d39b14677dca940b5720a9130 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <mac...@opencsw.org>
-Date: Wed, 9 Mar 2011 10:27:30 +0100
-Subject: [PATCH] Do not use find_library at runtime
+From ca7e2133f9161a031c437be0e939524cb9ee94db Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <d...@opencsw.org>
+Date: Wed, 9 Sep 2020 11:45:20 +0200
+Subject: [PATCH 2/2] Do not use find_library at runtime
---
- python/magic.py | 6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
+ python/magic.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/python/magic.py b/python/magic.py
-index 35a7182..7807ce2 100644
+index 4c1ff7a..0d824ba 100644
--- a/python/magic.py
+++ b/python/magic.py
-@@ -6,14 +6,16 @@ Python bindings for libmagic
- import ctypes
+@@ -9,7 +9,6 @@ import ctypes
+ from collections import namedtuple
from ctypes import *
-from ctypes.util import find_library
+
def _init():
- """
+@@ -17,7 +16,10 @@ def _init():
Loads the shared library through ctypes and returns a library
- L{ctypes.CDLL} instance
+ L{ctypes.CDLL} instance
"""
- return ctypes.cdll.LoadLibrary(find_library('magic'))
+ # the find_library function depends on a compiler being installed at
@@ -31,5 +32,5 @@
_libraries = {}
_libraries['magic'] = _init()
--
-1.7.3.2
+2.4.0
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
