commit 6e26775e9ddc7586a0117aeb6898c7dba693f49b
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Sun Jul 21 15:14:33 2013 +0200
- added format patch (workaround to build with -Werror=format-security)
- hacks to fix java detection
pl-format.patch | 11 +++++++++++
pl.spec | 8 +++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/pl.spec b/pl.spec
index eddf7c9..1a64d20 100644
--- a/pl.spec
+++ b/pl.spec
@@ -22,6 +22,7 @@ Source0:
http://www.swi-prolog.org/download/stable/src/%{name}-%{version}.tar.gz
# Source0-md5: 1fe29778bef25bff8116745e56ec3b28
Patch0: %{name}-clib-configure.patch
Patch1: %{name}-xpce-install.patch
+Patch2: %{name}-format.patch
URL: http://www.swi-prolog.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -144,6 +145,7 @@ Prolog.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
cd src
@@ -158,6 +160,7 @@ cd ..
# the packages are written in Prolog itself
PATH="$(pwd)/src:$PATH"; export PATH
LD_LIBRARY_PATH="$(pwd)/lib/%{_target_cpu}-linux"; export LD_LIBRARY_PATH
+export CLASSPATH=.
cd packages
wd=`pwd`
@@ -171,7 +174,10 @@ for i in clib cpp odbc table xpce/src sgml RDF semweb http
chr \
%{__aclocal}
%{__autoconf}
grep -q AC_CONFIG_HEADER configure.in && %{__autoheader}
- %configure
+ # ac_cv_prog_uudecode_base64=no is a hack to compile Test.class instead
of
+ # using included one which fails with Sun/Oracle JDK 1.6 [needed for
jpl]
+ %configure \
+ ac_cv_prog_uudecode_base64=no
%{__make}
cd $wd
done
diff --git a/pl-format.patch b/pl-format.patch
new file mode 100644
index 0000000..d67681b
--- /dev/null
+++ b/pl-format.patch
@@ -0,0 +1,11 @@
+--- pl-6.4.0/packages/xpce/src/ker/goodies.c.orig 2013-07-17
14:55:08.000000000 +0200
++++ pl-6.4.0/packages/xpce/src/ker/goodies.c 2013-07-21 14:18:44.557235666
+0200
+@@ -845,7 +845,7 @@
+ ar = vsscanf(str, fmt, (va_list) ptrs);
+ #else
+ switch(argn)
+- { case 0: ar = sscanf(str, fmt); break;
++ { case 0: ar = sscanf(str, fmt, NULL); break;
+ case 1: ar = sscanf(str, fmt, ptrs[0]); break;
+ case 2: ar = sscanf(str, fmt, ptrs[0], ptrs[1]); break;
+ case 3: ar = sscanf(str, fmt, ptrs[0], ptrs[1], ptrs[2]);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pl.git/commitdiff/6e26775e9ddc7586a0117aeb6898c7dba693f49b
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
