[packages/ml-pnet] - fix build on x8664 - rel 2

[baggins]

commit 43533e979ce860981fc1ea0dc040954ad49be464
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Apr 23 09:47:15 2016 +0200

    - fix build on x8664
    - rel 2

 ac-libdir.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++
 ml-pnet.spec    |  5 ++++-
 2 files changed, 49 insertions(+), 1 deletion(-)
---
diff --git a/ml-pnet.spec b/ml-pnet.spec
index f644c19..d96dd91 100644
--- a/ml-pnet.spec
+++ b/ml-pnet.spec
@@ -7,11 +7,12 @@ Summary:	Mono Libraries for Portable.NET
 Summary(pl.UTF-8):	Biblioteki Mono dla środowiska Portable.NET
 Name:		ml-pnet
 Version:	0.8.1
-Release:	1
+Release:	2
 License:	GPL v2+ (pnet scripts), MIT/GPL v2 (Mono libraries/tools)
 Group:		Libraries
 Source0:	http://download.savannah.gnu.org/releases/dotgnu-pnet/%{name}-%{version}.tar.gz
 # Source0-md5:	0801c188d5a4ed8adea2c1479abe66ea
+Patch0:		ac-libdir.patch
 URL:		http://www.gnu.org/software/dotgnu/pnet.html
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -19,6 +20,7 @@ BuildRequires:	automake
 # required libraries: mscorlib Microsoft.VisualC
 BuildRequires:	pnet-compiler-csharp = %{pnetlib_version}
 BuildRequires:	pnet-ilinstall = %{pnetlib_version}
+BuildRequires:	pnet-tools = %{pnetlib_version}
 BuildRequires:	pnetlib-base = %{pnetlib_version}
 BuildRequires:	pnetlib-winforms = %{pnetlib_version}
 BuildRequires:	treecc
@@ -39,6 +41,7 @@ C# Portable.NET. W ten sposób te komponenty Mono mogą być używane ze
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__aclocal}
diff --git a/ac-libdir.patch b/ac-libdir.patch
new file mode 100644
index 0000000..0c8b4f6
--- /dev/null
+++ b/ac-libdir.patch
@@ -0,0 +1,45 @@
+--- ml-pnet-0.8.1/configure.in~	2007-04-17 20:02:22.000000000 +0200
++++ ml-pnet-0.8.1/configure.in	2016-04-23 09:46:14.527893286 +0200
+@@ -219,8 +219,8 @@
+ if test -f "$PNETLIB_PATH/runtime/mscorlib.dll" ; then
+ 	ASSEMBLY="$PNETLIB_PATH/runtime/mscorlib.dll"
+ else
+-	if test -f "${prefix}/lib/cscc/lib/mscorlib.dll" ; then
+-		ASSEMBLY="${prefix}/lib/cscc/lib/mscorlib.dll"
++	if test -f "${libdir}/cscc/lib/mscorlib.dll" ; then
++		ASSEMBLY="${libdir}/cscc/lib/mscorlib.dll"
+ 	fi
+ fi
+ if test "xASSEMBLY" = "x" ; then
+@@ -240,8 +240,8 @@
+ if test -f "$PNETLIB_PATH/compat/Microsoft.VisualC.dll" ; then
+ 	ASSEMBLY="$PNETLIB_PATH/compat/Microsoft.VisualC.dll"
+ else
+-	if test -f "${prefix}/lib/cscc/lib/Microsoft.VisualC.dll" ; then
+-		ASSEMBLY="${prefix}/lib/cscc/lib/Microsoft.VisualC.dll"
++	if test -f "${libdir}/cscc/lib/Microsoft.VisualC.dll" ; then
++		ASSEMBLY="${libdir}/cscc/lib/Microsoft.VisualC.dll"
+ 	fi
+ fi
+ if test "xASSEMBLY" = "x" ; then
+@@ -269,7 +269,7 @@
+ 	echo '**************************************************'
+ 	exit 1
+ else
+-	AC_PATH_PROG(CSHARP_PLUGIN, cscc-cs,, $PNET_PATH/cscc:${prefix}/lib/cscc/plugins:${prefix}/bin:$PATH)
++	AC_PATH_PROG(CSHARP_PLUGIN, cscc-cs,, $PNET_PATH/cscc:${libdir}/cscc/plugins:${prefix}/bin:$PATH)
+ 	if test "x$CYGPATH" = "x" ; then
+ 		CSHARP_COMPILER_CYGWIN="$CSHARP_COMPILER"
+ 		CYG_ILGAC="$ILGAC"
+@@ -282,9 +282,9 @@
+ 		CSHARP_PLUGIN=`"$CYGPATH" -w "$CSHARP_PLUGIN"`
+ 		CYG_ILGAC=`"$CYGPATH" -w "$ILGAC"`
+ 		if test "x$prefix" = "xNONE" ; then
+-			CYG_CACHE=`"$CYGPATH" -w "${ac_default_prefix}/lib/cscc/lib"`
++			CYG_CACHE=`"$CYGPATH" -w "${libdir}/cscc/lib"`
+ 		else
+-			CYG_CACHE=`"$CYGPATH" -w "${prefix}/lib/cscc/lib"`
++			CYG_CACHE=`"$CYGPATH" -w "${libdir}/cscc/lib"`
+ 		fi
+ 	fi
+ 	CSANT_FLAGS='--compiler cscc -Dcscc="$(CSHARP_COMPILER)" -Dcscc.plugins.cs="$(CSHARP_PLUGIN)" --profile "$(top_srcdir)/profiles/$(PROFILE_NAME)" -Ddebug.flag="$(DEBUG_FLAG)" -Dilgac="$(CYG_ILGAC)" --assembly-cache "$(DESTDIR)$(CYG_CACHE)" -DFRAMEWORK_VERSION="$(FRAMEWORK_VERSION)" -DSECONDARY_VERSION="$(SECONDARY_VERSION)"'
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ml-pnet.git/commitdiff/43533e979ce860981fc1ea0dc040954ad49be464