Added pkg-config support #37

fabianfreyer · 2014-09-25T23:42:49Z

This patch adds pkg-config support. This has been tested on OS X and FreeBSD using the expat parser. No tests with the libxml parser have been made.

These are currently pull requests: strophe#30 strophe#37 Once these are merged, and a new release is made, this commit can be reverted.

fabianfreyer · 2014-09-26T03:06:20Z

configure.ac

@@ -60,9 +60,17 @@ fi

 AC_CHECK_HEADERS([arpa/nameser_compat.h])

+


This was taken from
http://git.infradead.org/users/dwmw2/openconnect.git/commitdiff/372bd3daf

pasis · 2014-09-30T11:43:16Z

configure.ac

+m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR],
+        [AC_ARG_WITH([pkgconfigdir],
+                [AS_HELP_STRING([--with-pkgconfigdir],
+                        [install directory for openconnect.pc pkg-config file])],


s/openconnect.pc/libstrophe.pc/

fabianfreyer · 2014-10-07T16:35:08Z

@pasis, I have made the changes you suggested. At the opportunity, I refactored some of the if/else cruft in configure.ac to use the implicit cases in PKG_CHECK_MODULES. I'm not sure if the behavior has stayed the same, I have to explicitely pass --libdir=${path_to_libxml2_include_folder} because ${libdir}/libxml2 just gets expanded to ${prefix}/include/libxml2 on my system, which is not expanded further. However, libxml/parser.h is present and usable at ${libdir}/libxml2/libxml/parser.h == ${prefix}/include/libxml2/libxml/parser.h. The expat check however works both when expat.pc is present and missing.

fabianfreyer · 2014-10-07T16:58:17Z

configure.ac

@@ -63,9 +86,21 @@ fi



I'm not sure if I should also add resolv to Requires:.

pasis · 2014-10-07T21:57:02Z

@fabianfreyer, I'll take a look. Meanwhile, some changes required due to my mistake. Linking with libstrophe.so doesn't require any dependency. Dynamic library already has it:

$ ldd libstrophe.so
...
    libssl.so.1.0.0 => /usr/lib64/libssl.so.1.0.0 (0x00007f6e64d56000)
    libcrypto.so.1.0.0 => /usr/lib64/libcrypto.so.1.0.0 (0x00007f6e64986000)
    libexpat.so.1 => /usr/lib64/libexpat.so.1 (0x00007f6e6475c000)
    libresolv.so.2 => /lib64/libresolv.so.2 (0x00007f6e64545000)
    libz.so.1 => /lib64/libz.so.1 (0x00007f6e63d87000)
$ gcc -o examples/basic -lstrophe examples/basic.o
$ ldd examples/basic
...
    libstrophe.so.0 => /usr/lib64/libstrophe.so.0 (0x00007f01dd708000)
    libssl.so.1.0.0 => /usr/lib64/libssl.so.1.0.0 (0x00007f01dd0fb000)
    libcrypto.so.1.0.0 => /usr/lib64/libcrypto.so.1.0.0 (0x00007f01dcd2c000)
    libexpat.so.1 => /usr/lib64/libexpat.so.1 (0x00007f01dcb02000)
    libresolv.so.2 => /lib64/libresolv.so.2 (0x00007f01dc8eb000)
    libz.so.1 => /lib64/libz.so.1 (0x00007f01dc4d1000)

But static library is just an archive with object files and it requires all the depenndecies. So, we need to use fields Requires.private and Libs.private (see libxml-2.0.pc as an example):

Requires:
Requires.private: openssl expat
Libs: -L${libdir} -lstrophe
Libs.private: -lresolv

This should work in the following way:

$ pkg-config --libs libstrophe
-L/usr/local/lib -lstrophe
$ pkg-config --static --libs libstrophe
-L/usr/local/lib -lstrophe -lssl -lcrypto -lz -lexpat -lresolv

I'm not sure if I should also add resolv to Requires:.

Yes, but to Libs.private.

fabianfreyer · 2014-10-07T22:22:16Z

This means, technically, this would suffice?

diff --git a/libstrophe.pc.in b/libstrophe.pc.in
index bee8b7b..ba271c2 100644
--- a/libstrophe.pc.in
+++ b/libstrophe.pc.in
@@ -7,6 +7,8 @@ Name: libstrophe
 Description: A simple, lightweight C library for writing XMPP clients
 URL: http://strophe.im/libstrophe/
 Version: @VERSION@
-Requires: @PC_REQUIRES@
-Libs: -L${libdir} -lstrophe @PC_LIBS@
+Requires:
+Requires.private: @PC_REQUIRES@
+Libs: -L${libdir} -lstrophe
+Libs.private: -L${libdir} -lstrophe @PC_LIBS@
 Cflags: -I${includedir} @PC_CFLAGS@

pasis · 2014-10-07T22:34:40Z

Yes, but Libs.private shouldn't include Libs:

Libs.private: @PC_LIBS@

fabianfreyer · 2014-10-07T23:12:53Z

@pasis: done. Are there any changes to be made to Makefile.am?

fabianfreyer · 2014-10-07T23:14:08Z

Otherwise, I'd rebase this into a single squash commit.

These are currently pull requests: strophe#30 strophe#37 Once these are merged, and a new release is made, this commit can be reverted.

fabianfreyer · 2014-10-08T14:36:20Z

I have rebased this into two commits.

pasis · 2014-10-08T20:16:49Z

configure.ac

@@ -54,8 +77,8 @@ AC_MSG_NOTICE([libstrophe will use the $with_parser XML parser])
 AC_SEARCH_LIBS([socket], [socket])

 if test "x$PLATFORM" != xfreebsd; then
-        AC_CHECK_LIB([resolv], [res_query], [],
-            [AC_CHECK_LIB([resolv], [__res_query], [],
+        AC_CHECK_LIB([resolv], [res_query], [LIBS="-lresolv $LIBS"; PC_LIBS+=(-lresolv)],


Move PC_LIBS out of AC_CHECK_LIB() just to avoid duplication:

if test "x$PLATFORM" != xfreebsd; then AC_CHECK_LIB() PC_LIBS+=(-lresolv) else

Isn't -lresolv added to LIBS twice in your patch? AC_CHECK_LIB() should add it implicitly.

pasis · 2014-10-08T20:18:13Z

I left 1 comment. It looks good, but I still need to check it.

fabianfreyer · 2014-10-12T16:06:45Z

I think -lresolv should be added to Libs, not Libs.private:

$ ldd $/tmp/strophe/lib/libstrophe.so
    linux-vdso.so.1 =>  (0x00007fffddde4000)
    libssl.so.1.0.0 => /usr/lib/x86_64-linux-gnu/libssl.so.1.0.0 (0x00007f5c3921b000)
    libcrypto.so.1.0.0 => /usr/lib/x86_64-linux-gnu/libcrypto.so.1.0.0 (0x00007f5c38e23000)
    libexpat.so.1 => /lib/x86_64-linux-gnu/libexpat.so.1 (0x00007f5c38bf8000)
    libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x00007f5c3886d000)
    libdl.so.2 => /lib/x86_64-linux-gnu/libdl.so.2 (0x00007f5c38669000)
    libz.so.1 => /lib/x86_64-linux-gnu/libz.so.1 (0x00007f5c38451000)
    /lib64/ld-linux-x86-64.so.2 (0x00007f5c3969b000)
$echo "int main() {return 0;}" | gcc -xc $(env PKG_CONFIG_PATH=/tmp/strophe/lib/pkgconfig pkg-config --cflags --libs libstrophe) -
/tmp/strophe/lib/libstrophe.so: undefined reference to `__res_query'
collect2: error: ld returned 1 exit status

This is with the following .pc file:

prefix=/tmp/strophe
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include

Name: libstrophe
Description: A simple, lightweight C library for writing XMPP clients
URL: http://strophe.im/libstrophe/
Version: 0.8.7
Requires:
Requires.private:
Libs: -L${libdir} -lstrophe
Libs.private: -lssl -lcrypto -lexpat -lresolv
Cflags: -I${includedir}

pasis · 2014-10-14T12:07:55Z

@fabianfreyer, could you show files Makefile.am, configure.ac that lead to your problem with libresolv? And please, provide some info:

system (is it linux 64-bit?)
ls /lib/libresolv*
string, how libstrophe.so is linked, e.g.:

libtool: link:  gcc -shared  -fPIC -DPIC  src/.libs/libstrophe_la-auth.o src/.libs/libstrophe_la-conn.o src/.libs/libstrophe_la-ctx.o src/.libs/libstrophe_la-event.o src/.libs/libstrophe_la-handler.o src/.libs/libstrophe_la-hash.o src/.libs/libstrophe_la-jid.o src/.libs/libstrophe_la-md5.o src/.libs/libstrophe_la-sasl.o src/.libs/libstrophe_la-scram.o src/.libs/libstrophe_la-sha1.o src/.libs/libstrophe_la-snprintf.o src/.libs/libstrophe_la-sock.o src/.libs/libstrophe_la-stanza.o src/.libs/libstrophe_la-thread.o src/.libs/libstrophe_la-tls_openssl.o src/.libs/libstrophe_la-util.o src/.libs/libstrophe_la-parser_expat.o   -lssl -lcrypto -lexpat -lresolv  -O2   -Wl,-soname -Wl,libstrophe.so.0 -Wl,-version-script -Wl,.libs/libstrophe.ver -o .libs/libstrophe.so.0.0.0

I can't reproduce this problem on my system with the latest version of your patch. And libstrophe.so is linked with libresolv properly:

$ ldd .libs/libstrophe.so
...
libresolv.so.2 => /lib64/libresolv.so.2 (0x00007fbe09b8b000)

fabianfreyer · 2014-10-14T13:35:58Z

@pasis this is weird, I can't seem to be able to reproduce this either, on the same systems I was observing this earlier.

pasis · 2014-10-21T07:25:31Z

Merged. I've made a minor change, see 057f906.

fabianfreyer mentioned this pull request Sep 25, 2014

FreeBSD port profanity-im/profanity#428

Closed

fabianfreyer added a commit to fabianfreyer/libstrophe that referenced this pull request Sep 26, 2014

Added patches to compile on freebsd

00ce230

These are currently pull requests: strophe#30 strophe#37 Once these are merged, and a new release is made, this commit can be reverted.

fabianfreyer mentioned this pull request Sep 26, 2014

FreeBSD Port #38

Closed

fabianfreyer reviewed Sep 26, 2014
View reviewed changes

fabianfreyer mentioned this pull request Sep 26, 2014

autotools: FreeBSD support profanity-im/profanity#429

Merged

pasis reviewed Sep 30, 2014
View reviewed changes

fabianfreyer force-pushed the feature/pkg-config branch from 09d95a6 to 3bef663 Compare October 7, 2014 16:33

fabianfreyer force-pushed the feature/pkg-config branch from 3bef663 to 478d03e Compare October 7, 2014 16:42

fabianfreyer reviewed Oct 7, 2014
View reviewed changes

configure.ac

@@ -63,9 +86,21 @@ fi

Copy link

Contributor Author

fabianfreyer Oct 7, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if I should also add resolv to Requires:.

fabianfreyer added a commit to fabianfreyer/libstrophe that referenced this pull request Oct 7, 2014

Added patches to compile on freebsd

2f3f1b6

These are currently pull requests: strophe#30 strophe#37 Once these are merged, and a new release is made, this commit can be reverted.

fabianfreyer added a commit to fabianfreyer/libstrophe that referenced this pull request Oct 7, 2014

Added patches to compile on freebsd

d1f4f2d

These are currently pull requests: strophe#30 strophe#37 Once these are merged, and a new release is made, this commit can be reverted.

fabianfreyer added a commit to fabianfreyer/libstrophe that referenced this pull request Oct 7, 2014

Added patches to compile on freebsd

b52ec90

These are currently pull requests: strophe#30 strophe#37 Once these are merged, and a new release is made, this commit can be reverted.

fabianfreyer added a commit to fabianfreyer/libstrophe that referenced this pull request Oct 7, 2014

Added patches to compile on freebsd

40c2f4b

These are currently pull requests: strophe#30 strophe#37 Once these are merged, and a new release is made, this commit can be reverted.

fabianfreyer added a commit to fabianfreyer/libstrophe that referenced this pull request Oct 7, 2014

Added patches to compile on freebsd

e338ae4

These are currently pull requests: strophe#30 strophe#37 Once these are merged, and a new release is made, this commit can be reverted.

fabianfreyer added a commit to fabianfreyer/libstrophe that referenced this pull request Oct 8, 2014

Added patches to compile on freebsd

dbe6415

These are currently pull requests: strophe#30 strophe#37 Once these are merged, and a new release is made, this commit can be reverted.

fabianfreyer force-pushed the feature/pkg-config branch 2 times, most recently from c96922d to 671ebda Compare October 8, 2014 14:33

fabianfreyer added 2 commits October 8, 2014 18:13

Refactored configure.ac, added pkg-config support

55efc60

Added --with-pkgconfigdir

3231214

fabianfreyer force-pushed the feature/pkg-config branch from 671ebda to 3231214 Compare October 8, 2014 16:13

pasis reviewed Oct 8, 2014
View reviewed changes

pasis merged commit 3231214 into strophe:master Oct 21, 2014

boothj5 added this to the 0.8.7 milestone Oct 21, 2014

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added pkg-config support #37

Added pkg-config support #37

fabianfreyer commented Sep 25, 2014

fabianfreyer Sep 26, 2014

pasis Sep 30, 2014

fabianfreyer commented Oct 7, 2014

fabianfreyer Oct 7, 2014

pasis commented Oct 7, 2014

fabianfreyer commented Oct 7, 2014

pasis commented Oct 7, 2014

fabianfreyer commented Oct 7, 2014

fabianfreyer commented Oct 7, 2014

fabianfreyer commented Oct 8, 2014

pasis Oct 8, 2014

pasis commented Oct 8, 2014

fabianfreyer commented Oct 12, 2014

pasis commented Oct 14, 2014

fabianfreyer commented Oct 14, 2014

pasis commented Oct 21, 2014

		@@ -60,9 +60,17 @@ fi

		AC_CHECK_HEADERS([arpa/nameser_compat.h])

Added pkg-config support #37

Added pkg-config support #37

Conversation

fabianfreyer commented Sep 25, 2014

fabianfreyer Sep 26, 2014

Choose a reason for hiding this comment

pasis Sep 30, 2014

Choose a reason for hiding this comment

fabianfreyer commented Oct 7, 2014

fabianfreyer Oct 7, 2014

Choose a reason for hiding this comment

pasis commented Oct 7, 2014

fabianfreyer commented Oct 7, 2014

pasis commented Oct 7, 2014

fabianfreyer commented Oct 7, 2014

fabianfreyer commented Oct 7, 2014

fabianfreyer commented Oct 8, 2014

pasis Oct 8, 2014

Choose a reason for hiding this comment

pasis commented Oct 8, 2014

fabianfreyer commented Oct 12, 2014

pasis commented Oct 14, 2014

fabianfreyer commented Oct 14, 2014

pasis commented Oct 21, 2014