Final comedilib setup.py patch accepted upstream.

revision 1.3
date: 2010-12-17 08:56:26 -0500;
author: abbotti;
state: Exp;
lines: +1 -1;
commitid: 7KcV6XG9dDCVKD0v;

Adjust setup.py to link against libtool's lib/.libs/.
Patch from W. Trevor King.

diff --git a/Manifest b/Manifest
index 07dab10ad96365c9d2da347ca738a91b1d56f63e..5af2a5a17db6340170b0b3927fafc655cc837d2a 100644 (file)
--- a/Manifest
+++ b/Manifest
@@ -1,5 +1,4 @@
 AUX comedilib-9999-demo-Makefile.patch 2505 RMD160 76278a724696a5fc3f4fb9e1b297018b6ce83953 SHA1 bc3401ed2c69ac87144621eba6bbe825b16e679f SHA256 25fd857769c8c5390289db546cd8e7686372edcdbdea0ffd989b45689a8ba6b1
-AUX comedilib-9999-setup.py.patch 639 RMD160 7c3ae3605d8522795b0b138eb729dc1c0aebbc33 SHA1 708d03a0393f189cee08ad702f8345a81a80c6b0 SHA256 cb75295edbd6c39ee65ab5fbc29bac2f3e6b0002e7cdbba03836d488f2cff766
-EBUILD comedilib-9999.ebuild 3709 RMD160 7ab9420cb0bb29f4b044c85f6fbeb9457f3f1f63 SHA1 3730c66ccc4e0494fe990a15e815eb0f9ead2010 SHA256 1fbf6c7ba4b381b5cc7252c525913b53f005e33e4babe3d9a76ccf4d229a1800
+EBUILD comedilib-9999.ebuild 3666 RMD160 4c096847ec57306a51af6dc3dc0ff446608b68ca SHA1 2d038c231991b90bebbfc06d8632df1c00fa3bdf SHA256 873b8bb13820b9f6872d3de3b091da0cac9546d5f9ed26ac8b358aa5a4fb6b8b
 MISC ChangeLog 1168 RMD160 62c9992630de85e02a25d5a4cc077386211b8859 SHA1 bc9d91fff9c4f05804d564f5e55fd63ed99c3426 SHA256 6766a0d3f76055ed559975a91df6f2876289f129248fa739853da0d2606bec9f
 MISC metadata.xml 247 RMD160 6735f3a5dd2d7a2b70589d1693f35d54291b7147 SHA1 c015969fe50967340dd050a44cb9f8a30b5e34a5 SHA256 9e65060e5f9d0a50d28c7a69d9c27fed6c3037fdd3e420cc276627fde2794f72

diff --git a/comedilib-9999.ebuild b/comedilib-9999.ebuild
index 05a833655028d815f492645c94dc013c088e61c8..b1263cce2b02611f5f9bbaa33907a97d28ac4192 100644 (file)
--- a/comedilib-9999.ebuild
+++ b/comedilib-9999.ebuild
@@ -52,7 +52,6 @@ src_prepare()
                ./autogen.sh
        fi
        if use python ; then
-               epatch "${FILESDIR}/${P}"-setup.py.patch
                pushd "${S}/swig/python" || die "failed to pushd"
                distutils_src_prepare
                popd || die "failed to popd"

diff --git a/files/comedilib-9999-setup.py.patch b/files/comedilib-9999-setup.py.patch
deleted file mode 100644 (file)
index 5f5cd91..0000000
--- a/files/comedilib-9999-setup.py.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: W. Trevor King <wking@drexel.edu>
-Date: Fri Dec 17 07:34:24 EST 2010
-Subject: [PATCH] Ajust setup.py to to link against libtool's lib/.libs/
-
-diff -ru a/swig/python/setup.py b/swig/python/setup.py
---- a/swig/python/setup.py     2010-12-17 07:01:36.000000000 -0500
-+++ b/swig/python/setup.py     2010-12-17 07:30:24.000000000 -0500
-@@ -4,7 +4,7 @@
-                       define_macros = [('MAJOR_VERSION','0'),
-                                       ('MINOR_VERSION','1')],
-                       include_dirs = ['../../include'],
--                      library_dirs = ['../../lib'],
-+                      library_dirs = ['../../lib/.libs'],
-                       swig_opts = ['-I../../include', '-I..'],
-                       libraries = ['comedi'],
-                       sources = ['comedi_python.i'])