Version 1.0.5.
Drop -unbundle-fmt patch in favor of --with-external-fmt arg to configure.
This commit is contained in:
Jerry James
parent
cc0ba2bd64
commit
81010bb27b
|
|
@ -1,51 +0,0 @@
|
|||
--- libsemigroups-1.0.2/configure.ac.orig 2019-11-29 04:54:55.000000000 -0700
|
||||
+++ libsemigroups-1.0.2/configure.ac 2019-12-04 10:21:14.926833862 -0700
|
||||
@@ -212,10 +212,6 @@ AS_IF([test "x$enable_hpcombi" = xyes],
|
||||
AM_CONDITIONAL([HPCOMBI_CONSTEXPR_FUN_ARGS],
|
||||
[test "x$hpcombi_constexpr_fun_args" = xyes])
|
||||
|
||||
-AC_CHECK_FILE([$srcdir/extern/fmt-5.3.0/README.rst],
|
||||
- [],
|
||||
- []
|
||||
- [AC_MSG_ERROR([fmt-5.3.0 is not available, please download fmt-5.3.0 from https://fmt.dev/ and put the unpacked archive in the libsemigroups/extern directory])])
|
||||
dnl Output configured files
|
||||
|
||||
AC_CONFIG_FILES([Makefile libsemigroups.pc])
|
||||
--- libsemigroups-1.0.2/Makefile.am.orig 2019-11-29 04:54:55.000000000 -0700
|
||||
+++ libsemigroups-1.0.2/Makefile.am 2019-12-04 10:22:44.774137425 -0700
|
||||
@@ -7,7 +7,6 @@ AM_CXXFLAGS += -I$(abs_top_srcdir)/inclu
|
||||
AM_CXXFLAGS += -I$(abs_top_srcdir)/extern/HPCombi/include
|
||||
AM_CXXFLAGS += -I$(abs_top_srcdir)/extern/HPCombi/include/fallback
|
||||
AM_CXXFLAGS += -I$(abs_top_srcdir)/extern/sparsehash-c11
|
||||
-AM_CXXFLAGS += -I$(abs_top_srcdir)/extern/fmt-5.3.0/include
|
||||
AM_CXXFLAGS += -mavx -flax-vector-conversions
|
||||
AM_CXXFLAGS += -std=gnu++11 -g -O3 -march=native -Wall -Wextra
|
||||
AM_CXXFLAGS += $(WARNING_CXXFLAGS)
|
||||
@@ -107,19 +106,6 @@ pkginclude_HEADERS += extern/HPCombi/inc
|
||||
pkginclude_HEADERS += extern/HPCombi/include/vect_generic.hpp
|
||||
endif
|
||||
|
||||
-fmtincludedir = $(includedir)/fmt
|
||||
-fmtinclude_HEADERS = extern/fmt-5.3.0/include/fmt/chrono.h
|
||||
-fmtinclude_HEADERS += extern/fmt-5.3.0/include/fmt/color.h
|
||||
-fmtinclude_HEADERS += extern/fmt-5.3.0/include/fmt/core.h
|
||||
-fmtinclude_HEADERS += extern/fmt-5.3.0/include/fmt/format-inl.h
|
||||
-fmtinclude_HEADERS += extern/fmt-5.3.0/include/fmt/format.h
|
||||
-fmtinclude_HEADERS += extern/fmt-5.3.0/include/fmt/locale.h
|
||||
-fmtinclude_HEADERS += extern/fmt-5.3.0/include/fmt/ostream.h
|
||||
-fmtinclude_HEADERS += extern/fmt-5.3.0/include/fmt/posix.h
|
||||
-fmtinclude_HEADERS += extern/fmt-5.3.0/include/fmt/printf.h
|
||||
-fmtinclude_HEADERS += extern/fmt-5.3.0/include/fmt/ranges.h
|
||||
-fmtinclude_HEADERS += extern/fmt-5.3.0/include/fmt/time.h
|
||||
-
|
||||
lib_LTLIBRARIES = libsemigroups.la
|
||||
|
||||
## libsemigroups sources
|
||||
@@ -157,7 +143,6 @@ EXTRA_DIST += etc/make-doc-sphinx.sh
|
||||
EXTRA_DIST += etc/make-doc-yml.sh
|
||||
EXTRA_DIST += etc/make-format.sh
|
||||
EXTRA_DIST += etc/make-lint.sh
|
||||
-EXTRA_DIST += extern/fmt-5.3.0
|
||||
EXTRA_DIST += extern/HPCombi/
|
||||
EXTRA_DIST += extern/.HPCombi_VERSION
|
||||
EXTRA_DIST += src/kbe-impl.hpp
|
||||
|
|
@ -1,13 +1,11 @@
|
|||
Name: libsemigroups
|
||||
Version: 1.0.3
|
||||
Version: 1.0.5
|
||||
Release: 1%{?dist}
|
||||
Summary: C++ library for semigroups and monoids
|
||||
|
||||
License: GPLv3+
|
||||
URL: https://github.com/libsemigroups/libsemigroups
|
||||
Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
||||
# Fedora-only patch: unbundle fmt
|
||||
Patch0: %{name}-unbundle-fmt.patch
|
||||
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: gcc-c++
|
||||
|
|
@ -95,15 +93,6 @@ Documentation for %{name}.
|
|||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
# Do not override Fedora CFLAGS
|
||||
sed -i '/mavx/d;s/ -g -O3 -march=native//' Makefile.am
|
||||
|
||||
# Make sure the bundled fmt is not used
|
||||
rm -fr extern/fmt-*
|
||||
|
||||
# Regenerate configure after applying patch 0 and modifying Makefile.am
|
||||
autoreconf -fi .
|
||||
|
||||
# The 1.0.3 release somehow managed to created nested "docs" directories,
|
||||
# which breaks the paths in the etc scripts.
|
||||
mv docs docs.redundant
|
||||
|
|
@ -116,7 +105,8 @@ rmdir docs.redundant
|
|||
# availability of AVX in any case.
|
||||
export CFLAGS="%{optflags} -fwrapv"
|
||||
export CXXFLAGS="$CFLAGS"
|
||||
%configure --disable-silent-rules --disable-static --disable-hpcombi
|
||||
%configure --disable-silent-rules --disable-static --disable-hpcombi \
|
||||
--with-external-fmt
|
||||
|
||||
# Get rid of undesirable hardcoded rpaths; workaround libtool reordering
|
||||
# -Wl,--as-needed after all the libraries.
|
||||
|
|
@ -167,6 +157,10 @@ LD_LIBRARY_PATH=$PWD/.libs make check
|
|||
%license LICENSE
|
||||
|
||||
%changelog
|
||||
* Sat Jan 18 2020 Jerry James <loganjerry@gmail.com> - 1.0.5-1
|
||||
- Version 1.0.5
|
||||
- Drop -unbundle-fmt patch in favor of --with-external-fmt arg to configure
|
||||
|
||||
* Fri Dec 13 2019 Jerry James <loganjerry@gmail.com> - 1.0.3-1
|
||||
- Version 1.0.3
|
||||
- New URLs
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (libsemigroups-1.0.3.tar.gz) = 6fb69055140754e742803914112132ee858e2c8e9164d5101a72490aaa0ad44567e5cc4ae8e882cfce72939cb71c2b80a4b0d1d24caa23f545dd8930eb0e23d9
|
||||
SHA512 (libsemigroups-1.0.5.tar.gz) = 7fd2f19adcb23325ea24dc1bc2def1322c992415e236687d327fc1cc4201f3b11473a4b2f8b4048a43505ae6582409f9c0d9d98b69a3df4143e24fb49262bd1c
|
||||
|
|
|
|||
Loading…
Reference in New Issue