pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

libmesode-git: fix build



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Wed Jan 25 10:25:08 2017 +0100
Changeset:	b1c2c6c547d224a22a2d82208812171b1d454e95

Modified Files:
	libmesode-git/Makefile
	libmesode-git/distinfo
Added Files:
	libmesode-git/patches/patch-configure.ac

Log Message:
libmesode-git: fix build

configure contains wrongly quoted variables
fix path to pkg-config file
depend on expat since configure checks for it

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b1c2c6c547d224a22a2d82208812171b1d454e95

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libmesode-git/Makefile                   |  3 ++-
 libmesode-git/distinfo                   |  1 +
 libmesode-git/patches/patch-configure.ac | 20 ++++++++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diffs:
diff --git a/libmesode-git/Makefile b/libmesode-git/Makefile
index 0849473..a6cc9cc 100644
--- a/libmesode-git/Makefile
+++ b/libmesode-git/Makefile
@@ -17,11 +17,12 @@ USE_LANGUAGES=	c c++
 
 CONFIGURE_ARGS+=	--with-libxml2
 
-PKGCONFIG_OVERRIDE+=	libstrophe.pc.in
+PKGCONFIG_OVERRIDE+=	libmesode.pc.in
 
 pre-configure:
 	cd ${WRKSRC} && autoreconf -i
 
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libmesode-git/distinfo b/libmesode-git/distinfo
index 06c403f..7da46e4 100644
--- a/libmesode-git/distinfo
+++ b/libmesode-git/distinfo
@@ -4,3 +4,4 @@ SHA1 (libmesode-0.9.1-e3db0e9bfba61b2d82193874343a94a88f910800.tar.gz) = 4be123e
 RMD160 (libmesode-0.9.1-e3db0e9bfba61b2d82193874343a94a88f910800.tar.gz) = cd3866aace465ffc3b9ab564302b6733d75884eb
 SHA512 (libmesode-0.9.1-e3db0e9bfba61b2d82193874343a94a88f910800.tar.gz) = 7ddcc1bb71f0b0b546a7300c7e57b92fdf1d9fb82052c7a31eccf7854eee1193b7226f01aab8c7d4e9663a7a78168f2b6865e63d4fd393167a888599960ff25f
 Size (libmesode-0.9.1-e3db0e9bfba61b2d82193874343a94a88f910800.tar.gz) = 143108 bytes
+SHA1 (patch-configure.ac) = 72f6d77a9f0edbe6f681bb872e7f0ce1fefe210a
diff --git a/libmesode-git/patches/patch-configure.ac b/libmesode-git/patches/patch-configure.ac
new file mode 100644
index 0000000..f36ceba
--- /dev/null
+++ b/libmesode-git/patches/patch-configure.ac
@@ -0,0 +1,20 @@
+$NetBSD$
+
+Fix quoting.
+
+--- configure.ac.orig	2016-09-17 16:34:38.000000000 +0000
++++ configure.ac
+@@ -18,11 +18,11 @@ AS_CASE([$host_os],
+                    [PLATFORM="nix"])
+ 
+ PKG_CHECK_MODULES([expat], [expat >= 2.0.0],
+-                  [PC_REQUIRES+=(expat)],
++                  [PC_REQUIRES+=expat],
+                   [AC_CHECK_HEADER([expat.h],
+                                    [
+                                     expat_LIBS="-lexpat"
+-                                    PC_LIBS+=($expat_LIBS)
++                                    PC_LIBS+=$expat_LIBS
+                                    ],
+                                    [AC_MSG_ERROR([expat not found; expat required.])]
+                                   )


Home | Main Index | Thread Index | Old Index