summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Maunier2019-08-22 09:53:30 +0200
committerFlorian Maunier2019-08-22 09:53:30 +0200
commitc12533f7a2dd82a7901ae0d030e89c8aa79ce6a8 (patch)
tree268909291bf7b88f07ec9b1034c1148eb56e51dc
parent7f524abff659424d7f6db11375fbf00fb00c3fac (diff)
downloadaur-c12533f7a2dd82a7901ae0d030e89c8aa79ce6a8.tar.gz
Fix for mono 6.0.0
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD17
-rw-r--r--fix-install.patch21
3 files changed, 9 insertions, 35 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 80dd3ece2ff1..accf22b88019 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,20 @@
pkgbase = msbuild
pkgver = 16.1+xamarinxplat.2019.06.05.11.19
- pkgrel = 5
+ pkgrel = 6
url = https://github.com/mono/msbuild
arch = x86_64
license = MIT
makedepends = unzip
source = https://download.mono-project.com/sources/msbuild/msbuild-16.1+xamarinxplat.2019.06.05.11.19.tar.xz
- source = fix-install.patch
source = fixed-build-version.patch
source = license-check-is-case-sensitive.patch
sha256sums = 8184b32f446aba5634342148c0d87a84073ee2ce160e325ae3a04d6b368b45e1
- sha256sums = b6751be70a8c4d4cd7247da5f31663aa685ed7061a481319ef512ce1f7bb4518
sha256sums = 4acf88ec981bc687be8eb2aa7c000db21e6fb98fa68727c21cb6db3395f4b4df
sha256sums = 3a12a9c33ad5938e8af24d2985241053602f4efc94a4818a00a17da32ce4aba5
pkgname = msbuild
pkgdesc = Xamarin implementation of the Microsoft build system
- depends = mono>=5.0.0
+ depends = mono>=6.0.0
pkgname = msbuild-sdkresolver
pkgdesc = Xamarin implementation of the Microsoft build system (SDK resolver)
diff --git a/PKGBUILD b/PKGBUILD
index 1ca9897d92a2..b2d6960e2e5e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,23 +3,20 @@
pkgbase=msbuild
pkgname=('msbuild' 'msbuild-sdkresolver')
pkgver=16.1+xamarinxplat.2019.06.05.11.19
-pkgrel=5
+pkgrel=6
arch=('x86_64')
url="https://github.com/mono/msbuild"
license=('MIT')
makedepends=('unzip')
source=("https://download.mono-project.com/sources/msbuild/msbuild-${pkgver}.tar.xz"
- 'fix-install.patch'
'fixed-build-version.patch'
'license-check-is-case-sensitive.patch')
sha256sums=('8184b32f446aba5634342148c0d87a84073ee2ce160e325ae3a04d6b368b45e1'
- 'b6751be70a8c4d4cd7247da5f31663aa685ed7061a481319ef512ce1f7bb4518'
'4acf88ec981bc687be8eb2aa7c000db21e6fb98fa68727c21cb6db3395f4b4df'
'3a12a9c33ad5938e8af24d2985241053602f4efc94a4818a00a17da32ce4aba5')
prepare() {
cd "${pkgname}-${pkgver%+*}"
- patch --forward --strip=1 --input="${srcdir}/fix-install.patch"
patch --forward --strip=1 --input="${srcdir}/fixed-build-version.patch"
patch --forward --strip=1 --input="${srcdir}/license-check-is-case-sensitive.patch"
}
@@ -27,7 +24,7 @@ prepare() {
build() {
cd "${pkgname}-${pkgver%+*}"
./eng/cibuild_bootstrapped_msbuild.sh --host_type mono --configuration Release --skip_tests /p:DisableNerdbankVersioning=true
- ./artifacts/mono-msbuild/msbuild mono/build/install.proj /p:MonoInstallPrefix=$srcdir/target/usr /p:Configuration=Release-MONO /p:IgnoreDiffFailure=true /p:TargetMSBuildToolsVersion="15.0"
+ ./artifacts/mono-msbuild/msbuild mono/build/install.proj /p:MonoInstallPrefix=$srcdir/target/usr /p:Configuration=Release-MONO /p:IgnoreDiffFailure=true
sed -i "s@${srcdir}/target@@g" $srcdir/target/usr/bin/msbuild
find $srcdir/target/usr/lib/mono/ -name Microsoft.DiaSymReader.Native.*dll -delete
find $srcdir/target/usr/lib/mono/ -name *.dylib -delete
@@ -35,10 +32,10 @@ build() {
package_msbuild() {
pkgdesc="Xamarin implementation of the Microsoft build system"
- depends=('mono>=5.0.0')
+ depends=('mono>=6.0.0')
cp -dr --no-preserve='ownership' $srcdir/target/usr "${pkgdir}"
- rm -rf $pkgdir/usr/lib/mono/msbuild/15.0/bin/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver
+ rm -rf $pkgdir/usr/lib/mono/msbuild/Current/bin/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver
}
package_msbuild-sdkresolver() {
@@ -46,7 +43,7 @@ package_msbuild-sdkresolver() {
makedepends=('dotnet-host')
depends=('msbuild')
- mkdir -p "${pkgdir}"/usr/lib/mono/msbuild/15.0/bin/SdkResolvers/
- cp -dr --no-preserve='ownership' $srcdir/target/usr/lib/mono/msbuild/15.0/bin/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver "${pkgdir}"/usr/lib/mono/msbuild/15.0/bin/SdkResolvers/
- cp -dr --no-preserve='ownership' $(pacman -Ql dotnet-host | grep libhostfxr.so | cut -d' ' -f2) "${pkgdir}"/usr/lib/mono/msbuild/15.0/bin/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver/
+ mkdir -p "${pkgdir}"/usr/lib/mono/msbuild/Current/bin/SdkResolvers/
+ cp -dr --no-preserve='ownership' $srcdir/target/usr/lib/mono/msbuild/Current/bin/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver "${pkgdir}"/usr/lib/mono/msbuild/Current/bin/SdkResolvers/
+ cp -dr --no-preserve='ownership' $(pacman -Ql dotnet-host | grep libhostfxr.so | cut -d' ' -f2) "${pkgdir}"/usr/lib/mono/msbuild/Current/bin/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver/
}
diff --git a/fix-install.patch b/fix-install.patch
deleted file mode 100644
index 9af0979287a9..000000000000
--- a/fix-install.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --unified --recursive --text msbuild.orig/mono/build/install.proj msbuild.new/mono/build/install.proj
---- msbuild.orig/mono/build/install.proj 2019-04-09 01:19:48.000000000 +0200
-+++ msbuild.new/mono/build/install.proj 2019-04-19 16:14:17.165327157 +0200
-@@ -100,13 +100,13 @@
-
- <Exec
- WorkingDirectory="$(XBuildDir)"
-- Command="ln -sfn Current 15.0" />
-+ Command="ln -sfn $(TargetMSBuildToolsVersion) Current" />
- <Exec
- WorkingDirectory="$(MonoInstallPrefix)\lib\mono\msbuild"
-- Command="ln -s Current 15.0" />
-+ Command="ln -s $(TargetMSBuildToolsVersion) Current" />
- <ItemGroup>
-- <CopiedFiles Include="$(MonoInstallPrefix)\bin\msbuild\15.0" />
-- <CopiedFiles Include="$(XBuildDir)\15.0" />
-+ <CopiedFiles Include="$(MonoInstallPrefix)\bin\msbuild\$(TargetMSBuildToolsVersion)" />
-+ <CopiedFiles Include="$(XBuildDir)\$(TargetMSBuildToolsVersion)" />
- </ItemGroup>
-
- <Copy SourceFiles="@(MSBuildFiles)" DestinationFolder="$(MSBuildInstallBinDir)">