Re: [devel] [#269792] DONE (try 2) srpm=gprolog-1.4.5-alt2.src.rpm

["Dmitry V. Levin" <ldv@altlinux.org>]

On Tue, Apr 13, 2021 at 01:03:32AM +0000, Girar pender (oddity) wrote:
> http://git.altlinux.org/tasks/archive/done/_263/269792/logs/events.2.1.log
> 
> 2021-Apr-13 01:00:07 :: task #269792 for sisyphus resumed by oddity:
> #100 build gprolog-1.4.5-alt2.src.rpm
[...]
> #100 gprolog 1.4.5-alt1 -> 1.4.5-alt2
>  Tue Apr 13 2021 Ilya Mashkin <oddity@altlinux.ru> 1.4.5-alt2
>  - fix build
[...]
> gprolog: git inheritance check relaxed by oddity
> warning: update of `gprolog' by srpm upload, /gears/g/gprolog.git branch `sisyphus' will be removed
[...]
> 2021-Apr-13 01:03:05 :: created /srpms/g/gprolog.git branch `sisyphus'
> 2021-Apr-13 01:03:05 :: saved /gears/g/gprolog.git branch `sisyphus' as `old/sisyphus-task269792'

Такой "fix build" простой заменой формата хранения исходного кода не спрячешь.
Нет, спасибо большое, конечно, но таких "fix build" в Сизифе не требуется.

$ GIT_ALTERNATE_OBJECT_DIRECTORIES=/gears/g/gprolog.git/objects \
  git --git-dir=/srpms/g/gprolog.git diff eb704b31444c5ac8e8139cd768f2deb5618f208b..
diff --git a/.gear/autobuild.watch b/.gear/autobuild.watch
deleted file mode 100644
index 9281d31..0000000
--- a/.gear/autobuild.watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://www.gprolog.org/gprolog-([\d\.]+).tar.gz
diff --git a/gprolog.make-print-submake-output.patch b/gprolog.make-print-submake-output.patch
new file mode 100644
index 0000000..1eab399
--- /dev/null
+++ b/gprolog.make-print-submake-output.patch
@@ -0,0 +1,12 @@
+diff -ru gprolog-1.4.4.orig/src/Pl2Wam/check_boot gprolog-1.4.4.tmpfile/src/Pl2Wam/check_boot
+--- gprolog-1.4.4.orig/src/Pl2Wam/check_boot	2012-12-07 03:09:23.000000000 +0100
++++ gprolog-1.4.4.tmpfile/src/Pl2Wam/check_boot	2016-08-27 11:08:22.837622681 +0200
+@@ -13,7 +13,7 @@
+ 
+ rm_make() {
+     rm -f $*
+-    make >/tmp/make.log 2>&1 || (echo /tmp/make.log ; exit 1)
++    make  || (echo "make failed in rm_make" ; exit 1)
+ }
+ 
+ 
diff --git a/gprolog.spec b/gprolog.spec
index dc76c29..f7d2886 100644
--- a/gprolog.spec
+++ b/gprolog.spec
@@ -1,19 +1,21 @@
 Name: gprolog
 Version: 1.4.5
-Release: alt1
+Release: alt2
 Summary: GNU Prolog is a free Prolog compiler
-
+Packager: Ilya Mashkin <oddity@altlinux.ru>
 Group: Development/Other
 License: GPLv2
 Url: http://www.gprolog.org
 Source: %name-%version.tar.gz
 Patch1: gprolog-1.4.0-test.patch
 Patch2: gprolog-1.3.0-linedit.patch
+Patch3:   gprolog.make-print-submake-output.patch
 
 Obsoletes: gprolog-examples < 1.4.0
 Provides: gprolog-examples = %version-%release
-
-ExclusiveArch: x86_64 %ix86
+%set_gcc_version 8
+BuildRequires:  gcc8 libgdb-devel perl-devel
+ExclusiveArch: x86_64 %ix86 %e2k
 
 %description
 GNU Prolog is a native Prolog compiler with constraint solving over
@@ -50,10 +52,22 @@ Documentation for GNU Prolog.
 %setup
 #patch1 -p1
 # %patch2 -p1
+%patch3 -p1
 
 %build
+# This package fails to build with LTO due to undefined symbols.  LTO
+# was disabled in OpenSuSE as well, but with no real explanation why
+# beyond the undefined symbols.  It really shold be investigated further.
+# Disable LTO
+%define _lto_cflags %{nil}
+
 cd src
 
+# BZ #1799464
+%define _legacy_common_support 1
+
+
+
 # gprolog only acccept -O0 and don't like -fomit-frame-pointer
 
 CFLG="$(echo $RPM_OPT_FLAGS | sed -s "s/\-O2/-O1/g" \
@@ -61,7 +75,7 @@ CFLG="$(echo $RPM_OPT_FLAGS | sed -s "s/\-O2/-O1/g" \
 
 # Based on a gentoo ebuild (??)
 CFLG="$CFLG -funsigned-char"
-
+%add_optflags -fcommon
 # sed -i -e "s:TXT_FILES      = @TXT_FILES@:TXT_FILES=:" Makefile.in
 ./configure \
        --with-install-dir=$RPM_BUILD_ROOT%_libdir/gprolog-%version \
@@ -115,6 +129,9 @@ rm -rf SWI WAMCC XSB YAP
 %doc src/dist-doc/*
 
 %changelog
+* Tue Apr 13 2021 Ilya Mashkin <oddity@altlinux.ru> 1.4.5-alt2
+- fix build 
+
 * Mon Sep 09 2019 Fr. Br. George <george@altlinux.ru> 1.4.5-alt1
 - Autobuild version bump to 1.4.5


-- 
ldv