diff options
| author | Guy Harris <guy@alum.mit.edu> | 2011-07-15 23:26:22 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2011-07-15 23:26:22 +0000 |
| commit | 9659cc77e8f60e02f9c16e8339493b5059911e59 (patch) | |
| tree | 0069311f9495e926810238cc049e35e7507204d9 | |
| parent | e6a964dc628d4136d42255a5d12b1237331391c5 (diff) | |
Patch GnuTLS's pkg-config file; it says "requires zlib", but OS X, while
it supplies zlib, doesn't supply a pkgconfig file for it, so we don't
want it to say "requires zlib".
This script is part of the Wireshark source, so giving "download
Wireshark source" as the next step doesn't make sense.
svn path=/trunk/; revision=38055
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rwxr-xr-x | macosx-setup.sh | 9 | ||||
| -rw-r--r-- | macosx-support-lib-patches/gnutls-pkgconfig.patch | 10 |
3 files changed, 19 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 910a23e742..fd9130cfbf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -796,6 +796,7 @@ EXTRA_DIST = \ macosx-setup.sh \ macosx-support-lib-patches/glib-gconvert.patch \ macosx-support-lib-patches/glib-pkgconfig.patch \ + macosx-support-lib-patches/gnutls-pkgconfig.patch \ make-version.pl \ manuf \ manuf.tmpl \ diff --git a/macosx-setup.sh b/macosx-setup.sh index b75cb596d7..b062535156 100755 --- a/macosx-setup.sh +++ b/macosx-setup.sh @@ -277,6 +277,14 @@ then # ./configure --with-libgcrypt || exit 1 make -j 3 || exit 1 + # + # The pkgconfig file for GnuTLS says "requires zlib", but OS X, + # while it supplies zlib, doesn't supply a pkgconfig file for + # it. + # + # Patch the GnuTLS pkgconfig file not to require zlib. + # + patch -p0 lib/gnutls.pc <../../macosx-support-lib-patches/gnutls-pkgconfig.patch || exit 1 $DO_MAKE_INSTALL || exit 1 cd .. fi @@ -319,7 +327,6 @@ fi echo "" echo "You are now prepared to build Wireshark. To do so do:" -echo "Download Wireshark source" echo "./autogen.sh" echo "./configure" echo "make -j 3" diff --git a/macosx-support-lib-patches/gnutls-pkgconfig.patch b/macosx-support-lib-patches/gnutls-pkgconfig.patch new file mode 100644 index 0000000000..e599afd18a --- /dev/null +++ b/macosx-support-lib-patches/gnutls-pkgconfig.patch @@ -0,0 +1,10 @@ +*** gnutls.pc.orig 2011-07-15 15:02:32.000000000 -0700 +--- gnutls.pc 2011-07-15 15:02:42.000000000 -0700 +*************** +*** 21,25 **** + Version: 2.12.7 + Libs: -L${libdir} -lgnutls + Libs.private: -L/usr/local/lib -lgcrypt -L/usr/local/lib -lgpg-error -L/usr/local/lib -lintl -liconv -lc -R/usr/local/lib +- Requires.private: zlib + Cflags: -I${includedir} +--- 21,24 ---- |