summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Pierre Lejeune <superheron@gmail.com> 2015-04-25 22:06:14 +0200
committerAvatar Gerrit Code Review <tomcat@galileo.mailstation.de> 2015-04-26 18:44:44 +0200
commit53e9fa2fecef47dd847163b119952cfce07a01fb (patch)
treeacffbaaa48b64d1f6df3037bb1f337e84f09fab1
parentefc49547807d93b7469473067cbe3c5d746ef523 (diff)
downloadmono-53e9fa2fecef47dd847163b119952cfce07a01fb.tar.gz
mono-53e9fa2fecef47dd847163b119952cfce07a01fb.tar.xz
dev-util/nant: cross adjustments
-rw-r--r--packages/dev-util/nant/files/nant-0.93_pre20130613-pkg-config.patch15
-rw-r--r--packages/dev-util/nant/nant-0.93_pre20130613.exheres-09
2 files changed, 22 insertions, 2 deletions
diff --git a/packages/dev-util/nant/files/nant-0.93_pre20130613-pkg-config.patch b/packages/dev-util/nant/files/nant-0.93_pre20130613-pkg-config.patch
new file mode 100644
index 0000000..818725a
--- /dev/null
+++ b/packages/dev-util/nant/files/nant-0.93_pre20130613-pkg-config.patch
@@ -0,0 +1,15 @@
+Source: written by Pierre Lejeune <superheron@gmail.com>, for Exherbo
+Upstream: no
+Reason: Do not hardcode pkg-config path
+
+--- a/src/NAnt.Core/Functions/PkgConfigFunctions.cs 2013-10-20 08:52:52.000000000 +0200
++++ b/src/NAnt.Core/Functions/PkgConfigFunctions.cs 2015-04-25 22:00:10.613199821 +0200
+@@ -286,7 +286,7 @@
+ ExecTask execTask = new ExecTask();
+ execTask.Parent = Project;
+ execTask.Project = Project;
+- execTask.FileName = "pkg-config";
++ execTask.FileName = "@@PKG_CONFIG@@";
+ execTask.Threshold = Level.None;
+ execTask.ErrorWriter = execTask.OutputWriter = new StreamWriter(stream);
+ return execTask;
diff --git a/packages/dev-util/nant/nant-0.93_pre20130613.exheres-0 b/packages/dev-util/nant/nant-0.93_pre20130613.exheres-0
index 6fe9b5e..e7b4873 100644
--- a/packages/dev-util/nant/nant-0.93_pre20130613.exheres-0
+++ b/packages/dev-util/nant/nant-0.93_pre20130613.exheres-0
@@ -23,17 +23,20 @@ DEPENDENCIES="
"
DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}/${PNV}-parallel-build-fix.patch"
- "${FILES}/${PNV}-fix-exherbo-dirs.patch" )
+ "${FILES}/${PNV}-fix-exherbo-dirs.patch"
+ "${FILES}/${PNV}-pkg-config.patch" )
DEFAULT_SRC_COMPILE_PARAMS=( TARGET='mono-2.0' )
-DEFAULT_SRC_INSTALL_PARAMS=( prefix='/usr' libdir="${LIBDIR}" revision="${REVISION}" )
+DEFAULT_SRC_INSTALL_PARAMS=( prefix='/usr' libdir="$(exhost --target)/lib" revision="${REVISION}" )
src_prepare() {
# Uses a fake smtp server bound to 0.0.0.0, unmodifiable
edo rm "${WORK}/tests/NAnt.Core/Tasks/MailTaskTest.cs"
default
+
+ edo sed -e "s/@@PKG_CONFIG@@/${PKG_CONFIG}/" -i src/NAnt.Core/Functions/PkgConfigFunctions.cs
}
src_test() {
@@ -46,5 +49,7 @@ src_install() {
edo sed -e "s,${IMAGE},/,g" \
-e "2iexport MONO_SILENT_WARNING=1" \
-i "${IMAGE}usr/bin/${PN}"
+
+ edo mv "${IMAGE}"/usr/{bin,$(exhost --target)}
}