From ac44443c1b839ed24e10ba48921ae899153b963d Mon Sep 17 00:00:00 2001 From: Slava Barinov Date: Wed, 15 Apr 2020 15:59:43 +0300 Subject: [PATCH] packaging: Turn on arm build Change-Id: I0b5e2c5c166b6cf825a8496e76133ca8b93df631 Signed-off-by: Slava Barinov --- packaging/autogen.spec | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/packaging/autogen.spec b/packaging/autogen.spec index 912001e..938c073 100644 --- a/packaging/autogen.spec +++ b/packaging/autogen.spec @@ -2,7 +2,8 @@ Name: autogen BuildRequires: xz BuildRequires: m4 >= 1.4.6 BuildRequires: guile guile-devel libguile guile-modules gmp-devel -BuildRequires: libgc-devel libffi-devel +BuildRequires: libgc-devel-static libffi-devel-static +BuildRequires: libunistring-devel-static Url: http://www.gnu.org/software/autogen Requires: m4 >= 1.4.6 Requires: perl >= 5.6 @@ -14,7 +15,6 @@ License: GPL-3.0+ Group: Development/Tools/Building Source: %{name}-%{version}.tar.gz Source1001: %{name}.manifest -ExcludeArch: %arm aarch64 %description AutoGen is a tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text. It is especially valuable in programs that have several blocks of text that must be kept synchronized. @@ -28,13 +28,20 @@ A common example where this would be useful is in creating and maintaining the c cp %{SOURCE1001} . %build -CFLAGS='-Wno-error=format-truncation' \ -%reconfigure --disable-dependency-tracking LDFLAGS="-lgmp" +export PKG_CONFIG="pkg-config --static" +export GUILE_LINK=$(guile-config link --static | sed -e 's|[[:space:]][^[:space:]]\+libunistring.so[^[:space:]]*[[:space:]]| -lunistring |') + +%reconfigure --disable-dependency-tracking \ + --enable-static --disable-shared \ + GUILE_LIBS="-Wl,--whole-archive -Wl,--allow-multiple-definition ${GUILE_LINK} -Wl,--no-whole-archive" \ + CFLAGS="-Wno-error=format-overflow" %{__make} %{?_smp_mflags} V=1 %check -trap 'test $? -ne 0 && cat tests/testsuite.log' EXIT -make check +%{?run_tests: + trap 'test $? -ne 0 && cat tests/testsuite.log' EXIT + %{__make} check +} %install %{?make_install} %{!?make_install:%{__make} install DESTDIR=%{buildroot}} @@ -49,7 +56,7 @@ make check %{_prefix}/bin/* %{_prefix}/share/%{name} %{_includedir}/autoopts/* -%{_libdir}/libopts* +%{_libdir}/* %{_datadir}/aclocal/autoopts.m4 %{_libdir}/pkgconfig/autoopts.pc %{_libdir}/autogen/tpl-config.tlib -- 2.34.1