Fix comedilib.pc.in and use pkg-config in the demo/Makefile patch.

diff --git a/Manifest b/Manifest
index 21d8889a2852a9a8ab96b27dc82ae32d6a7f82e1..eb00fdedc47eb925dd6f9148c5249d8425e5018a 100644 (file)
--- a/Manifest
+++ b/Manifest
@@ -1,6 +1,7 @@
-AUX comedilib-9999-demo-Makefile.patch 2441 RMD160 ce1a0bbe8ef30c15719b07ea6c339a3150ef7e47 SHA1 f1ba6ed50b76f22bcc9818a90e82d0b91d7317bc SHA256 5cc777180310853252ede607a6074652f973ed79c9c9308a3f0b453dd7ac4d93
+AUX comedilib-9999-comedilib.pc.in.patch 299 RMD160 5b545b1523eba2479a2f9f9511c8c8ab5eeb7929 SHA1 53765178e9f9bc67ebd7b2a28ca99672c5e1f10f SHA256 c4c7d4951012fc346b446c39322d26362afea37df9d8eb10b78cf7aa0e709245
+AUX comedilib-9999-demo-Makefile.patch 2505 RMD160 76278a724696a5fc3f4fb9e1b297018b6ce83953 SHA1 bc3401ed2c69ac87144621eba6bbe825b16e679f SHA256 25fd857769c8c5390289db546cd8e7686372edcdbdea0ffd989b45689a8ba6b1
 AUX comedilib-9999-setup.py.patch 962 RMD160 efcd89f8528e18a68ba8ff3756f00c047fdb228e SHA1 60827fa147aba30d5b5749260e1a1d928047222a SHA256 219864acf1610e2ddd94eb14eca8983fd336511db7626dde5a6347e11822a983
 AUX comedilib-9999-setup.rb.patch 318 RMD160 c9bcd07119fb7c2c92ce9c133947f51a3bd85c51 SHA1 8e213fdc3c319b611e23a98fe0844db55ef28aed SHA256 afb1fa061a2b703a66e09c408b21a337592d519ead51984f78f7b64dbc74c5a9
-EBUILD comedilib-9999.ebuild 3796 RMD160 329df58e88d9f5378854095288cb32249fc658e1 SHA1 f36a9594a923e3989951ca94d7d4d1ad601c7e6b SHA256 c8beafc406a0f1c54e9b81ec5b03eac430495e2bdad01d2a21df34307c1559f5
+EBUILD comedilib-9999.ebuild 3845 RMD160 23dfbd40caf8bc2f8892f17b4b439a605ccefd93 SHA1 9c0d2805593f92cfb67a9587b7d95c2acbd98f96 SHA256 78469158659a273e46a643210206f3f5a58f12ba94e6b19ffcc31e7fc511cc93
 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 2f5ce8fc96c85db5addff9a955e92c9a9d3fef1e..2abe6ab71e366acdb6bfbf70670c9f2e4b17ed6d 100644 (file)
--- a/comedilib-9999.ebuild
+++ b/comedilib-9999.ebuild
@@ -51,6 +51,7 @@ src_prepare()
        if [ "${PV}" == "9999" ] ; then
                ./autogen.sh
        fi
+       epatch "${FILESDIR}/${P}"-comedilib.pc.in.patch
        if use python ; then
                epatch "${FILESDIR}/${P}"-setup.py.patch
                pushd "${S}/swig/python" || die "failed to pushd"

diff --git a/files/comedilib-9999-comedilib.pc.in.patch b/files/comedilib-9999-comedilib.pc.in.patch
new file mode 100644 (file)
index 0000000..4151fef
--- /dev/null
+++ b/files/comedilib-9999-comedilib.pc.in.patch
@@ -0,0 +1,11 @@
+diff --git a/comedilib.pc.in b/comedilib.pc.in
+index 5aa1f86..498d51c 100644
+--- a/comedilib.pc.in
++++ b/comedilib.pc.in
+@@ -7,5 +7,5 @@ Name: Comedilib
+ Description: Comedi Library
+ Requires: 
+ Version: @VERSION@
+-Libs: -L${libdir} -lcomedi
++Libs: -L${libdir} -lcomedi -lm
+ Cflags: -I${includedir}

diff --git a/files/comedilib-9999-demo-Makefile.patch b/files/comedilib-9999-demo-Makefile.patch
index 8d57503f53de7144a254a1b2948e5e18978efc1c..2e716d1ee2c1718fd136244f887d90d4388ce00d 100644 (file)
--- a/files/comedilib-9999-demo-Makefile.patch
+++ b/files/comedilib-9999-demo-Makefile.patch
@@ -14,10 +14,10 @@
  CFLAGS = -O2 -march=pentium4 -pipe
  COMEDILIB_AGE = 10
 -COMEDILIB_CFLAGS =  -I$(top_srcdir)/include -Wall
-+COMEDILIB_CFLAGS = -Wall
++COMEDILIB_CFLAGS = -Wall $(shell pkg-config --cflags comedilib)
  COMEDILIB_CURRENT = 10
 -COMEDILIB_LIBS =  $(top_builddir)/lib/libcomedi.la -lm
-+COMEDILIB_LIBS =  -lcomedi -lm
++COMEDILIB_LIBS =   $(shell pkg-config --libs comedilib)
  COMEDILIB_LIBVERSION = 10:0:10
  COMEDILIB_LT_LDFLAGS =  -version-info 10:0:10
  COMEDILIB_REVISION = 0