commit 6d5b58f4109a6a517c381180ef008e1dc0240cdf
Author: Jan Rękorajski <[email protected]>
Date: Fri Dec 7 01:26:57 2012 +0100
- fix build on x8664
- rel 1
CiaoDE-lib64.patch | 35 +++++++++++++++++++++++++++++++++++
CiaoDE.spec | 6 +++++-
2 files changed, 40 insertions(+), 1 deletion(-)
---
diff --git a/CiaoDE.spec b/CiaoDE.spec
index 7670464..f2bbc29 100644
--- a/CiaoDE.spec
+++ b/CiaoDE.spec
@@ -9,12 +9,13 @@ Summary: The Ciao Prolog development environment
Summary(pl.UTF-8): Środowisko programistyczne Ciao Prolog
Name: CiaoDE
Version: 1.14.2
-Release: 0.1
+Release: 1
License: LGPL (Ciao), GPL (CiaoPP, lpdoc)
Group: Development/Languages
Source0:
http://www.clip.dia.fi.upm.es/Software/Ciao/packages/branches/1.14/13646/%{name}-%{version}-13646.tar.gz
# Source0-md5: 11d0a41222314ae1be1b048a7888048e
Patch0: %{name}-configure.patch
+Patch1: %{name}-lib64.patch
URL: http://ciaohome.org/
BuildRequires: gsl-devel
BuildRequires: mysql-devel
@@ -67,6 +68,9 @@ o unikalnym połączeniu możliwości, m.in.:
%prep
%setup -q -n CiaoDE-%{version}-13646
%patch0 -p1
+%ifarch %{x8664}
+%patch1 -p1
+%endif
%build
./ciaosetup configure \
diff --git a/CiaoDE-lib64.patch b/CiaoDE-lib64.patch
new file mode 100644
index 0000000..c10b273
--- /dev/null
+++ b/CiaoDE-lib64.patch
@@ -0,0 +1,35 @@
+--- CiaoDE-1.14.2-13646/makedir/MenuOptions.pl.orig 2012-12-07
00:17:59.492617990 +0100
++++ CiaoDE-1.14.2-13646/makedir/MenuOptions.pl 2012-12-07 00:18:20.725950575
+0100
+@@ -374,10 +374,10 @@
+ % 'src', it is now under 'build')
+ get_enginedir('src', Prefix) := ~path_concat(Prefix, 'objs').
+ get_enginedir('ins', Prefix) :=
+- ~path_list_concat([Prefix, 'lib', 'ciao',
~component_name_version(ciao), 'engine']).
++ ~path_list_concat([Prefix, 'lib64', 'ciao',
~component_name_version(ciao), 'engine']).
+
+ get_final_libroot('src', _Prefix) := ~component_src(ciao).
+-get_final_libroot('ins', Prefix) := ~path_concat(Prefix, 'lib').
++get_final_libroot('ins', Prefix) := ~path_concat(Prefix, 'lib64').
+
+ get_final_includeroot('src', Prefix) := ~path_concat(Prefix, 'include').
+ get_final_includeroot('ins', Prefix) := ~path_concat(Prefix, 'include').
+@@ -387,7 +387,7 @@
+ get_ciaohdir_root('src', Prefix) := ~path_concat(Prefix, 'include').
+ % note: this is INSTALLEDINCLUDEDIR, use a single definition!
+ get_ciaohdir_root('ins', Prefix) :=
+- ~path_list_concat([Prefix, 'lib', 'ciao',
~component_name_version(ciao), 'include']).
++ ~path_list_concat([Prefix, 'lib64', 'ciao',
~component_name_version(ciao), 'include']).
+
+ get_update_sh('all', 'no').
+ get_update_sh('user', 'yes').
+--- CiaoDE-1.14.2-13646/ciao/lib/engine/system_info.pl~ 2011-07-08
11:45:51.000000000 +0200
++++ CiaoDE-1.14.2-13646/ciao/lib/engine/system_info.pl 2012-12-07
00:19:37.559281199 +0100
+@@ -155,7 +155,7 @@
+ :- trust pred ciao_lib_dir(CiaoPath) => atm(CiaoPath) #
+ "@var{CiaoPath} is the path to the root of the Ciao
+ libraries. Inside this directory, there are the directories
+- 'lib', 'library' and 'contrib', which contain library modules.".
++ 'lib64', 'library' and 'contrib', which contain library modules.".
+ :- impl_defined(ciao_lib_dir/1).
+
+ :- trust pred ciao_c_headers_dir(CiaoPath) => atm(CiaoPath) #
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/CiaoDE.git/commitdiff/6d5b58f4109a6a517c381180ef008e1dc0240cdf
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
