From 005b5f8138199f45e4c36787850b744beba6ffac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Wed, 12 Oct 2011 11:38:35 +0200 Subject: [PATCH 01/28] rebuild with new gmp --- yap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yap.spec b/yap.spec index 67fdee4..d200e6b 100644 --- a/yap.spec +++ b/yap.spec @@ -4,7 +4,7 @@ Name: yap Version: 6.2.0 -Release: 5%{?dist} +Release: 5%{?dist}.1 Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -227,6 +227,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Oct 12 2011 Peter Schiffer - 6.2.0-5.1 +- rebuild with new gmp + * Thu Jun 23 2011 Dan Horák - 6.2.0-5 - fix non-x86 builds with recent gcc From e76bbf2152c7820bc8a9b6ab471037a7744f8fea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Wed, 26 Oct 2011 16:08:48 +0200 Subject: [PATCH 02/28] rebuild with new gmp without compat lib --- yap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yap.spec b/yap.spec index d200e6b..90b3e7f 100644 --- a/yap.spec +++ b/yap.spec @@ -4,7 +4,7 @@ Name: yap Version: 6.2.0 -Release: 5%{?dist}.1 +Release: 5%{?dist}.2 Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -227,6 +227,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Oct 26 2011 Marcela Mašláňová - 6.2.0-5.2 +- rebuild with new gmp without compat lib + * Wed Oct 12 2011 Peter Schiffer - 6.2.0-5.1 - rebuild with new gmp From 457501a6ecb812964840265c168400297b274b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 7 Dec 2011 15:04:40 +0100 Subject: [PATCH 03/28] Fix building on PPC --- yap-6.2.0-Remove-feature-macro.patch | 27 +++++++++++++++++++++++++++ yap-6.2.0-ppc-mmap-addr.patch | 11 +++++++++++ yap.spec | 14 +++++++++++++- 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 yap-6.2.0-Remove-feature-macro.patch create mode 100644 yap-6.2.0-ppc-mmap-addr.patch diff --git a/yap-6.2.0-Remove-feature-macro.patch b/yap-6.2.0-Remove-feature-macro.patch new file mode 100644 index 0000000..75201ee --- /dev/null +++ b/yap-6.2.0-Remove-feature-macro.patch @@ -0,0 +1,27 @@ +From 9419d68dc09a4e3f7adfe7e654ef3952327cd9bf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Wed, 7 Dec 2011 14:14:25 +0100 +Subject: [PATCH] Remove feature macro + +This macro clashes with struct ppc_debug_info member in +on PPC. The macro is not used anywhere in yap. +--- + packages/PLStream/pl-incl.h | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/packages/PLStream/pl-incl.h b/packages/PLStream/pl-incl.h +index aa7b99c..8bf63de 100755 +--- a/packages/PLStream/pl-incl.h ++++ b/packages/PLStream/pl-incl.h +@@ -363,8 +363,6 @@ typedef struct PL_local_data { + + #define usedStack(D) 0 + +-#define features (LD->feature.mask) +- + extern PL_local_data_t lds; + + #define exception_term (LD->exception.term) +-- +1.7.7.4 + diff --git a/yap-6.2.0-ppc-mmap-addr.patch b/yap-6.2.0-ppc-mmap-addr.patch new file mode 100644 index 0000000..e29aebc --- /dev/null +++ b/yap-6.2.0-ppc-mmap-addr.patch @@ -0,0 +1,11 @@ +--- yap-6.orig/H/Yap.h 2010-10-18 21:48:20.000000000 +1300 ++++ yap-6/H/Yap.h 2010-12-01 20:09:57.000000000 +1300 +@@ -268,6 +268,8 @@ + #define MMAP_ADDR 0x200000000 + #elif defined(__APPLE__) && !__LP64__ + #define MMAP_ADDR 0x20000000 ++#elif defined(__powerpc__) ++#define MMAP_ADDR 0x20000000 + #else + #define MMAP_ADDR 0x10000000 + #endif diff --git a/yap.spec b/yap.spec index 90b3e7f..9c7687a 100644 --- a/yap.spec +++ b/yap.spec @@ -4,7 +4,7 @@ Name: yap Version: 6.2.0 -Release: 5%{?dist}.2 +Release: 6%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -27,6 +27,10 @@ Patch7: yap-6.2.0-Do-not-install-info-dir-index.patch Patch8: yap-6.2.0-fix-chr-install-from-Keri.patch # fix non-x86 build with recent gcc Patch9: yap-6.2.0-gprof-macro.patch +# Fix segfaults on PPC. Taken from Gentoo yap-6.2.0-gentoo-patchset-5.tar.gz +Patch10: yap-6.2.0-ppc-mmap-addr.patch +# Fix compilation of PLStream package on PPC +Patch11: yap-6.2.0-Remove-feature-macro.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf BuildRequires: gmp-devel @@ -82,6 +86,8 @@ Documentation for Yap. %patch7 -p1 -b .do_not_install_info_index %patch8 -p1 -b .fix_chr_install %patch9 -p1 -b .macro +%patch10 -p1 -b .ppc +%patch11 -p1 -b .remove_feature_macro # remove redundant RPATH sed -i 's/-Wl,-R\(,\)\{0,1\}\\$(LIBDIR)//' configure.in @@ -141,6 +147,9 @@ make %{?_smp_mflags} info %install rm -rf $RPM_BUILD_ROOT +%ifarch ppc ppc64 +ulimit -s unlimited +%endif make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install_info @@ -227,6 +236,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Dec 07 2011 Petr Pisar - 6.2.0-6 +- Fix building on PowerPC (bug #751144) + * Wed Oct 26 2011 Marcela Mašláňová - 6.2.0-5.2 - rebuild with new gmp without compat lib From 1085e27b3badaec03ba8249177bd938adcc24cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 9 Dec 2011 14:22:16 +0100 Subject: [PATCH 04/28] 6.2.2 bump --- .gitignore | 1 + sources | 2 +- yap-6.2.0-fix-chr-install-from-Keri.patch | 106 ---------------------- yap-6.2.0-ppc-mmap-addr.patch | 11 --- yap.spec | 43 ++++----- 5 files changed, 19 insertions(+), 144 deletions(-) delete mode 100644 yap-6.2.0-fix-chr-install-from-Keri.patch delete mode 100644 yap-6.2.0-ppc-mmap-addr.patch diff --git a/.gitignore b/.gitignore index 318a656..6225908 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ chr_translate_bootstrap2.pl chr_translate.pl guard_entailment.pl /yap-6.2.0.tar.gz +/yap-6.2.2.tar.gz diff --git a/sources b/sources index ca55625..cf4d846 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -df250bab67a7576ac9293f78156d4ee0 yap-6.2.0.tar.gz +5010225464ffe8b2aa3e0bca9d935937 yap-6.2.2.tar.gz diff --git a/yap-6.2.0-fix-chr-install-from-Keri.patch b/yap-6.2.0-fix-chr-install-from-Keri.patch deleted file mode 100644 index bbdee5f..0000000 --- a/yap-6.2.0-fix-chr-install-from-Keri.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 23d07e2d78cf285e32b6f42c635edf506ff70c78 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= -Date: Tue, 9 Nov 2010 16:39:34 +0000 -Subject: [PATCH] fix chr install (from Keri) - ---- - configure.in | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/configure.in b/configure.in -index 920d01a..3bc0c1d 100755 ---- a/configure.in -+++ b/configure.in -@@ -924,7 +924,7 @@ case "$target_os" in - then - YAPLIB_LD="\$(CC) -shared" - EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" -- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" -+ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" - PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" - else - YAPLIB_LD="\$(CC)" -@@ -946,7 +946,7 @@ case "$target_os" in - DYNYAPLIB=libYap."$SO" - EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" - PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" -- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" -+ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" - ;; - *hpux*) - #do not use the first memory quadrant -@@ -985,7 +985,7 @@ case "$target_os" in - DYNYAPLIB=libYap."$SO" - EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" - PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" -- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" -+ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" - ;; - *aix*) - # To actually use dlls in AIX I'd need to build YAP as a DLL first. -@@ -998,7 +998,7 @@ case "$target_os" in - DYNYAPLIB=libYap."$SO" - EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,\$(LIBDIR)" - PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" -- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" -+ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" - ;; - *osf*) - if ${use_condor} = no -@@ -1016,7 +1016,7 @@ dnl Linux has both elf and a.out, in this case we found elf - DYNYAPLIB=libYap."$SO" - EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" - PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" -- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" -+ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" - ;; - *irix6*) - SHLIB_CFLAGS="$CFLAGS" -@@ -1030,7 +1030,7 @@ dnl Linux has both elf and a.out, in this case we found elf - DYNYAPLIB=libYap."$SO" - EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" - PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" -- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" -+ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" - ;; - *darwin*) - if test ${use_dlcompat} = yes -@@ -1051,7 +1051,7 @@ dnl Linux has both elf and a.out, in this case we found elf - SHLIB_LD="$CC -dynamiclib" - SHLIB_CXX_LD="$CXX -dynamiclib" - EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-install_name,\$(YAPLIBDIR)/\$@" -- INSTALL_ENV="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" -+ INSTALL_ENV="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" - else - SHLIB_LD="$CC -dynamiclib -Wl,-undefined,dynamic_lookup" - SHLIB_CXX_LD="$CXX -dynamiclib -Wl,-undefined,dynamic_lookup" -@@ -1091,7 +1091,7 @@ dnl Linux has both elf and a.out, in this case we found elf - DYNYAPLIB=libYap."$SO" - EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -Wl,-R,\$(YAPLIBDIR)" - PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" -- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" -+ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" - ;; - *solaris*) - #an elf system -@@ -1110,7 +1110,7 @@ dnl Linux has both elf and a.out, in this case we found elf - YAPLIB_LD="\$(CC)" - EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" - PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" -- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" -+ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" - else - EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" - PRE_INSTALL_ENV="" -@@ -1165,7 +1165,7 @@ dnl Linux has both elf and a.out, in this case we found elf - DYNYAPLIB=libYap."$SO" - EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" - PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" -- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" -+ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" - ;; - esac - --- -1.7.3.4 - diff --git a/yap-6.2.0-ppc-mmap-addr.patch b/yap-6.2.0-ppc-mmap-addr.patch deleted file mode 100644 index e29aebc..0000000 --- a/yap-6.2.0-ppc-mmap-addr.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- yap-6.orig/H/Yap.h 2010-10-18 21:48:20.000000000 +1300 -+++ yap-6/H/Yap.h 2010-12-01 20:09:57.000000000 +1300 -@@ -268,6 +268,8 @@ - #define MMAP_ADDR 0x200000000 - #elif defined(__APPLE__) && !__LP64__ - #define MMAP_ADDR 0x20000000 -+#elif defined(__powerpc__) -+#define MMAP_ADDR 0x20000000 - #else - #define MMAP_ADDR 0x10000000 - #endif diff --git a/yap.spec b/yap.spec index 9c7687a..9602157 100644 --- a/yap.spec +++ b/yap.spec @@ -3,8 +3,8 @@ %global use_eam 0 Name: yap -Version: 6.2.0 -Release: 6%{?dist} +Version: 6.2.2 +Release: 1%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -14,8 +14,8 @@ Group: Development/Languages # packages/clib/sha1/sha2.c BSD or GPL # packages/http/examples/demo_threads.pl GPLv2+ License: Artistic 2.0 and LGPLv2+ and (BSD or GPL+) and (GPLv2+) -URL: http://www.ncc.up.pt/~vsc/Yap -Source: http://www.ncc.up.pt/~vsc/Yap/%{name}-%{version}.tar.gz +URL: http://www.ncc.up.pt/~vsc/Yap/ +Source: %{url}%{name}-%{version}.tar.gz Patch1: Yap-noni386.patch Patch2: yap-6.2.0-Locate-mysql-by-mysql_config.patch Patch3: yap-6.2.0-Install-directory-for-info-pages.patch @@ -23,15 +23,10 @@ Patch4: yap-6.2.0-Install-http-CSS-files-into-PLTARGET.patch Patch5: yap-6.2.0-Do-not-install-README-etc.patch Patch6: yap-6.2.0-Install-info-pages-non-executable.patch Patch7: yap-6.2.0-Do-not-install-info-dir-index.patch -# In upstream already -Patch8: yap-6.2.0-fix-chr-install-from-Keri.patch # fix non-x86 build with recent gcc -Patch9: yap-6.2.0-gprof-macro.patch -# Fix segfaults on PPC. Taken from Gentoo yap-6.2.0-gentoo-patchset-5.tar.gz -Patch10: yap-6.2.0-ppc-mmap-addr.patch +Patch8: yap-6.2.0-gprof-macro.patch # Fix compilation of PLStream package on PPC -Patch11: yap-6.2.0-Remove-feature-macro.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch9: yap-6.2.0-Remove-feature-macro.patch BuildRequires: autoconf BuildRequires: gmp-devel BuildRequires: mysql-devel @@ -76,7 +71,7 @@ Documentation for Yap. %prep -%setup -q -n %{name}-6 +%setup -q %patch1 -p1 %patch2 -p1 -b .mysql_config %patch3 -p1 -b .install_info_directory @@ -84,16 +79,16 @@ Documentation for Yap. %patch5 -p1 -b .do_not_install_readme %patch6 -p1 -b .non_executable_info %patch7 -p1 -b .do_not_install_info_index -%patch8 -p1 -b .fix_chr_install -%patch9 -p1 -b .macro -%patch10 -p1 -b .ppc -%patch11 -p1 -b .remove_feature_macro +%patch8 -p1 -b .macro +%patch9 -p1 -b .remove_feature_macro # remove redundant RPATH sed -i 's/-Wl,-R\(,\)\{0,1\}\\$(LIBDIR)//' configure.in # transform RPATH into RUN_PATH. Private libraries dlopen()ed depend each on # other sed -i 's/-Wl,-R/-Wl,--enable-new-dtags,-R/g' configure.in +# Add soname to library +sed -i -e 's/\(-soname=\$DYNYAPLIB\)/\1.%{version}/' configure.in # Regerenate configure because of patching autoconf @@ -103,7 +98,7 @@ autoconf # Add soname to library and symlink from unversioned to versioned one sed -i \ - -e '/@YAPLIB_LD@/ s/\(-o @YAPLIB@\)\(.*\)/-Wl,-soname=@YAPLIB@.%{version} \1.%{version}\2\n\tln -s @YAPLIB@.%{version} @YAPLIB@/' \ + -e '/@YAPLIB_LD@/ s/\(-o @YAPLIB@\)\(.*\)/\1.%{version}\2\n\tln -s @YAPLIB@.%{version} @YAPLIB@/' \ -e '/@INSTALL_DLLS@.* @YAPLIB@/ s/\(@YAPLIB@\)\(.*\)/\1.%{version}\2\n\t@LN_S@ @YAPLIB@.%{version} $(DESTDIR)$(LIBDIR)\/@YAPLIB@/' \ Makefile.in @@ -115,6 +110,7 @@ for F in README changes.css; do done for F in docs/yap.tex TO_DO; do iconv -f iso-8859-1 -t utf-8 < "$F" > "${F}.new" + sed -i -e '/mode: texinfo/ s/\(coding: \)latin-1/\1utf-8/' "${F}.new" touch -r "$F"{,.new} mv "$F"{.new,} done @@ -146,7 +142,6 @@ make %{?_smp_mflags} info %install -rm -rf $RPM_BUILD_ROOT %ifarch ppc ppc64 ulimit -s unlimited %endif @@ -205,13 +200,8 @@ fi /sbin/ldconfig -%clean -rm -rf $RPM_BUILD_ROOT - - %files -%defattr(-,root,root,-) -%doc Artistic changes* COPYING README TO_DO +%doc Artistic changes* COPYING GIT README TO_DO %if %{use_eam} %doc README.EAM.html %endif @@ -223,19 +213,20 @@ rm -rf $RPM_BUILD_ROOT %files devel -%defattr(-,root,root,-) %{_libdir}/libYap.so %{_includedir}/Yap %files docs -%defattr(-,root,root,-) %doc LGPL/pillow/doc/pillow_doc_html/* %doc LGPL/pillow/doc/article.ps.gz %doc %{documentation}/* %changelog +* Fri Dec 09 2011 Petr Pisar - 6.2.2-1 +- 6.2.2 bump + * Wed Dec 07 2011 Petr Pisar - 6.2.0-6 - Fix building on PowerPC (bug #751144) From aa1839244f5789628e2acaec42f26f725835383c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 03:25:35 -0600 Subject: [PATCH 05/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- yap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yap.spec b/yap.spec index 9602157..0a1d6b4 100644 --- a/yap.spec +++ b/yap.spec @@ -4,7 +4,7 @@ Name: yap Version: 6.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -224,6 +224,9 @@ fi %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Fri Dec 09 2011 Petr Pisar - 6.2.2-1 - 6.2.2 bump From 2eb96469003d1f3321cb1b3fb06a7f2d7b2c9cfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 23 Feb 2012 15:23:13 +0100 Subject: [PATCH 06/28] Exclude building on PPC --- yap.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/yap.spec b/yap.spec index 0a1d6b4..f9b139f 100644 --- a/yap.spec +++ b/yap.spec @@ -4,7 +4,7 @@ Name: yap Version: 6.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -27,6 +27,8 @@ Patch7: yap-6.2.0-Do-not-install-info-dir-index.patch Patch8: yap-6.2.0-gprof-macro.patch # Fix compilation of PLStream package on PPC Patch9: yap-6.2.0-Remove-feature-macro.patch +# yap 6.2.2 does not work on PPC (bug #790625) +ExcludeArch: ppc ppc64 BuildRequires: autoconf BuildRequires: gmp-devel BuildRequires: mysql-devel @@ -224,6 +226,9 @@ fi %changelog +* Thu Feb 23 2012 Petr Pisar - 6.2.2-3 +- yap 6.2.2 does not work on PPC (bug #790625) + * Sat Jan 14 2012 Fedora Release Engineering - 6.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From ee40d15c6ffa134a84d8dd1e257e28360ea7e98c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 23 Feb 2012 15:28:16 +0100 Subject: [PATCH 07/28] Remove PPC conditions from the spec --- yap.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/yap.spec b/yap.spec index f9b139f..f63fde3 100644 --- a/yap.spec +++ b/yap.spec @@ -144,9 +144,6 @@ make %{?_smp_mflags} info %install -%ifarch ppc ppc64 -ulimit -s unlimited -%endif make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install_info From 83343f6a0aaae1e6b57383a067d4ec3e4a522945 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 02:34:43 -0500 Subject: [PATCH 08/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- yap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yap.spec b/yap.spec index f63fde3..27f2c70 100644 --- a/yap.spec +++ b/yap.spec @@ -4,7 +4,7 @@ Name: yap Version: 6.2.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -223,6 +223,9 @@ fi %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 6.2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Feb 23 2012 Petr Pisar - 6.2.2-3 - yap 6.2.2 does not work on PPC (bug #790625) From 1246ea087880eec48940207420518083d9c98f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 7 Jan 2013 17:42:05 +0100 Subject: [PATCH 09/28] Fix off-by-one error when initializing yap_flags --- ...ne-error-when-initializing-yap_flags.patch | 27 +++++++++++++++++++ yap.spec | 8 +++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 yap-6.2.2-Off-by-one-error-when-initializing-yap_flags.patch diff --git a/yap-6.2.2-Off-by-one-error-when-initializing-yap_flags.patch b/yap-6.2.2-Off-by-one-error-when-initializing-yap_flags.patch new file mode 100644 index 0000000..e0b59a5 --- /dev/null +++ b/yap-6.2.2-Off-by-one-error-when-initializing-yap_flags.patch @@ -0,0 +1,27 @@ +From 1fba7f121d0f3e93faa94be4dbeba383176717f6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Mon, 7 Jan 2013 17:31:08 +0100 +Subject: [PATCH] Off-by-one error when initializing yap_flags + +The yap_flags_field of all_heap_codes structure is of type +Int[LAST_FLAG], thus the loop should iterate from 0 to LAST_FLAG - 1. +--- + C/init.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/C/init.c b/C/init.c +index dda09cc..8f01864 100755 +--- a/C/init.c ++++ b/C/init.c +@@ -1348,7 +1348,7 @@ Yap_InitWorkspace(UInt Heap, UInt Stack, UInt Trail, UInt Atts, UInt max_table_s + Yap_InitTime (); + /* InitAbsmi must be done before InitCodes */ + /* This must be done before initialising predicates */ +- for (i = 0; i <= LAST_FLAG; i++) { ++ for (i = 0; i < LAST_FLAG; i++) { + yap_flags[i] = 0; + } + #ifdef MPW +-- +1.7.11.7 + diff --git a/yap.spec b/yap.spec index 27f2c70..5b09f26 100644 --- a/yap.spec +++ b/yap.spec @@ -4,7 +4,7 @@ Name: yap Version: 6.2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -27,6 +27,8 @@ Patch7: yap-6.2.0-Do-not-install-info-dir-index.patch Patch8: yap-6.2.0-gprof-macro.patch # Fix compilation of PLStream package on PPC Patch9: yap-6.2.0-Remove-feature-macro.patch +# Reported to upstream +Patch10: yap-6.2.2-Off-by-one-error-when-initializing-yap_flags.patch # yap 6.2.2 does not work on PPC (bug #790625) ExcludeArch: ppc ppc64 BuildRequires: autoconf @@ -83,6 +85,7 @@ Documentation for Yap. %patch7 -p1 -b .do_not_install_info_index %patch8 -p1 -b .macro %patch9 -p1 -b .remove_feature_macro +%patch10 -p1 -b .initialization # remove redundant RPATH sed -i 's/-Wl,-R\(,\)\{0,1\}\\$(LIBDIR)//' configure.in @@ -223,6 +226,9 @@ fi %changelog +* Mon Jan 07 2013 Petr Pisar - 6.2.2-5 +- Fix off-by-one error when initializing yap_flags + * Sun Jul 22 2012 Fedora Release Engineering - 6.2.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From d282bdccd8b2785dc882e7fc1c1bc1541d261caf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 7 Jan 2013 18:07:53 +0100 Subject: [PATCH 10/28] Complete fix for accessing yap_flags array --- ...ne-error-when-initializing-yap_flags.patch | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/yap-6.2.2-Off-by-one-error-when-initializing-yap_flags.patch b/yap-6.2.2-Off-by-one-error-when-initializing-yap_flags.patch index e0b59a5..a376743 100644 --- a/yap-6.2.2-Off-by-one-error-when-initializing-yap_flags.patch +++ b/yap-6.2.2-Off-by-one-error-when-initializing-yap_flags.patch @@ -1,4 +1,4 @@ -From 1fba7f121d0f3e93faa94be4dbeba383176717f6 Mon Sep 17 00:00:00 2001 +From fa8f0f7b2d107770ae4d37bc77c902eafc59c86c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 7 Jan 2013 17:31:08 +0100 Subject: [PATCH] Off-by-one error when initializing yap_flags @@ -6,8 +6,9 @@ Subject: [PATCH] Off-by-one error when initializing yap_flags The yap_flags_field of all_heap_codes structure is of type Int[LAST_FLAG], thus the loop should iterate from 0 to LAST_FLAG - 1. --- - C/init.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + C/init.c | 2 +- + C/stdpreds.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/C/init.c b/C/init.c index dda09cc..8f01864 100755 @@ -22,6 +23,19 @@ index dda09cc..8f01864 100755 yap_flags[i] = 0; } #ifdef MPW +diff --git a/C/stdpreds.c b/C/stdpreds.c +index a4c0e86..8a4183f 100755 +--- a/C/stdpreds.c ++++ b/C/stdpreds.c +@@ -3637,7 +3637,7 @@ p_access_yap_flags(void) + return(FALSE); + } + flag = IntOfTerm(tflag); +- if (flag < 0 || flag > NUMBER_OF_YAP_FLAGS) { ++ if (flag < 0 || flag >= NUMBER_OF_YAP_FLAGS) { + return(FALSE); + } + #ifdef TABLING -- 1.7.11.7 From 661276ad6abe16495174c1d803640cabc7d71160 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 22:09:35 -0600 Subject: [PATCH 11/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- yap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yap.spec b/yap.spec index 5b09f26..8df7e09 100644 --- a/yap.spec +++ b/yap.spec @@ -4,7 +4,7 @@ Name: yap Version: 6.2.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -226,6 +226,9 @@ fi %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 6.2.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Mon Jan 07 2013 Petr Pisar - 6.2.2-5 - Fix off-by-one error when initializing yap_flags From bea198350f2702212bb4ff394683c42a7cf11f6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 28 Mar 2013 08:44:41 +0100 Subject: [PATCH 12/28] Update config.sub to support aarch64 --- yap.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/yap.spec b/yap.spec index 8df7e09..041dd3e 100644 --- a/yap.spec +++ b/yap.spec @@ -4,7 +4,7 @@ Name: yap Version: 6.2.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -32,6 +32,8 @@ Patch10: yap-6.2.2-Off-by-one-error-when-initializing-yap_flags.patch # yap 6.2.2 does not work on PPC (bug #790625) ExcludeArch: ppc ppc64 BuildRequires: autoconf +# Update config.sub to support aarch64, bug #926852 +BuildRequires: automake BuildRequires: gmp-devel BuildRequires: mysql-devel # TODO: BuildRequires: openmpi-devel @@ -95,6 +97,9 @@ sed -i 's/-Wl,-R/-Wl,--enable-new-dtags,-R/g' configure.in # Add soname to library sed -i -e 's/\(-soname=\$DYNYAPLIB\)/\1.%{version}/' configure.in +# Update config.sub to support aarch64, bug #926852 +cp -p %{_datadir}/automake-*/config.{sub,guess} . +cp -p %{_datadir}/automake-*/config.{sub,guess} packages/jpl # Regerenate configure because of patching autoconf @@ -226,6 +231,9 @@ fi %changelog +* Thu Mar 28 2013 Petr Pisar - 6.2.2-7 +- Update config.sub to support aarch64 (bug #926852) + * Fri Feb 15 2013 Fedora Release Engineering - 6.2.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 860508bfdc2e8b16606703bfe604361ba89e631e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 28 Mar 2013 10:20:12 +0100 Subject: [PATCH 13/28] Adjust to Texinfo 5 --- ...-not-allow-bullet-as-table-indicator.patch | 34 +++++++++++++++++++ yap.spec | 4 +++ 2 files changed, 38 insertions(+) create mode 100644 yap-6.2.2-Texinfo-5-does-not-allow-bullet-as-table-indicator.patch diff --git a/yap-6.2.2-Texinfo-5-does-not-allow-bullet-as-table-indicator.patch b/yap-6.2.2-Texinfo-5-does-not-allow-bullet-as-table-indicator.patch new file mode 100644 index 0000000..1c65631 --- /dev/null +++ b/yap-6.2.2-Texinfo-5-does-not-allow-bullet-as-table-indicator.patch @@ -0,0 +1,34 @@ +From 04fae092c7dd5e55846073887a9604e1008cbc82 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Thu, 28 Mar 2013 10:13:43 +0100 +Subject: [PATCH] Texinfo 5 does not allow @bullet as @table indicator + +From Texinfo 5 documentation: + +Write the '@table' command at the beginning of a line, after a blank +line, and follow it on the same line with an argument that is +a Texinfo "indicating" command [...] You may also use the '@asis' +command as an argument to '@table'. '@asis' is a command that does +nothing; + +Documentation for Indicating commands does not list @bullet. +--- + docs/yap.tex | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs/yap.tex b/docs/yap.tex +index 162a184..df40c71 100644 +--- a/docs/yap.tex ++++ b/docs/yap.tex +@@ -15820,7 +15820,7 @@ be lost. + We next discuss several issues on trying to make Prolog programs run + fast in YAP. We assume two different programming styles: + +-@table @bullet ++@table @asis + @item Execution of @emph{deterministic} programs often + boils down to a recursive loop of the form: + @example +-- +1.8.1.4 + diff --git a/yap.spec b/yap.spec index 041dd3e..c6e2222 100644 --- a/yap.spec +++ b/yap.spec @@ -30,6 +30,8 @@ Patch9: yap-6.2.0-Remove-feature-macro.patch # Reported to upstream Patch10: yap-6.2.2-Off-by-one-error-when-initializing-yap_flags.patch # yap 6.2.2 does not work on PPC (bug #790625) +# Reported to upstream +Patch11: yap-6.2.2-Texinfo-5-does-not-allow-bullet-as-table-indicator.patch ExcludeArch: ppc ppc64 BuildRequires: autoconf # Update config.sub to support aarch64, bug #926852 @@ -88,6 +90,7 @@ Documentation for Yap. %patch8 -p1 -b .macro %patch9 -p1 -b .remove_feature_macro %patch10 -p1 -b .initialization +%patch11 -p1 -b .texinfo5 # remove redundant RPATH sed -i 's/-Wl,-R\(,\)\{0,1\}\\$(LIBDIR)//' configure.in @@ -233,6 +236,7 @@ fi %changelog * Thu Mar 28 2013 Petr Pisar - 6.2.2-7 - Update config.sub to support aarch64 (bug #926852) +- Adjust to Texinfo 5 * Fri Feb 15 2013 Fedora Release Engineering - 6.2.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 471f4747fd145eef3dbeda8ba3335521d3aad398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 28 Mar 2013 10:34:18 +0100 Subject: [PATCH 14/28] Correct changelog dates --- yap.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yap.spec b/yap.spec index c6e2222..6895818 100644 --- a/yap.spec +++ b/yap.spec @@ -367,7 +367,7 @@ fi * Sat Jun 18 2005 Gerard Milmeister - 4.5.5-3 - Compiler fix for FC4 -* Fri Apr 7 2005 Michael Schwendt +* Fri Apr 6 2005 Michael Schwendt - rebuilt * Sat Feb 12 2005 Gerard Milmeister - 0:4.5.5-1 From 8fb0cbeeaae9771ee0592508af87e2f6caae6690 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 04:29:42 -0500 Subject: [PATCH 15/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- yap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yap.spec b/yap.spec index 6895818..4212c3f 100644 --- a/yap.spec +++ b/yap.spec @@ -4,7 +4,7 @@ Name: yap Version: 6.2.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -234,6 +234,9 @@ fi %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 6.2.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Mar 28 2013 Petr Pisar - 6.2.2-7 - Update config.sub to support aarch64 (bug #926852) - Adjust to Texinfo 5 From 3ec3d93b126d082183e3c86f6eb250f5527e2507 Mon Sep 17 00:00:00 2001 From: Jaromir Capik Date: Mon, 19 May 2014 16:20:11 +0200 Subject: [PATCH 16/28] Replacing ppc64 with the power64 macro --- yap.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/yap.spec b/yap.spec index 4212c3f..1a1da21 100644 --- a/yap.spec +++ b/yap.spec @@ -4,7 +4,7 @@ Name: yap Version: 6.2.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -32,7 +32,7 @@ Patch10: yap-6.2.2-Off-by-one-error-when-initializing-yap_flags.patch # yap 6.2.2 does not work on PPC (bug #790625) # Reported to upstream Patch11: yap-6.2.2-Texinfo-5-does-not-allow-bullet-as-table-indicator.patch -ExcludeArch: ppc ppc64 +ExcludeArch: ppc %{power64} BuildRequires: autoconf # Update config.sub to support aarch64, bug #926852 BuildRequires: automake @@ -234,6 +234,9 @@ fi %changelog +* Mon May 19 2014 Jaromir Capik - 6.2.2-9 +- Replacing ppc64 with the power64 macro + * Sun Aug 04 2013 Fedora Release Engineering - 6.2.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From ebcec3e68867b76484a61b82327ad8d59d091c2b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 12:43:06 -0500 Subject: [PATCH 17/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- yap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yap.spec b/yap.spec index 1a1da21..1502b37 100644 --- a/yap.spec +++ b/yap.spec @@ -4,7 +4,7 @@ Name: yap Version: 6.2.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -234,6 +234,9 @@ fi %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 6.2.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon May 19 2014 Jaromir Capik - 6.2.2-9 - Replacing ppc64 with the power64 macro From cf30181d806f6c9ea8f49b494f2b2484c0eb1933 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 11:18:10 +0000 Subject: [PATCH 18/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- yap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yap.spec b/yap.spec index 1502b37..734d1d0 100644 --- a/yap.spec +++ b/yap.spec @@ -4,7 +4,7 @@ Name: yap Version: 6.2.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -234,6 +234,9 @@ fi %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 6.2.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 6.2.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From e1d0a468a6cea0881564e0fc671cb4f14cb0befe Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 20 Aug 2014 17:34:00 -0600 Subject: [PATCH 19/28] Rebuild for rpm bug 1131892 --- yap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yap.spec b/yap.spec index 734d1d0..c88e9c3 100644 --- a/yap.spec +++ b/yap.spec @@ -4,7 +4,7 @@ Name: yap Version: 6.2.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -234,6 +234,9 @@ fi %changelog +* Wed Aug 20 2014 Kevin Fenzi - 6.2.2-12 +- Rebuild for rpm bug 1131892 + * Mon Aug 18 2014 Fedora Release Engineering - 6.2.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From cbff981ec5af2f6649ef0ceb3d285bce1fe806b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 12 Feb 2015 17:56:03 +0100 Subject: [PATCH 20/28] Fix regression with GCC 5.0 --- ...template-defined-in-a-class-cannot-b.patch | 62 +++++++++++++++++++ yap.spec | 9 ++- 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 yap-6.2.2-Friend-function-template-defined-in-a-class-cannot-b.patch diff --git a/yap-6.2.2-Friend-function-template-defined-in-a-class-cannot-b.patch b/yap-6.2.2-Friend-function-template-defined-in-a-class-cannot-b.patch new file mode 100644 index 0000000..6a018c8 --- /dev/null +++ b/yap-6.2.2-Friend-function-template-defined-in-a-class-cannot-b.patch @@ -0,0 +1,62 @@ +From 92d5303c23fcc698233b754fc8f180df1fa2aa9b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Thu, 12 Feb 2015 17:37:57 +0100 +Subject: [PATCH] Friend function template defined in a class cannot be used + without ADL +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +GCC 5.0 stopped searching friend function templates without ADL. + +The Clause_new() function can be kept a friend but must be defined out +of scope of the Clause class, or the callers must use fully +qualificated name (Clause::Clause_new()) and the method must be +changed from friend to static. + +So far my poor C++ knowledge. + +Signed-off-by: Petr Písař +--- + packages/swi-minisat2/C/Solver.C | 4 ++-- + packages/swi-minisat2/C/SolverTypes.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/packages/swi-minisat2/C/Solver.C b/packages/swi-minisat2/C/Solver.C +index 2de3e6d..1bcdbff 100644 +--- a/packages/swi-minisat2/C/Solver.C ++++ b/packages/swi-minisat2/C/Solver.C +@@ -120,7 +120,7 @@ bool Solver::addClause(vec& ps) + uncheckedEnqueue(ps[0]); + return ok = (propagate() == NULL); + }else{ +- Clause* c = Clause_new(ps, false); ++ Clause* c = Clause::Clause_new(ps, false); + clauses.push(c); + attachClause(*c); + } +@@ -599,7 +599,7 @@ lbool Solver::search(int nof_conflicts, int nof_learnts) + if (learnt_clause.size() == 1){ + uncheckedEnqueue(learnt_clause[0]); + }else{ +- Clause* c = Clause_new(learnt_clause, true); ++ Clause* c = Clause::Clause_new(learnt_clause, true); + learnts.push(c); + attachClause(*c); + claBumpActivity(*c); +diff --git a/packages/swi-minisat2/C/SolverTypes.h b/packages/swi-minisat2/C/SolverTypes.h +index 47e3023..919b60b 100644 +--- a/packages/swi-minisat2/C/SolverTypes.h ++++ b/packages/swi-minisat2/C/SolverTypes.h +@@ -119,7 +119,7 @@ public: + + // -- use this function instead: + template +- friend Clause* Clause_new(const V& ps, bool learnt = false) { ++ static Clause* Clause_new(const V& ps, bool learnt = false) { + assert(sizeof(Lit) == sizeof(uint32_t)); + assert(sizeof(float) == sizeof(uint32_t)); + void* mem = malloc(sizeof(Clause) + sizeof(uint32_t)*(ps.size())); +-- +1.9.3 + diff --git a/yap.spec b/yap.spec index c88e9c3..df96215 100644 --- a/yap.spec +++ b/yap.spec @@ -4,7 +4,7 @@ Name: yap Version: 6.2.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -32,6 +32,9 @@ Patch10: yap-6.2.2-Off-by-one-error-when-initializing-yap_flags.patch # yap 6.2.2 does not work on PPC (bug #790625) # Reported to upstream Patch11: yap-6.2.2-Texinfo-5-does-not-allow-bullet-as-table-indicator.patch +# Fix regression with GCC 5.0 +# +Patch12: yap-6.2.2-Friend-function-template-defined-in-a-class-cannot-b.patch ExcludeArch: ppc %{power64} BuildRequires: autoconf # Update config.sub to support aarch64, bug #926852 @@ -91,6 +94,7 @@ Documentation for Yap. %patch9 -p1 -b .remove_feature_macro %patch10 -p1 -b .initialization %patch11 -p1 -b .texinfo5 +%patch12 -p1 -b .gcc5 # remove redundant RPATH sed -i 's/-Wl,-R\(,\)\{0,1\}\\$(LIBDIR)//' configure.in @@ -234,6 +238,9 @@ fi %changelog +* Thu Feb 12 2015 Petr Pisar - 6.2.2-13 +- Fix regression with GCC 5.0 + * Wed Aug 20 2014 Kevin Fenzi - 6.2.2-12 - Rebuild for rpm bug 1131892 From f1f40796f7f5bb4e39b97d9641889238b9e4c53e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 15 Apr 2015 13:32:41 +0200 Subject: [PATCH 21/28] Disable private malloc on AArch64 --- yap.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/yap.spec b/yap.spec index df96215..43fab95 100644 --- a/yap.spec +++ b/yap.spec @@ -4,7 +4,7 @@ Name: yap Version: 6.2.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -141,7 +141,13 @@ find -name '*.c' -exec chmod 0644 '{}' ';' %build # % define optflags $(echo $RPM_OPT_FLAGS | sed 's|-fstack-protector||') +# Private malloc does not work on AArch64, bug #1142068 %configure \ +%ifarch aarch64 + --enable-use-malloc \ +%else + --disable-use-malloc \ +%endif --enable-coroutining \ --enable-max-performance \ --enable-depth-limit \ @@ -238,6 +244,9 @@ fi %changelog +* Wed Apr 15 2015 Petr Pisar - 6.2.2-14 +- Disable private malloc on AArch64 (bug #1142068) + * Thu Feb 12 2015 Petr Pisar - 6.2.2-13 - Fix regression with GCC 5.0 From 9eb7f8bbf3bc7dfe5fe2b8595d317cc70d82496f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 15 Apr 2015 13:34:36 +0200 Subject: [PATCH 22/28] Correct change log entry date --- yap.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yap.spec b/yap.spec index 43fab95..1b82436 100644 --- a/yap.spec +++ b/yap.spec @@ -398,7 +398,7 @@ fi * Sat Jun 18 2005 Gerard Milmeister - 4.5.5-3 - Compiler fix for FC4 -* Fri Apr 6 2005 Michael Schwendt +* Wed Apr 6 2005 Michael Schwendt - rebuilt * Sat Feb 12 2005 Gerard Milmeister - 0:4.5.5-1 From 0b81d6a014891a3e33ced71811bb61345b22b49a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:34:51 +0000 Subject: [PATCH 23/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- yap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yap.spec b/yap.spec index 1b82436..affc182 100644 --- a/yap.spec +++ b/yap.spec @@ -4,7 +4,7 @@ Name: yap Version: 6.2.2 -Release: 14%{?dist} +Release: 15%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -244,6 +244,9 @@ fi %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 6.2.2-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Apr 15 2015 Petr Pisar - 6.2.2-14 - Disable private malloc on AArch64 (bug #1142068) From 5f9640eb9778787b2535b4bd831f8eb4bf2a1262 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 16 Dec 2015 02:56:21 +0000 Subject: [PATCH 24/28] Disable private malloc on power64 too --- yap.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/yap.spec b/yap.spec index affc182..df19a1e 100644 --- a/yap.spec +++ b/yap.spec @@ -4,7 +4,7 @@ Name: yap Version: 6.2.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -35,7 +35,7 @@ Patch11: yap-6.2.2-Texinfo-5-does-not-allow-bullet-as-table-indicator.patch # Fix regression with GCC 5.0 # Patch12: yap-6.2.2-Friend-function-template-defined-in-a-class-cannot-b.patch -ExcludeArch: ppc %{power64} + BuildRequires: autoconf # Update config.sub to support aarch64, bug #926852 BuildRequires: automake @@ -104,7 +104,7 @@ sed -i 's/-Wl,-R/-Wl,--enable-new-dtags,-R/g' configure.in # Add soname to library sed -i -e 's/\(-soname=\$DYNYAPLIB\)/\1.%{version}/' configure.in -# Update config.sub to support aarch64, bug #926852 +# Update config.sub to support aarch64/ppc64le, bug #926852 cp -p %{_datadir}/automake-*/config.{sub,guess} . cp -p %{_datadir}/automake-*/config.{sub,guess} packages/jpl # Regerenate configure because of patching @@ -143,7 +143,7 @@ find -name '*.c' -exec chmod 0644 '{}' ';' # % define optflags $(echo $RPM_OPT_FLAGS | sed 's|-fstack-protector||') # Private malloc does not work on AArch64, bug #1142068 %configure \ -%ifarch aarch64 +%ifarch aarch64 %{power64} --enable-use-malloc \ %else --disable-use-malloc \ @@ -244,6 +244,9 @@ fi %changelog +* Wed Dec 16 2015 Peter Robinson 6.2.2-16 +- Disable private malloc on power64 too + * Fri Jun 19 2015 Fedora Release Engineering - 6.2.2-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 730725ba455e29881cc0b07e7261968cff791288 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:56:07 +0000 Subject: [PATCH 25/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- yap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yap.spec b/yap.spec index df19a1e..c6a5730 100644 --- a/yap.spec +++ b/yap.spec @@ -4,7 +4,7 @@ Name: yap Version: 6.2.2 -Release: 16%{?dist} +Release: 17%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -244,6 +244,9 @@ fi %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 6.2.2-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Dec 16 2015 Peter Robinson 6.2.2-16 - Disable private malloc on power64 too From b15a44e6ad8b70cd4eb553d12ecd39223ae00b59 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 12 Jan 2017 17:30:45 +0100 Subject: [PATCH 26/28] Rebuild for readline 7.x Signed-off-by: Igor Gnatenko --- yap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yap.spec b/yap.spec index c6a5730..9d2b5f4 100644 --- a/yap.spec +++ b/yap.spec @@ -4,7 +4,7 @@ Name: yap Version: 6.2.2 -Release: 17%{?dist} +Release: 18%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -244,6 +244,9 @@ fi %changelog +* Thu Jan 12 2017 Igor Gnatenko - 6.2.2-18 +- Rebuild for readline 7.x + * Fri Feb 05 2016 Fedora Release Engineering - 6.2.2-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 45b1c0bc9a8ac301cd5c42105d1e282748823baa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 18:14:49 +0000 Subject: [PATCH 27/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- yap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yap.spec b/yap.spec index 9d2b5f4..cd0443a 100644 --- a/yap.spec +++ b/yap.spec @@ -4,7 +4,7 @@ Name: yap Version: 6.2.2 -Release: 18%{?dist} +Release: 19%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -244,6 +244,9 @@ fi %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 6.2.2-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Jan 12 2017 Igor Gnatenko - 6.2.2-18 - Rebuild for readline 7.x From 124682cb274ffe980744b2fadc0d0dde2f294dc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 3 Mar 2017 13:08:03 +0100 Subject: [PATCH 28/28] Fails to build with GCC 7, upstream does not respond (bug #1421711). --- .gitignore | 7 - Yap-5.1.3-soname.patch | 42 -- Yap-noni386.patch | 11 - dead.package | 1 + sources | 1 - yap-6.2.0-Do-not-install-README-etc.patch | 26 -- yap-6.2.0-Do-not-install-info-dir-index.patch | 32 -- ...2.0-Install-directory-for-info-pages.patch | 24 - ...Install-http-CSS-files-into-PLTARGET.patch | 30 -- ....0-Install-info-pages-non-executable.patch | 34 -- yap-6.2.0-Locate-mysql-by-mysql_config.patch | 25 - yap-6.2.0-Remove-feature-macro.patch | 27 -- yap-6.2.0-gprof-macro.patch | 14 - ...template-defined-in-a-class-cannot-b.patch | 62 --- ...ne-error-when-initializing-yap_flags.patch | 41 -- ...-not-allow-bullet-as-table-indicator.patch | 34 -- yap.spec | 429 ------------------ 17 files changed, 1 insertion(+), 839 deletions(-) delete mode 100644 .gitignore delete mode 100644 Yap-5.1.3-soname.patch delete mode 100644 Yap-noni386.patch create mode 100644 dead.package delete mode 100644 sources delete mode 100644 yap-6.2.0-Do-not-install-README-etc.patch delete mode 100644 yap-6.2.0-Do-not-install-info-dir-index.patch delete mode 100644 yap-6.2.0-Install-directory-for-info-pages.patch delete mode 100644 yap-6.2.0-Install-http-CSS-files-into-PLTARGET.patch delete mode 100644 yap-6.2.0-Install-info-pages-non-executable.patch delete mode 100644 yap-6.2.0-Locate-mysql-by-mysql_config.patch delete mode 100644 yap-6.2.0-Remove-feature-macro.patch delete mode 100644 yap-6.2.0-gprof-macro.patch delete mode 100644 yap-6.2.2-Friend-function-template-defined-in-a-class-cannot-b.patch delete mode 100644 yap-6.2.2-Off-by-one-error-when-initializing-yap_flags.patch delete mode 100644 yap-6.2.2-Texinfo-5-does-not-allow-bullet-as-table-indicator.patch delete mode 100644 yap.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 6225908..0000000 --- a/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -Yap-5.1.3.tar.gz -chr_translate_bootstrap1.pl -chr_translate_bootstrap2.pl -chr_translate.pl -guard_entailment.pl -/yap-6.2.0.tar.gz -/yap-6.2.2.tar.gz diff --git a/Yap-5.1.3-soname.patch b/Yap-5.1.3-soname.patch deleted file mode 100644 index d05937a..0000000 --- a/Yap-5.1.3-soname.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -up Yap-5.1.3/Makefile.in.soname Yap-5.1.3/Makefile.in ---- Yap-5.1.3/Makefile.in.soname 2009-06-15 22:12:57.000000000 +0200 -+++ Yap-5.1.3/Makefile.in 2009-06-15 21:59:18.000000000 +0200 -@@ -578,16 +578,16 @@ startup: yap@EXEC_SUFFIX@ $(PL_SOURCES) - -rm -f startup - echo "bootstrap('$(srcdir)/pl/init.yap'). module(user). save_program(startup)." | @CROSS_SIMULATOR@ ./yap -b $(srcdir)/pl/boot.yap - --yap@EXEC_SUFFIX@: $(HEADERS) yap.o @YAPLIB@.5.1.3 -- $(MPI_CC) $(STANDARD_CFLAGS) $(LDFLAGS) -o yap yap.o @YAPLIB@.5.1.3 $(LIBS) @MPI_LIBS@ -+yap@EXEC_SUFFIX@: $(HEADERS) yap.o @YAPLIB@ -+ $(MPI_CC) $(STANDARD_CFLAGS) $(LDFLAGS) -o yap yap.o @YAPLIB@ $(LIBS) @MPI_LIBS@ - - libYap.a: $(LIB_OBJECTS) - -rm -f libYap.a - $(AR) rc libYap.a $(LIB_OBJECTS) - $(RANLIB) libYap.a - --@DYNYAPLIB@.5.1.3: $(LIB_OBJECTS) -- @DYNLIB_LD@ -Wl,-soname=@YAPLIB@.5.1.3 -o @YAPLIB@.5.1.3 $(LIB_OBJECTS) $(LIBS) $(LDFLGS) -+@DYNYAPLIB@: $(LIB_OBJECTS) -+ @DYNLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLGS) - - install: install_bin install_data - -@@ -598,7 +598,7 @@ install_unix: startup libYap.a - $(INSTALL_PROGRAM) -m 755 yap@EXEC_SUFFIX@ $(DESTDIR)$(BINDIR)/yap - mkdir -p $(DESTDIR)$(YAPLIBDIR) - $(INSTALL_DATA) startup $(DESTDIR)$(YAPLIBDIR)/startup -- @INSTALL_DLLS@ $(INSTALL_DATA) -m 755 @YAPLIB@.5.1.3 $(DESTDIR)$(LIBDIR) -+ @INSTALL_DLLS@ $(INSTALL_DATA) -m 755 @YAPLIB@ $(DESTDIR)$(LIBDIR) - mkdir -p $(DESTDIR)$(SHAREDIR)/Yap - mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/pl - mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/swi -@@ -643,7 +643,7 @@ install_win32: startup - (cd library/tries; make install) - @ENABLE_CPLINT@ (cd cplint; make install) - --install_library: @YAPLIB@.5.1.3 -+install_library: @YAPLIB@ - mkdir -p $(DESTDIR)$(INCLUDEDIR) - for h in $(HEADERS); do $(INSTALL) $$h $(DESTDIR)$(INCLUDEDIR); done - diff --git a/Yap-noni386.patch b/Yap-noni386.patch deleted file mode 100644 index ce01f3f..0000000 --- a/Yap-noni386.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Yap-4.5.5/H/absmi.h.noni386 2005-06-18 15:52:24.000000000 +0200 -+++ Yap-4.5.5/H/absmi.h 2005-06-18 15:52:34.000000000 +0200 -@@ -282,7 +282,7 @@ - - #define CACHE_A1() (SREG = (CELL *)ARG1) - --#define CACHED_A1() ((CELL)SREG) -+#define CACHED_A1() SREG - - #endif /* S_IN_MEM */ - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..9ed1316 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Fails to build with GCC 7, upstream does not respond (bug #1421711). diff --git a/sources b/sources deleted file mode 100644 index cf4d846..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -5010225464ffe8b2aa3e0bca9d935937 yap-6.2.2.tar.gz diff --git a/yap-6.2.0-Do-not-install-README-etc.patch b/yap-6.2.0-Do-not-install-README-etc.patch deleted file mode 100644 index b5a4b57..0000000 --- a/yap-6.2.0-Do-not-install-README-etc.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d9acef3be4ca926d0f138184535e3f16b15d6045 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Wed, 22 Dec 2010 09:31:28 +0100 -Subject: [PATCH] Do not install README etc. - ---- - Makefile.in | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 522ac0a..8f37d05 100755 ---- a/Makefile.in -+++ b/Makefile.in -@@ -554,9 +554,6 @@ install_unix: startup.yss libYap.a - mkdir -p $(DESTDIR)$(SHAREDIR)/Yap - mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/pl - mkdir -p $(DESTDIR)$(DOCSDIR) -- $(INSTALL) $(srcdir)/Artistic $(DESTDIR)$(DOCSDIR) -- $(INSTALL) $(srcdir)/README $(DESTDIR)$(DOCSDIR) -- $(INSTALL) $(srcdir)/COPYING $(DESTDIR)$(DOCSDIR) - for f in $(PL_SOURCES); do $(INSTALL) $$f $(DESTDIR)$(SHAREDIR)/Yap/pl; done - @INSTALL_DLLS@ (cd packages/PLStream; $(MAKE) install) - @INSTALL_DLLS@ (cd library/lammpi; $(MAKE) install) --- -1.7.3.4 - diff --git a/yap-6.2.0-Do-not-install-info-dir-index.patch b/yap-6.2.0-Do-not-install-info-dir-index.patch deleted file mode 100644 index 6cc701d..0000000 --- a/yap-6.2.0-Do-not-install-info-dir-index.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 07a8f2b1e905d9133c057d2a2d83a2b7a5bb44ba Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Wed, 22 Dec 2010 10:59:06 +0100 -Subject: [PATCH] Do not install info dir index - ---- - Makefile.in | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index c513d0c..cbdfcaf 100755 ---- a/Makefile.in -+++ b/Makefile.in -@@ -717,7 +717,6 @@ install_info: - gzip --quiet --force $(DESTDIR)$(INFODIR)/yap.info*; \ - fi \ - fi; \ -- $(INSTALL_INFO) --quiet --section "Programming Languages" yap.info $(DESTDIR)$(INFODIR)/dir; \ - cd $(srcdir)/LGPL/pillow/doc ; \ - $(INSTALL_DATA) pillow_doc.info $(DESTDIR)$(INFODIR); \ - if test -e $(DESTDIR)$(INFODIR)/emacs.bz2; then \ -@@ -727,7 +726,6 @@ install_info: - gzip --quiet --force $(DESTDIR)$(INFODIR)/pillow_doc.info; \ - fi \ - fi; \ -- $(INSTALL_INFO) --quiet --section "Programming Languages" --entry="`cat pillow_doc.infoindex`" --info-dir=$(DESTDIR)$(INFODIR) pillow_doc.info - - install_docs: - $(MAKE) pdf --- -1.7.3.4 - diff --git a/yap-6.2.0-Install-directory-for-info-pages.patch b/yap-6.2.0-Install-directory-for-info-pages.patch deleted file mode 100644 index cbe8fb5..0000000 --- a/yap-6.2.0-Install-directory-for-info-pages.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d6ce7191c9dcac1681a2b29d68db0858133405c3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Tue, 21 Dec 2010 11:31:37 +0100 -Subject: [PATCH] Install directory for info pages - ---- - Makefile.in | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 5fbf662..522ac0a 100755 ---- a/Makefile.in -+++ b/Makefile.in -@@ -711,6 +711,7 @@ yap.dll: libYap.a - - install_info: - $(MAKE) info; \ -+ mkdir -p $(DESTDIR)$(INFODIR); \ - $(INSTALL) yap.info* $(DESTDIR)$(INFODIR); \ - if test -e $(DESTDIR)$(INFODIR)/emacs.bz2; then \ - bzip2 --quiet --force $(DESTDIR)$(INFODIR)/yap.info*; \ --- -1.7.3.4 - diff --git a/yap-6.2.0-Install-http-CSS-files-into-PLTARGET.patch b/yap-6.2.0-Install-http-CSS-files-into-PLTARGET.patch deleted file mode 100644 index 6b3f949..0000000 --- a/yap-6.2.0-Install-http-CSS-files-into-PLTARGET.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 1ea44f8db749d81a790c55d63bfa4c1dbd5cb211 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Tue, 21 Dec 2010 12:59:55 +0100 -Subject: [PATCH] Install http CSS files into PLTARGET - ---- - packages/http/Makefile.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/packages/http/Makefile.in b/packages/http/Makefile.in -index 8609697..1c3dbda 100755 ---- a/packages/http/Makefile.in -+++ b/packages/http/Makefile.in -@@ -111,11 +111,11 @@ install: $(LIBPL) $(SOLIBS) - $(INSTALL_PROGRAM) $(SOLIBS) $(BINTARGET) - mkdir -p $(PLTARGET) - mkdir -p $(PLTARGET)/web/icons -- mkdir -p $(DESTDIR)$(LIBDIR)/web/css -+ mkdir -p $(PLTARGET)/web/css - $(INSTALL_DATA) $(LIBPL) $(PLTARGET) - $(INSTALL_DATA) $(srcdir)/README $(PLTARGET) - $(INSTALL_DATA) $(srcdir)/web/icons/*.png $(PLTARGET)/web/icons -- $(INSTALL_DATA) $(srcdir)/web/css/*.css $(DESTDIR)$(LIBDIR)/web/css -+ $(INSTALL_DATA) $(srcdir)/web/css/*.css $(PLTARGET)/web/css - $(PL) -f none -g make -t halt - - ln-install: $(LIBPL) --- -1.7.3.4 - diff --git a/yap-6.2.0-Install-info-pages-non-executable.patch b/yap-6.2.0-Install-info-pages-non-executable.patch deleted file mode 100644 index 44b2837..0000000 --- a/yap-6.2.0-Install-info-pages-non-executable.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 84f7e2e5ac18dd130d1656b677d40ebdd7cda9a1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Wed, 22 Dec 2010 10:18:17 +0100 -Subject: [PATCH] Install info pages non-executable - ---- - Makefile.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 8f37d05..c513d0c 100755 ---- a/Makefile.in -+++ b/Makefile.in -@@ -709,7 +709,7 @@ yap.dll: libYap.a - install_info: - $(MAKE) info; \ - mkdir -p $(DESTDIR)$(INFODIR); \ -- $(INSTALL) yap.info* $(DESTDIR)$(INFODIR); \ -+ $(INSTALL_DATA) yap.info* $(DESTDIR)$(INFODIR); \ - if test -e $(DESTDIR)$(INFODIR)/emacs.bz2; then \ - bzip2 --quiet --force $(DESTDIR)$(INFODIR)/yap.info*; \ - else \ -@@ -719,7 +719,7 @@ install_info: - fi; \ - $(INSTALL_INFO) --quiet --section "Programming Languages" yap.info $(DESTDIR)$(INFODIR)/dir; \ - cd $(srcdir)/LGPL/pillow/doc ; \ -- $(INSTALL) pillow_doc.info $(DESTDIR)$(INFODIR); \ -+ $(INSTALL_DATA) pillow_doc.info $(DESTDIR)$(INFODIR); \ - if test -e $(DESTDIR)$(INFODIR)/emacs.bz2; then \ - bzip2 --quiet --force $(DESTDIR)$(INFODIR)/pillow_doc.info; \ - else \ --- -1.7.3.4 - diff --git a/yap-6.2.0-Locate-mysql-by-mysql_config.patch b/yap-6.2.0-Locate-mysql-by-mysql_config.patch deleted file mode 100644 index ae81528..0000000 --- a/yap-6.2.0-Locate-mysql-by-mysql_config.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 131213c12d09cdce8a56b5148ce753b0f5ae8e77 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Tue, 21 Dec 2010 10:32:02 +0100 -Subject: [PATCH] Locate mysql by mysql_config - ---- - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.in b/configure.in -index 4ce9538..80208e5 100755 ---- a/configure.in -+++ b/configure.in -@@ -665,7 +665,7 @@ then - if test "$yap_cv_mysql" = yes - then - YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_MYSQL" -- LIBS="$LIBS -L${yap_cv_myddas}/lib/mysql -lmysqlclient " -+ LIBS="$LIBS $(mysql_config --libs) " - fi - - dnl check for odbc --- -1.7.3.4 - diff --git a/yap-6.2.0-Remove-feature-macro.patch b/yap-6.2.0-Remove-feature-macro.patch deleted file mode 100644 index 75201ee..0000000 --- a/yap-6.2.0-Remove-feature-macro.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9419d68dc09a4e3f7adfe7e654ef3952327cd9bf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Wed, 7 Dec 2011 14:14:25 +0100 -Subject: [PATCH] Remove feature macro - -This macro clashes with struct ppc_debug_info member in -on PPC. The macro is not used anywhere in yap. ---- - packages/PLStream/pl-incl.h | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/packages/PLStream/pl-incl.h b/packages/PLStream/pl-incl.h -index aa7b99c..8bf63de 100755 ---- a/packages/PLStream/pl-incl.h -+++ b/packages/PLStream/pl-incl.h -@@ -363,8 +363,6 @@ typedef struct PL_local_data { - - #define usedStack(D) 0 - --#define features (LD->feature.mask) -- - extern PL_local_data_t lds; - - #define exception_term (LD->exception.term) --- -1.7.7.4 - diff --git a/yap-6.2.0-gprof-macro.patch b/yap-6.2.0-gprof-macro.patch deleted file mode 100644 index 1d18164..0000000 --- a/yap-6.2.0-gprof-macro.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up yap-6/C/gprof.c.macro yap-6/C/gprof.c ---- yap-6/C/gprof.c.macro 2011-06-23 14:45:25.000000000 +0200 -+++ yap-6/C/gprof.c 2011-06-23 14:45:43.000000000 +0200 -@@ -102,8 +102,8 @@ typedef greg_t context_reg; - - #else - --#define CONTEXT_PC NULL --#define CONTEXT_BP NULL -+#define CONTEXT_PC(scv) NULL -+#define CONTEXT_BP(scv) NULL - - #endif - diff --git a/yap-6.2.2-Friend-function-template-defined-in-a-class-cannot-b.patch b/yap-6.2.2-Friend-function-template-defined-in-a-class-cannot-b.patch deleted file mode 100644 index 6a018c8..0000000 --- a/yap-6.2.2-Friend-function-template-defined-in-a-class-cannot-b.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 92d5303c23fcc698233b754fc8f180df1fa2aa9b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Thu, 12 Feb 2015 17:37:57 +0100 -Subject: [PATCH] Friend function template defined in a class cannot be used - without ADL -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -GCC 5.0 stopped searching friend function templates without ADL. - -The Clause_new() function can be kept a friend but must be defined out -of scope of the Clause class, or the callers must use fully -qualificated name (Clause::Clause_new()) and the method must be -changed from friend to static. - -So far my poor C++ knowledge. - -Signed-off-by: Petr Písař ---- - packages/swi-minisat2/C/Solver.C | 4 ++-- - packages/swi-minisat2/C/SolverTypes.h | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/packages/swi-minisat2/C/Solver.C b/packages/swi-minisat2/C/Solver.C -index 2de3e6d..1bcdbff 100644 ---- a/packages/swi-minisat2/C/Solver.C -+++ b/packages/swi-minisat2/C/Solver.C -@@ -120,7 +120,7 @@ bool Solver::addClause(vec& ps) - uncheckedEnqueue(ps[0]); - return ok = (propagate() == NULL); - }else{ -- Clause* c = Clause_new(ps, false); -+ Clause* c = Clause::Clause_new(ps, false); - clauses.push(c); - attachClause(*c); - } -@@ -599,7 +599,7 @@ lbool Solver::search(int nof_conflicts, int nof_learnts) - if (learnt_clause.size() == 1){ - uncheckedEnqueue(learnt_clause[0]); - }else{ -- Clause* c = Clause_new(learnt_clause, true); -+ Clause* c = Clause::Clause_new(learnt_clause, true); - learnts.push(c); - attachClause(*c); - claBumpActivity(*c); -diff --git a/packages/swi-minisat2/C/SolverTypes.h b/packages/swi-minisat2/C/SolverTypes.h -index 47e3023..919b60b 100644 ---- a/packages/swi-minisat2/C/SolverTypes.h -+++ b/packages/swi-minisat2/C/SolverTypes.h -@@ -119,7 +119,7 @@ public: - - // -- use this function instead: - template -- friend Clause* Clause_new(const V& ps, bool learnt = false) { -+ static Clause* Clause_new(const V& ps, bool learnt = false) { - assert(sizeof(Lit) == sizeof(uint32_t)); - assert(sizeof(float) == sizeof(uint32_t)); - void* mem = malloc(sizeof(Clause) + sizeof(uint32_t)*(ps.size())); --- -1.9.3 - diff --git a/yap-6.2.2-Off-by-one-error-when-initializing-yap_flags.patch b/yap-6.2.2-Off-by-one-error-when-initializing-yap_flags.patch deleted file mode 100644 index a376743..0000000 --- a/yap-6.2.2-Off-by-one-error-when-initializing-yap_flags.patch +++ /dev/null @@ -1,41 +0,0 @@ -From fa8f0f7b2d107770ae4d37bc77c902eafc59c86c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Mon, 7 Jan 2013 17:31:08 +0100 -Subject: [PATCH] Off-by-one error when initializing yap_flags - -The yap_flags_field of all_heap_codes structure is of type -Int[LAST_FLAG], thus the loop should iterate from 0 to LAST_FLAG - 1. ---- - C/init.c | 2 +- - C/stdpreds.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/C/init.c b/C/init.c -index dda09cc..8f01864 100755 ---- a/C/init.c -+++ b/C/init.c -@@ -1348,7 +1348,7 @@ Yap_InitWorkspace(UInt Heap, UInt Stack, UInt Trail, UInt Atts, UInt max_table_s - Yap_InitTime (); - /* InitAbsmi must be done before InitCodes */ - /* This must be done before initialising predicates */ -- for (i = 0; i <= LAST_FLAG; i++) { -+ for (i = 0; i < LAST_FLAG; i++) { - yap_flags[i] = 0; - } - #ifdef MPW -diff --git a/C/stdpreds.c b/C/stdpreds.c -index a4c0e86..8a4183f 100755 ---- a/C/stdpreds.c -+++ b/C/stdpreds.c -@@ -3637,7 +3637,7 @@ p_access_yap_flags(void) - return(FALSE); - } - flag = IntOfTerm(tflag); -- if (flag < 0 || flag > NUMBER_OF_YAP_FLAGS) { -+ if (flag < 0 || flag >= NUMBER_OF_YAP_FLAGS) { - return(FALSE); - } - #ifdef TABLING --- -1.7.11.7 - diff --git a/yap-6.2.2-Texinfo-5-does-not-allow-bullet-as-table-indicator.patch b/yap-6.2.2-Texinfo-5-does-not-allow-bullet-as-table-indicator.patch deleted file mode 100644 index 1c65631..0000000 --- a/yap-6.2.2-Texinfo-5-does-not-allow-bullet-as-table-indicator.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 04fae092c7dd5e55846073887a9604e1008cbc82 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Thu, 28 Mar 2013 10:13:43 +0100 -Subject: [PATCH] Texinfo 5 does not allow @bullet as @table indicator - -From Texinfo 5 documentation: - -Write the '@table' command at the beginning of a line, after a blank -line, and follow it on the same line with an argument that is -a Texinfo "indicating" command [...] You may also use the '@asis' -command as an argument to '@table'. '@asis' is a command that does -nothing; - -Documentation for Indicating commands does not list @bullet. ---- - docs/yap.tex | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/docs/yap.tex b/docs/yap.tex -index 162a184..df40c71 100644 ---- a/docs/yap.tex -+++ b/docs/yap.tex -@@ -15820,7 +15820,7 @@ be lost. - We next discuss several issues on trying to make Prolog programs run - fast in YAP. We assume two different programming styles: - --@table @bullet -+@table @asis - @item Execution of @emph{deterministic} programs often - boils down to a recursive loop of the form: - @example --- -1.8.1.4 - diff --git a/yap.spec b/yap.spec deleted file mode 100644 index cd0443a..0000000 --- a/yap.spec +++ /dev/null @@ -1,429 +0,0 @@ -# BEAM is experimantal and some interpreter code unimplemented. See -# README.EAM.html for more details. -%global use_eam 0 - -Name: yap -Version: 6.2.2 -Release: 19%{?dist} -Summary: High-performance Prolog Compiler -Group: Development/Languages -# README Perl Artistic license 2 and the FSF's LGPL -# packages/ProbLog/ Artistic 2.0 -# COPYING LGPL -# LGPL/pillow/pillow.pl LGPLv2+ -# packages/clib/sha1/sha2.c BSD or GPL -# packages/http/examples/demo_threads.pl GPLv2+ -License: Artistic 2.0 and LGPLv2+ and (BSD or GPL+) and (GPLv2+) -URL: http://www.ncc.up.pt/~vsc/Yap/ -Source: %{url}%{name}-%{version}.tar.gz -Patch1: Yap-noni386.patch -Patch2: yap-6.2.0-Locate-mysql-by-mysql_config.patch -Patch3: yap-6.2.0-Install-directory-for-info-pages.patch -Patch4: yap-6.2.0-Install-http-CSS-files-into-PLTARGET.patch -Patch5: yap-6.2.0-Do-not-install-README-etc.patch -Patch6: yap-6.2.0-Install-info-pages-non-executable.patch -Patch7: yap-6.2.0-Do-not-install-info-dir-index.patch -# fix non-x86 build with recent gcc -Patch8: yap-6.2.0-gprof-macro.patch -# Fix compilation of PLStream package on PPC -Patch9: yap-6.2.0-Remove-feature-macro.patch -# Reported to upstream -Patch10: yap-6.2.2-Off-by-one-error-when-initializing-yap_flags.patch -# yap 6.2.2 does not work on PPC (bug #790625) -# Reported to upstream -Patch11: yap-6.2.2-Texinfo-5-does-not-allow-bullet-as-table-indicator.patch -# Fix regression with GCC 5.0 -# -Patch12: yap-6.2.2-Friend-function-template-defined-in-a-class-cannot-b.patch - -BuildRequires: autoconf -# Update config.sub to support aarch64, bug #926852 -BuildRequires: automake -BuildRequires: gmp-devel -BuildRequires: mysql-devel -# TODO: BuildRequires: openmpi-devel -BuildRequires: readline-devel -BuildRequires: texinfo -BuildRequires: unixODBC-devel -BuildRequires: zlib-devel -Requires(post): /sbin/install-info, /sbin/ldconfig -Requires(postun): /sbin/install-info, /sbin/ldconfig - -# Do not export provides and requires on private libraries -%filter_provides_in /usr/lib64/Yap/ -%filter_from_requires /^libplstream.so(/d -%filter_setup - -%description -A high-performance Prolog compiler developed at LIACC, Universidade do -Porto. The Prolog engine is based in the WAM (Warren Abstract -Machine), with several optimizations for better performance. YAP -follows the Edinburgh tradition, and is largely compatible with the -ISO-Prolog standard and with Quintus and SICStus Prolog. - - -%package devel -Summary: C-Interface development files for Yap -Group: Development/Languages -Requires: %{name} = %{version}-%{release} - -%description devel -C-Interface development files for Yap. - - -%package docs -Summary: Documentation for Yap -Group: Development/Languages -BuildArch: noarch -Requires: %{name} = %{version}-%{release} - -%description docs -Documentation for Yap. - - -%prep -%setup -q -%patch1 -p1 -%patch2 -p1 -b .mysql_config -%patch3 -p1 -b .install_info_directory -%patch4 -p1 -b .install_css_into_pltarget -%patch5 -p1 -b .do_not_install_readme -%patch6 -p1 -b .non_executable_info -%patch7 -p1 -b .do_not_install_info_index -%patch8 -p1 -b .macro -%patch9 -p1 -b .remove_feature_macro -%patch10 -p1 -b .initialization -%patch11 -p1 -b .texinfo5 -%patch12 -p1 -b .gcc5 - -# remove redundant RPATH -sed -i 's/-Wl,-R\(,\)\{0,1\}\\$(LIBDIR)//' configure.in -# transform RPATH into RUN_PATH. Private libraries dlopen()ed depend each on -# other -sed -i 's/-Wl,-R/-Wl,--enable-new-dtags,-R/g' configure.in -# Add soname to library -sed -i -e 's/\(-soname=\$DYNYAPLIB\)/\1.%{version}/' configure.in - -# Update config.sub to support aarch64/ppc64le, bug #926852 -cp -p %{_datadir}/automake-*/config.{sub,guess} . -cp -p %{_datadir}/automake-*/config.{sub,guess} packages/jpl -# Regerenate configure because of patching -autoconf - -# chr and clpqr are optional and they are a copy from SWI Prolog (LGPLv2+) -# TODO: Unbundle chr and clpqr libraries as subpackages - -# Add soname to library and symlink from unversioned to versioned one -sed -i \ - -e '/@YAPLIB_LD@/ s/\(-o @YAPLIB@\)\(.*\)/\1.%{version}\2\n\tln -s @YAPLIB@.%{version} @YAPLIB@/' \ - -e '/@INSTALL_DLLS@.* @YAPLIB@/ s/\(@YAPLIB@\)\(.*\)/\1.%{version}\2\n\t@LN_S@ @YAPLIB@.%{version} $(DESTDIR)$(LIBDIR)\/@YAPLIB@/' \ - Makefile.in - -# Fix file encoding -for F in README changes.css; do - tr -d '\r' < "$F" > "${F}.new" - touch -r "$F"{,.new} - mv "$F"{.new,} -done -for F in docs/yap.tex TO_DO; do - iconv -f iso-8859-1 -t utf-8 < "$F" > "${F}.new" - sed -i -e '/mode: texinfo/ s/\(coding: \)latin-1/\1utf-8/' "${F}.new" - touch -r "$F"{,.new} - mv "$F"{.new,} -done - -# Fix file permissions -chmod -x COPYING packages/http/examples/demo_inetd -# Permissions for debuginfo content -find -name '*.h' -exec chmod 0644 '{}' ';' -find -name '*.c' -exec chmod 0644 '{}' ';' - - -%build -# % define optflags $(echo $RPM_OPT_FLAGS | sed 's|-fstack-protector||') -# Private malloc does not work on AArch64, bug #1142068 -%configure \ -%ifarch aarch64 %{power64} - --enable-use-malloc \ -%else - --disable-use-malloc \ -%endif - --enable-coroutining \ - --enable-max-performance \ - --enable-depth-limit \ - --enable-dynamic-loading \ - --enable-myddas \ -%if %{use_eam} - --enable-eam \ -%endif - --enable-chr \ - --enable-clpqr -# TODO: --with-java - -make %{?_smp_mflags} -make %{?_smp_mflags} info - - -%install -make DESTDIR=$RPM_BUILD_ROOT install -make DESTDIR=$RPM_BUILD_ROOT install_info - -# fix permissions and flags -chmod 0644 $RPM_BUILD_ROOT%{_datadir}/Yap/pl/* -chmod 0644 $RPM_BUILD_ROOT%{_includedir}/Yap/* - -# Move installed examples to docs dir -%global documentation docs-documentation -for P in clpbn; do - mkdir -p "%{documentation}/examples/${P}" - mv "$RPM_BUILD_ROOT%{_datadir}/Yap/${P}/examples/"* \ - "%{documentation}/examples/${P}" - rmdir "$RPM_BUILD_ROOT%{_datadir}/Yap/${P}/examples" -done -for P in minisat problog; do - mkdir -p "%{documentation}/examples/${P}" - mv "$RPM_BUILD_ROOT%{_datadir}/Yap/${P}_examples/"* \ - "%{documentation}/examples/${P}" - rmdir "$RPM_BUILD_ROOT%{_datadir}/Yap/${P}_examples" -done -# Copy not-installed examples to docs dir -# CLPBN/*, swi-minisat2 installed already -# TODO: jpl documentation with java support -# TODO: mpi documentation with mpi support -for P in pyswip cplint http plunit; do - mkdir -p "%{documentation}/examples/${P}" - cp -a "packages/${P}/examples/"* "%{documentation}/examples/${P}" -done -for P in LGPL/pillow; do - mkdir -p "%{documentation}/examples/${P}" - cp -a "${P}/examples/"* "%{documentation}/examples/${P}" -done - -# Remove empty files -for F in $RPM_BUILD_ROOT%{_datadir}/Yap/myddas_top_level.yap \ - %{documentation}/examples/cplint/coin.uni; do - test -s "$F" || rm "$F" -done - - -%post -/sbin/install-info %{_infodir}/yap.info --section "Programming Languages" %{_infodir}/dir 2>/dev/null || : -/sbin/install-info %{_infodir}/pillow_doc.info --section "Programming Languages" %{_infodir}/dir 2>/dev/null || : -/sbin/ldconfig - - -%postun -if [ $1 -eq 0 ]; then - /sbin/install-info --delete %{_infodir}/yap.info %{_infodir}/dir 2>/dev/null || : - /sbin/install-info --delete %{_infodir}/pillow_doc.info %{_infodir}/dir 2>/dev/null || : -fi -/sbin/ldconfig - - -%files -%doc Artistic changes* COPYING GIT README TO_DO -%if %{use_eam} -%doc README.EAM.html -%endif -%{_bindir}/yap -%{_datadir}/Yap -%{_libdir}/Yap -%{_libdir}/libYap.so.* -%{_infodir}/* - - -%files devel -%{_libdir}/libYap.so -%{_includedir}/Yap - - -%files docs -%doc LGPL/pillow/doc/pillow_doc_html/* -%doc LGPL/pillow/doc/article.ps.gz -%doc %{documentation}/* - - -%changelog -* Sat Feb 11 2017 Fedora Release Engineering - 6.2.2-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Jan 12 2017 Igor Gnatenko - 6.2.2-18 -- Rebuild for readline 7.x - -* Fri Feb 05 2016 Fedora Release Engineering - 6.2.2-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Dec 16 2015 Peter Robinson 6.2.2-16 -- Disable private malloc on power64 too - -* Fri Jun 19 2015 Fedora Release Engineering - 6.2.2-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Apr 15 2015 Petr Pisar - 6.2.2-14 -- Disable private malloc on AArch64 (bug #1142068) - -* Thu Feb 12 2015 Petr Pisar - 6.2.2-13 -- Fix regression with GCC 5.0 - -* Wed Aug 20 2014 Kevin Fenzi - 6.2.2-12 -- Rebuild for rpm bug 1131892 - -* Mon Aug 18 2014 Fedora Release Engineering - 6.2.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 6.2.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon May 19 2014 Jaromir Capik - 6.2.2-9 -- Replacing ppc64 with the power64 macro - -* Sun Aug 04 2013 Fedora Release Engineering - 6.2.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Mar 28 2013 Petr Pisar - 6.2.2-7 -- Update config.sub to support aarch64 (bug #926852) -- Adjust to Texinfo 5 - -* Fri Feb 15 2013 Fedora Release Engineering - 6.2.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Jan 07 2013 Petr Pisar - 6.2.2-5 -- Fix off-by-one error when initializing yap_flags - -* Sun Jul 22 2012 Fedora Release Engineering - 6.2.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Feb 23 2012 Petr Pisar - 6.2.2-3 -- yap 6.2.2 does not work on PPC (bug #790625) - -* Sat Jan 14 2012 Fedora Release Engineering - 6.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Dec 09 2011 Petr Pisar - 6.2.2-1 -- 6.2.2 bump - -* Wed Dec 07 2011 Petr Pisar - 6.2.0-6 -- Fix building on PowerPC (bug #751144) - -* Wed Oct 26 2011 Marcela Mašláňová - 6.2.0-5.2 -- rebuild with new gmp without compat lib - -* Wed Oct 12 2011 Peter Schiffer - 6.2.0-5.1 -- rebuild with new gmp - -* Thu Jun 23 2011 Dan Horák - 6.2.0-5 -- fix non-x86 builds with recent gcc - -* Wed Mar 23 2011 Dan Horák - 6.2.0-4 -- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) - -* Wed Mar 23 2011 Petr Pisar - 6.2.0-3 -- Rebuild against mysql 5.5.10 - -* Tue Feb 08 2011 Fedora Release Engineering - 6.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jan 04 2011 Petr Pisar - 6.2.0-1 -- Reorder metadata in spec file -- 6.2.0 bump -- Remove uneeded Yap-creat.patch -- Remove uneeded Yap-5.1.1-config.sub.patch -- Locate mysql by mysql_config -- Fix info pages installation -- Logtalk is no logner distributed with yap -- Install http module CSS files to correct place -- Convert TO_DO into UTF-8 -- Make COPYING non-executable -- Remove empty myddas_top_level.yap file -- Fix soname injection -- Fix BuildRequires -- Package clpbn examples -- Fix Source URL -- Clean exported Requires -- Correct RPATH -- Enable chr and clpqr libraries installation (still bundled with source tar - ball) -- Package uninstalled examples - -* Wed Dec 08 2010 Petr Pisar - 5.1.3-3 -- Hack SWI-compatible libraries build system to be compilable (bug #660965) -- Correct spec file syntax (white spaces, percentages) -- Convert documentation into UTF-8/CR -- Do not put unversioned library into main package -- Make docs subpackege architecture independent - -* Mon Jul 27 2009 Fedora Release Engineering - 5.1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Jun 15 2009 Gerard Milmeister - 5.1.3-1 -- new release 5.1.3 - -* Sun Mar 01 2009 Ralf Corsépius - 5.1.1-13 -- Add Yap-5.1.1-config.sub.patch: - Upgrade outdated config.sub to fix rebuild breakdown on ppc64. - -* Fri Jul 11 2008 Tom "spot" Callaway - 5.1.1-11 -- fix license tag - -* Thu Apr 10 2008 Gerard Milmeister - 5.1.1-10 -- enable rpm_opt_flags -- patch for incorrect open call with O_CREAT - -* Mon Feb 18 2008 Fedora Release Engineering - 5.1.1-9 -- Autorebuild for GCC 4.3 - -* Sat Oct 20 2007 Gerard Milmeister - 5.1.1-8 -- fix library path for 64-bit platforms - -* Wed Aug 29 2007 Gerard Milmeister - 5.1.1-7 -- replaced ld -shared with gcc -shared - -* Wed Aug 29 2007 Fedora Release Engineering - 5.1.1-6 -- Rebuild for selinux ppc32 issue. - -* Thu Jul 5 2007 Gerard Milmeister - 5.1.1-5 -- also build libYap.so - -* Fri May 11 2007 Gerard Milmeister - 5.1.1-3 -- remove -fstack-protector from optflags in order to enable - loading of .so modules - -* Mon Aug 28 2006 Gerard Milmeister - 5.1.1-2 -- Rebuild for FE6 - -* Mon May 1 2006 Gerard Milmeister - 5.1.1-1 -- new version 5.1.1 -- split off devel and docs packages - -* Fri Feb 17 2006 Gerard Milmeister - 5.0.1-2 -- Rebuild for Fedora Extras 5 - -* Tue Oct 25 2005 Gerard Milmeister - 5.0.1-1 -- New Version 5.0.1 - -* Wed Sep 7 2005 Gerard Milmeister - 5.0.0-1 -- New Version 5.0.0 - -* Sat Jun 18 2005 Gerard Milmeister - 4.5.5-5 -- Use %%{_prefix}/lib for x86_64 - -* Sat Jun 18 2005 Gerard Milmeister - 4.5.5-4 -- Fix for non-i386 compilers - -* Sat Jun 18 2005 Gerard Milmeister - 4.5.5-3 -- Compiler fix for FC4 - -* Wed Apr 6 2005 Michael Schwendt -- rebuilt - -* Sat Feb 12 2005 Gerard Milmeister - 0:4.5.5-1 -- New Version 4.5.5 - -* Mon Nov 29 2004 Gerard Milmeister - 0:4.5.3-0.fdr.1 -- New Version 4.5.3 - -* Sat Mar 13 2004 Gerard Milmeister - 0:4.5.2-0.fdr.1 -- New Version 4.5.2 - -* Sat Nov 22 2003 Gerard Milmeister - 0:4.4.3-0.fdr.1 -- First Fedora release