summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Pierre Lejeune <superheron@gmail.com> 2015-04-11 23:50:50 +0200
committerAvatar Gerrit Code Review <tomcat@galileo.mailstation.de> 2015-04-26 18:29:28 +0200
commit9909a110b5b8cdf3b41cee58e71248a9a518186b (patch)
treeb335878c7a1f6cea3494691ca31f7a4bae02a096
parent0b46ffd3461c9b6ad869df39e1202cd12a88b916 (diff)
downloadmono-9909a110b5b8cdf3b41cee58e71248a9a518186b.tar.gz
mono-9909a110b5b8cdf3b41cee58e71248a9a518186b.tar.xz
dev-dotnet/mono-addins: cross adjustments
-rw-r--r--packages/dev-dotnet/mono-addins/files/mono-addins-1.1-Use-PKG_PROG_PKG_CONFIG-macro.patch18
-rw-r--r--packages/dev-dotnet/mono-addins/mono-addins-1.1.exheres-02
2 files changed, 20 insertions, 0 deletions
diff --git a/packages/dev-dotnet/mono-addins/files/mono-addins-1.1-Use-PKG_PROG_PKG_CONFIG-macro.patch b/packages/dev-dotnet/mono-addins/files/mono-addins-1.1-Use-PKG_PROG_PKG_CONFIG-macro.patch
new file mode 100644
index 0000000..706b2b6
--- /dev/null
+++ b/packages/dev-dotnet/mono-addins/files/mono-addins-1.1-Use-PKG_PROG_PKG_CONFIG-macro.patch
@@ -0,0 +1,18 @@
+Source: written by Pierre Lejeune <superheron@gmail.com>
+Upstream: no
+Reason: Use PKG_PROG_PKG_CONFIG macro
+
+--- a/configure.ac 2014-01-24 12:47:17.000000000 +0100
++++ b/configure.ac 2015-04-11 23:46:28.129625576 +0200
+@@ -6,10 +6,7 @@
+ AM_MAINTAINER_MODE
+
+ dnl pkg-config
+-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+-if test "x$PKG_CONFIG" = "xno"; then
+- AC_MSG_ERROR([You need to install pkg-config])
+-fi
++PKG_PROG_PKG_CONFIG([0.16])
+
+ API_VERSION=1.0.0.0
+ AC_SUBST(API_VERSION)
diff --git a/packages/dev-dotnet/mono-addins/mono-addins-1.1.exheres-0 b/packages/dev-dotnet/mono-addins/mono-addins-1.1.exheres-0
index 261b919..10144d8 100644
--- a/packages/dev-dotnet/mono-addins/mono-addins-1.1.exheres-0
+++ b/packages/dev-dotnet/mono-addins/mono-addins-1.1.exheres-0
@@ -19,6 +19,8 @@ DEPENDENCIES="
dev-util/pkg-config[>=0.20]
"
+DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}"/${PNV}-Use-PKG_PROG_PKG_CONFIG-macro.patch )
+
DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( gui )
DEFAULT_SRC_CONFIGURE_PARAMS=( --enable-tests )