From 633a8254bbf94855cd9dc1b7d5ed6ced95317c80 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Fri, 23 May 2014 05:07:48 +0200 Subject: [PATCH 01/18] Rebuild for boost 1.55.0 --- undertaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/undertaker.spec b/undertaker.spec index 80e51f4..23b4030 100644 --- a/undertaker.spec +++ b/undertaker.spec @@ -1,6 +1,6 @@ Name: undertaker Version: 1.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Find always-on and always-off conditional C code Group: Development/Languages @@ -162,6 +162,9 @@ cd $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name} %{_xemacs_sitelispdir}/%{name}/*.el %changelog +* Fri May 23 2014 Petr Machata - 1.2-12 +- Rebuild for boost 1.55.0 + * Wed Jul 31 2013 Jerry James - 1.2-11 - Add -picosat patch to adapt to new reentrant picosat API From e752707fe0d981cb5824444628af1b409a5213dc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 21:46:30 -0500 Subject: [PATCH 02/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- undertaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/undertaker.spec b/undertaker.spec index 23b4030..c366be6 100644 --- a/undertaker.spec +++ b/undertaker.spec @@ -1,6 +1,6 @@ Name: undertaker Version: 1.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Find always-on and always-off conditional C code Group: Development/Languages @@ -162,6 +162,9 @@ cd $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name} %{_xemacs_sitelispdir}/%{name}/*.el %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri May 23 2014 Petr Machata - 1.2-12 - Rebuild for boost 1.55.0 From 068eac9566e6b6eb77547f6715e53e0f00a35076 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 06:55:37 +0000 Subject: [PATCH 03/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- undertaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/undertaker.spec b/undertaker.spec index c366be6..ace0e9c 100644 --- a/undertaker.spec +++ b/undertaker.spec @@ -1,6 +1,6 @@ Name: undertaker Version: 1.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Find always-on and always-off conditional C code Group: Development/Languages @@ -162,6 +162,9 @@ cd $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name} %{_xemacs_sitelispdir}/%{name}/*.el %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 1.2-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 96cf69b8bd7075999eab6ba3aaac3eee15f0bb36 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 24 Oct 2014 11:02:36 -0600 Subject: [PATCH 04/18] New upstream version. Also: - Drop upstreamed -boost_mt patch - Build with -D_FILE_OFFSET_BITS=64 - Fix license handling --- .gitignore | 2 +- sources | 2 +- undertaker-boost_mt.patch | 24 ---- undertaker-picosat.patch | 226 ++++++++++++++++++++++++-------------- undertaker.spec | 117 ++++++++++++-------- 5 files changed, 215 insertions(+), 156 deletions(-) delete mode 100644 undertaker-boost_mt.patch diff --git a/.gitignore b/.gitignore index 067d0f5..feea2ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/undertaker-1.2.tar.gz +/undertaker-1.6.tar.xz diff --git a/sources b/sources index 4c612f0..e4597a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -455613fb59573a12d5b30abcd87d474b undertaker-1.2.tar.gz +9d1c7022ad6624f2398f1e68b1e78612 undertaker-1.6.tar.xz diff --git a/undertaker-boost_mt.patch b/undertaker-boost_mt.patch deleted file mode 100644 index 2c8f06a..0000000 --- a/undertaker-boost_mt.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up ./undertaker/Makefile~ ./undertaker/Makefile ---- ./undertaker/Makefile~ 2011-08-30 12:11:34.000000000 +0200 -+++ ./undertaker/Makefile 2013-07-28 00:56:25.000000000 +0200 -@@ -13,7 +13,7 @@ CXXFLAGS = $(CFLAGS) - - LDFLAGS = - # LDCOV = -coverage --LDLIBS = libparser.a ../ziz/libziz.a -lstdc++ -lboost_system -lboost_regex -lboost_filesystem -lpicosat -lboost_wave-mt $(LDCOV) -+LDLIBS = libparser.a ../ziz/libziz.a -lstdc++ -lboost_system -lboost_regex -lboost_filesystem -lpicosat -lboost_wave $(LDCOV) - - PARSEROBJ = RsfReader.o KconfigWhitelist.o ConfigurationModel.o \ - ModelContainer.o SatChecker.o BlockDefectAnalyzer.o \ -diff -up ./ziz/Makefile~ ./ziz/Makefile ---- ./ziz/Makefile~ 2011-08-24 17:05:15.000000000 +0200 -+++ ./ziz/Makefile 2013-07-28 00:56:36.000000000 +0200 -@@ -3,7 +3,7 @@ LDXX=g++ - DEBUG = -g3 - CFLAGS = -Wall -Wextra -O2 $(DEBUG) - CXXFLAGS = $(CFLAGS) --LDLIBS = -lboost_regex -lboost_wave-mt -lboost_system-mt $(LDCOV) -+LDLIBS = -lboost_regex -lboost_wave -lboost_system $(LDCOV) - - ZIZOBJ = Ziz.o - HEADERS = $(wildcard *.h) diff --git a/undertaker-picosat.patch b/undertaker-picosat.patch index 58b3a0a..2fa31cd 100644 --- a/undertaker-picosat.patch +++ b/undertaker-picosat.patch @@ -1,91 +1,151 @@ ---- ./undertaker/SatChecker.h.orig 2011-08-24 09:05:15.000000000 -0600 -+++ ./undertaker/SatChecker.h 2013-07-31 16:34:25.000000000 -0600 -@@ -48,7 +48,7 @@ namespace Picosat { +--- ./Makefile.orig 2014-10-12 10:18:47.000000000 -0600 ++++ ./Makefile 2014-10-23 20:00:00.000000000 -0600 +@@ -1,5 +1,5 @@ + PROGS = scripts/kconfig/dumpconf scripts/kconfig/conf undertaker/undertaker undertaker/predator undertaker/rsf2cnf \ +- undertaker/satyr python/rsf2model tailor/undertaker-traceutil ziz/zizler picosat/picomus ++ undertaker/satyr python/rsf2model tailor/undertaker-traceutil ziz/zizler + MANPAGES = doc/undertaker.1.gz doc/undertaker-linux-tree.1.gz doc/undertaker-kconfigdump.1.gz \ + doc/undertaker-kconfigpp.1.gz - /* Include the Limmat library header as C */ - extern "C" { --#include -+#include - } - }; +@@ -18,7 +18,7 @@ SETUP_PY_EXTRA_ARG = --root=$(DESTDIR) + SETUP_PY_INSTALL_EXTRA_ARG = $(SETUP_PY_EXTRA_ARG) + endif -@@ -202,6 +202,8 @@ private: - const std::string _sat; - clock_t _runtime; +-all: picosat/libpicosat.a $(PROGS) ++all: $(PROGS) -+ Picosat::PicoSAT *picosat_inst; -+ - int stringToSymbol(const std::string &key); - int newSymbol(void); - void addClause(int *clause); ---- ./undertaker/SatChecker.cpp.orig 2011-08-24 09:05:15.000000000 -0600 -+++ ./undertaker/SatChecker.cpp 2013-07-31 16:32:06.000000000 -0600 -@@ -70,13 +70,13 @@ int SatChecker::stringToSymbol(const std - } + version.h: generate-version.sh + ./$< +@@ -74,7 +74,7 @@ check: + $(MAKE) -C tailor $@ + $(MAKE) -s -C fm $@ - int SatChecker::newSymbol(void) { -- return Picosat::picosat_inc_max_var(); -+ return Picosat::picosat_inc_max_var(picosat_inst); - } +-models: picosat/libpicosat.a ++models: + $(MAKE) -C undertaker/kconfig-dumps/ - void SatChecker::addClause(int *clause) { - for (int *x = clause; *x; x++) -- Picosat::picosat_add(*x); -- Picosat::picosat_add(0); -+ Picosat::picosat_add(picosat_inst, *x); -+ Picosat::picosat_add(picosat_inst, 0); - } + install: all $(MANPAGES) +@@ -115,8 +115,6 @@ install: all $(MANPAGES) + @install -v undertaker/rsf2cnf $(DESTDIR)$(BINDIR) + @install -v undertaker/satyr $(DESTDIR)$(BINDIR) - int SatChecker::notClause(int inner_clause) { -@@ -299,7 +299,8 @@ void SatChecker::fillSatChecker(std::str - std::cout << std::string(expression.begin(), expression.begin() - + info.length) << endl; - */ -- Picosat::picosat_reset(); -+ Picosat::picosat_reset(picosat_inst); -+ picosat_inst = NULL; - throw SatCheckerError("SatChecker: Couldn't parse: " + expression); - } - } -@@ -308,7 +309,7 @@ void SatChecker::fillSatChecker(tree_par - iter_t expression = info.trees.begin()->children.begin(); - int top_clause = transform_bool_rec(expression); - /* This adds the last clause */ -- Picosat::picosat_assume(top_clause); -+ Picosat::picosat_assume(picosat_inst, top_clause); - } - - SatChecker::SatChecker(const char *sat, int debug) -@@ -325,26 +326,26 @@ bool SatChecker::operator()() throw (Sat - debug_parser_indent = 0; - - try { -- Picosat::picosat_init(); -+ picosat_inst = Picosat::picosat_init(); - // try to enable as many features as possible -- Picosat::picosat_set_global_default_phase(1); -+ Picosat::picosat_set_global_default_phase(picosat_inst, 1); - - fillSatChecker(_sat); - -- int res = Picosat::picosat_sat(-1); -+ int res = Picosat::picosat_sat(picosat_inst, -1); - - if (res == PICOSAT_SATISFIABLE) { - /* Let's get the assigment out of picosat, because we have to - reset the sat solver afterwards */ - std::map::const_iterator it; - for (it = symbolTable.begin(); it != symbolTable.end(); ++it) { -- bool selected = Picosat::picosat_deref(it->second) == 1; -+ bool selected = Picosat::picosat_deref(picosat_inst, it->second) == 1; - assignmentTable.insert(std::make_pair(it->first, selected)); - } - } - -- Picosat::picosat_reset(); +- @install -v picosat/picomus $(DESTDIR)$(BINDIR) - -+ Picosat::picosat_reset(picosat_inst); -+ picosat_inst = NULL; + @install -v ziz/zizler $(DESTDIR)$(BINDIR) - if (res == PICOSAT_UNSATISFIABLE) - return false; + @install -v scripts/Makefile.list $(DESTDIR)$(LIBDIR) +--- ./undertaker/Makefile.orig 2014-10-12 10:18:47.000000000 -0600 ++++ ./undertaker/Makefile 2014-10-23 20:00:00.000000000 -0600 +@@ -5,15 +5,15 @@ SUFFIXES += .d + NODEPS:=clean clean-check clean-parsers + + CFLAGS = -Wall -Wextra -O2 +-CPPFLAGS = -I $(CURDIR)/../scripts/kconfig -I $(CURDIR)/../picosat ++CPPFLAGS = -I $(CURDIR)/../scripts/kconfig + CXXFLAGS = $(CFLAGS) -std=gnu++11 + + # use g++ for linking, will automaticly use "-lstdc++ -lm" libraries + CC = g++ + +-LDFLAGS = ++LDFLAGS = -Wl,--as-needed + BOOST_LIBS = -lboost_system -lboost_regex -lboost_filesystem -lboost_thread +-LDLIBS = $(BOOST_LIBS) -lpthread -lPuma ++LDLIBS = $(BOOST_LIBS) -lpthread -lPuma -lpicosat + + # LDCOV = -coverage + ifdef LDCOV +@@ -48,10 +48,10 @@ DEPFILES:=$(patsubst %.o,%.d,$(PARSEROBJ + + all: $(PROGS) $(TESTPROGS) + +-undertaker: libparser.a ../picosat/libpicosat.a +-rsf2cnf: libparser.a ../picosat/libpicosat.a ++undertaker: libparser.a ++rsf2cnf: libparser.a + predator: predator.o PredatorVisitor.o +-satyr: libsatyr.a zconf.tab.o ../picosat/libpicosat.a ++satyr: libsatyr.a zconf.tab.o + + ../picosat/libpicosat.a: + $(MAKE) -C .. picosat/libpicosat.a +@@ -104,7 +104,7 @@ clean-parsers: + rm -rf location.hh stack.hh position.hh BoolExpParser.hh + rm -rf BoolExpParser.cpp BoolExpLexer.cpp + +-test-%: test-%.cpp libparser.a ../picosat/libpicosat.a ++test-%: test-%.cpp libparser.a + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -g -O0 -o $@ $^ -lcheck -lrt $(LDFLAGS) $(LDLIBS) + + +--- ./undertaker/PicosatCNF.cpp.orig 2014-10-12 10:18:47.000000000 -0600 ++++ ./undertaker/PicosatCNF.cpp 2014-10-21 20:00:00.000000000 -0600 +@@ -30,7 +30,7 @@ + namespace Picosat { + // include picosat header as C + extern "C" { +- #include "picosat.h" ++ #include + } + } + +@@ -39,6 +39,7 @@ using namespace kconfig; + + static bool picosatIsInitalized = false; + static PicosatCNF *currentContext = nullptr; ++static Picosat::PicoSAT *picosat_inst; + + PicosatCNF::PicosatCNF(Picosat::SATMode defaultPhase) : defaultPhase(defaultPhase) {} + +@@ -309,26 +310,26 @@ bool PicosatCNF::checkSatisfiable() { + if (this != currentContext){ + // if not, reset the context.... + if (picosatIsInitalized) +- Picosat::picosat_reset(); +- Picosat::picosat_init(); ++ Picosat::picosat_reset(picosat_inst); ++ picosat_inst = Picosat::picosat_init(); + picosatIsInitalized = true; + // and load the current context + currentContext = this; +- Picosat::picosat_set_global_default_phase(defaultPhase); ++ Picosat::picosat_set_global_default_phase(picosat_inst, defaultPhase); + } + if (pushed_clauses_index < clauses.size()) { + // tell picosat how many different variables it will receive +- Picosat::picosat_adjust(varcount); ++ Picosat::picosat_adjust(picosat_inst, varcount); + + for (unsigned int i = pushed_clauses_index, e = clauses.size(); i < e; ++i) +- Picosat::picosat_add(clauses[i]); ++ Picosat::picosat_add(picosat_inst, clauses[i]); + pushed_clauses_index = clauses.size(); + } + for (const int &assumption : assumptions) +- Picosat::picosat_assume(assumption); ++ Picosat::picosat_assume(picosat_inst, assumption); + + assumptions.clear(); +- return Picosat::picosat_sat(-1) == PICOSAT_SATISFIABLE; ++ return Picosat::picosat_sat(picosat_inst, -1) == PICOSAT_SATISFIABLE; + } + + void PicosatCNF::pushAssumptions(std::map &a) { +@@ -340,7 +341,7 @@ void PicosatCNF::pushAssumptions(std::ma + } + + bool PicosatCNF::deref(int s) const { +- return Picosat::picosat_deref(s) == 1; ++ return Picosat::picosat_deref(picosat_inst, s) == 1; + } + + bool PicosatCNF::deref(const std::string &s) const { +@@ -359,7 +360,7 @@ const std::string *PicosatCNF::getAssoci + } + + const int *PicosatCNF::failedAssumptions() const { +- return Picosat::picosat_failed_assumptions(); ++ return Picosat::picosat_failed_assumptions(picosat_inst); + } + + void PicosatCNF::addMetaValue(const std::string &key, const std::string &value) { diff --git a/undertaker.spec b/undertaker.spec index ace0e9c..7c41718 100644 --- a/undertaker.spec +++ b/undertaker.spec @@ -1,27 +1,29 @@ Name: undertaker -Version: 1.2 -Release: 14%{?dist} +Version: 1.6 +Release: 1%{?dist} Summary: Find always-on and always-off conditional C code Group: Development/Languages License: GPLv2 and GPLv3+ URL: http://vamos.informatik.uni-erlangen.de/trac/undertaker -Source0: http://vamos.informatik.uni-erlangen.de/files/%{name}-%{version}.tar.gz -# As of F20, Boost doesn't ship -mt DSO's anymore. -Patch0: %{name}-boost_mt.patch +Source0: http://vamos.informatik.uni-erlangen.de/files/%{name}-%{version}.tar.xz # Adapt to new picosat API -Patch1: %{name}-picosat.patch +Patch0: %{name}-picosat.patch BuildRequires: boost-devel BuildRequires: emacs +BuildRequires: flex +BuildRequires: libpuma-devel BuildRequires: ncurses-devel BuildRequires: picosat-devel +BuildRequires: pstreams-devel BuildRequires: python2-devel BuildRequires: xemacs BuildRequires: xemacs-packages-extra # Needed for undertaker-calc-coverage Requires: cpp +Requires: findutils Requires: git Requires: make Requires: sparse @@ -71,27 +73,27 @@ BuildArch: noarch Source Elisp code for XEmacs support for %{name}. %prep -%setup -q -n vamos-%{version} +%setup -q %patch0 -%patch1 -# Fix a python path -sed -i "s|^PYTHONPATH=.*|PYTHONPATH=\""%{python2_sitelib}"\"|" \ - rsf2model/undertaker-kconfigdump.in +# Fix python dependencies +for fil in $(grep -FRls 'bin/env' .); do + sed -i.orig 's|env python|python|' $fil + touch -r ${fil}.orig $fil + rm -f ${fil}.orig +done -# Fix a python dependency -sed 's|env python|python|' undertaker/undertaker-calc-coverage > foo -chmod a+x foo -touch -r undertaker/undertaker-calc-coverage foo -mv -f foo undertaker/undertaker-calc-coverage +# Fix the installation path for the makefiles +sed -i "s|'\.\./lib'|'../%{libdir}/%{name}', &|" python/vamos/golem/kbuild.py +sed -ri "s,Makefile\.(list|version).*\(LIBDIR\),&/undertaker," Makefile # Use the right flags when building and linking -sed -e "s|-Wall -Wextra -O2|$RPM_OPT_FLAGS|" \ +sed -e "s|-Wall -Wextra -O2|$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64|" \ -e "s|^LDFLAGS =.*|LDFLAGS = $RPM_OPT_FLAGS|" \ -i undertaker/Makefile sed -e "s|^LDXX=.*|LDXX=g++ \$(CXXFLAGS)|" \ -e "s|^DEBUG =.*|DEBUG=|" \ - -e "s|-Wall -Wextra -O2|$RPM_OPT_FLAGS|" \ + -e "s|-Wall -Wextra -O2|$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64|" \ -i ziz/Makefile # Fix the Makefile so we don't rebuild everything when installing @@ -100,53 +102,69 @@ sed -e "s|^all:.*|all: \$(PROGS) \$(TEMPLATED) \$(MANPAGES)|" \ -e "s|check undertaker-lcov|check install undertaker-lcov|" \ -i Makefile -# Remove prebuilt objects -make clean -rm -f scripts/basic/docproc scripts/basic/fixdep scripts/basic/hash \ - scripts/kconfig/dumpconf undertaker/test-ConditionalBlock \ - undertaker/test-SatChecker undertaker/undertaker ziz/zizler - -# Fix end-of-line encodings -for f in DeadAnalysis ElDocumentation Interactive ModelFiles Preconditions; do - sed -i.orig 's/\r//' doc/Undertaker$f - touch -r doc/Undertaker$f.orig doc/Undertaker$f - rm -f doc/Undertaker$f.orig -done +# Make sure we don't use the bundled version of picosat +rm -fr picosat %build -# FIXME: building with %%{?_smp_mflags} sometimes fails -make PREFIX=%{_prefix} LIBDIR=%{_libdir} \ - HOSTCFLAGS="${RPM_OPT_FLAGS}" HOSTCXXFLAGS="${RPM_OPT_FLAGS}" \ +make %{?_smp_mflags} PREFIX=%{_prefix} LIBDIR=%{_libdir} \ + ETCDIR=%{_sysconfdir} HOSTCFLAGS="${RPM_OPT_FLAGS} -D_FILE_OFFSET_BITS=64" \ + HOSTCXXFLAGS="${RPM_OPT_FLAGS} -D_FILE_OFFSET_BITS=64" \ HOSTLDFLAGS="${RPM_LD_FLAGS} -Wl,--as-needed" %install -make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIBDIR=%{_libdir} +make install DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_libdir} \ + ETCDIR=%{_sysconfdir} -# The rsf2model script is installed in two places. We only need one. -rm -f $RPM_BUILD_ROOT%{_bindir}/rsf2model +# Fix permissions +chmod 0644 %{buildroot}%{_libdir}/undertaker/Makefile* +chmod 0755 %{buildroot}%{python_sitelib}/vamos/Model_test.py +chmod 0755 %{buildroot}%{python_sitelib}/vamos/busyfix/basic_test.py +chmod 0755 %{buildroot}%{python_sitelib}/vamos/rsf2model/BoolRewriter_test.py +chmod 0755 %{buildroot}%{python_sitelib}/vamos/rsf2model/RsfReader_test.py +chmod 0755 %{buildroot}%{python_sitelib}/vamos/vampyr/Coverage_test.py +chmod 0755 %{buildroot}%{python_sitelib}/vamos/vampyr/Message_test.py +chmod 0755 %{buildroot}%{python_sitelib}/vamos/vampyr/utils.py + +# Help the debuginfo generator +mkdir -p ../libpuma-1.2/aspectc++/Puma/gen-release +pushd ../libpuma-1.2/aspectc++/Puma/gen-release +mkdir -p step1/aspects +ln -s %{_includedir}/Puma step1/aspects/Puma +mkdir -p step1/inc +ln -s %{_includedir}/Puma step1/inc/Puma +mkdir -p step2/aspects +ln -s %{_includedir}/Puma step2/aspects/Puma +popd +ln -s BoolExpLP/BoolExpLexer.l undertaker/BoolExpLexer.l +ln -s BoolExpLP/BoolExpLexer.cpp_shipped undertaker/BoolExpLexer.cpp_shipped +ln -s BoolExpLP/BoolExpParser.y undertaker/BoolExpParser.y +ln -s BoolExpLP/BoolExpParser.cpp_shipped undertaker/BoolExpParser.cpp_shipped # Copy the Emacs support to the appropriate XEmacs dir and byte compile -mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitelispdir} -cp -a $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name} \ - $RPM_BUILD_ROOT%{_xemacs_sitelispdir} -cd $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/%{name} +mkdir -p %{buildroot}%{_xemacs_sitelispdir} +cp -a %{buildroot}%{_emacs_sitelispdir}/%{name} \ + %{buildroot}%{_xemacs_sitelispdir} +cd %{buildroot}%{_xemacs_sitelispdir}/%{name} %{_xemacs_bytecompile} *.el # Byte compile the Emacs support file -cd $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name} +cd %{buildroot}%{_emacs_sitelispdir}/%{name} %{_emacs_bytecompile} *.el %files -%doc AUTHORS LICENSE README -%doc doc/UndertakerDeadAnalysis doc/UndertakerInteractive -%doc doc/UndertakerModelFiles doc/UndertakerPreconditions +%doc AUTHORS README +%license LICENSE %{_bindir}/* +%{_sbindir}/%{name}-traceutil %{_libdir}/undertaker %{_mandir}/man1/* -%{python_sitelib}/undertaker* +%dir %{_sysconfdir}/%{name}/ +%config(noreplace) %{_sysconfdir}/%{name}/blacklist* +%config(noreplace) %{_sysconfdir}/%{name}/whitelist* +%config(noreplace) %{_sysconfdir}/%{name}/undertaker.ignore +%{python_sitelib}/vamos* %files emacs -%doc doc/UndertakerElDocumentation %dir %{_emacs_sitelispdir}/%{name} %{_emacs_sitelispdir}/%{name}/*.elc @@ -154,7 +172,6 @@ cd $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name} %{_emacs_sitelispdir}/%{name}/*.el %files xemacs -%doc doc/UndertakerElDocumentation %dir %{_xemacs_sitelispdir}/%{name} %{_xemacs_sitelispdir}/%{name}/*.elc @@ -162,6 +179,12 @@ cd $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name} %{_xemacs_sitelispdir}/%{name}/*.el %changelog +* Thu Oct 23 2014 Jerry James - 1.6-1 +- New upstream version +- Drop upstreamed -boost_mt patch +- Build with -D_FILE_OFFSET_BITS=64 +- Fix license handling + * Mon Aug 18 2014 Fedora Release Engineering - 1.2-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 446a8340b2968cacf27eae5adb63981d69c9243e Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 7 Nov 2014 11:39:08 -0700 Subject: [PATCH 05/18] Avoid a conflict with the satyr package. --- undertaker-satyr.patch | 49 ++++++++++++++++++++++++++++++++++++++++++ undertaker.spec | 9 ++++++++ 2 files changed, 58 insertions(+) create mode 100644 undertaker-satyr.patch diff --git a/undertaker-satyr.patch b/undertaker-satyr.patch new file mode 100644 index 0000000..94ed057 --- /dev/null +++ b/undertaker-satyr.patch @@ -0,0 +1,49 @@ +--- ./python/undertaker-kconfigdump.orig 2014-10-12 10:18:47.000000000 -0600 ++++ ./python/undertaker-kconfigdump 2014-11-06 20:00:00.000000000 -0700 +@@ -131,7 +131,7 @@ elif [ "$MODE" = "rsf" ] || [ "$MODE" = + fi + echo "Generating Format 1.0 (rsf) models" + else +- if ! which satyr > /dev/null; then ++ if ! which undertaker-satyr > /dev/null; then + echo "No satyr binary found." + exit 1 + fi +@@ -141,7 +141,7 @@ fi + debug "undertaker: $(which undertaker)" + debug "rsf2model: $(which rsf2model)" + debug "dumpconf: $(which dumpconf)" +-debug "satyr: $(which satyr)" ++debug "satyr: $(which undertaker-satyr)" + debug "undertaker-kconfigpp: $(which undertaker-kconfigpp)" + + function all_linux_archs () { +@@ -207,7 +207,7 @@ function do_convert() { + if [ $MODE = "cnf" ]; then + # run satyr + echo "Calculating CNF model for $ARCH" +- SUBARCH=$SUBARCH SRCARCH=$ARCH ARCH=$ARCH satyr arch/$ARCHSTR/$KCONFIG -c "$MODELS/$ARCH.cnf" ++ SUBARCH=$SUBARCH SRCARCH=$ARCH ARCH=$ARCH undertaker-satyr arch/$ARCHSTR/$KCONFIG -c "$MODELS/$ARCH.cnf" + fi + } + +@@ -309,7 +309,7 @@ function do_rsf_or_satyr_call() { + + # call satyr + echo "Calculating cnf model for '$1'" +- satyr $2 -c "$MODELS/$1.cnf" ++ undertaker-satyr $2 -c "$MODELS/$1.cnf" + + # create inferences (or at least an empty file) + do_inference $1 +--- ./undertaker/satyr.cpp.orig 2014-10-12 10:18:47.000000000 -0600 ++++ ./undertaker/satyr.cpp 2014-11-06 20:00:00.000000000 -0700 +@@ -39,7 +39,7 @@ using namespace kconfig; + + + void usage(std::ostream &out) { +- out << "usage: satyr [-V] [-a | -c ] " << std::endl; ++ out << "usage: undertaker-satyr [-V] [-a | -c ] " << std::endl; + out << " model: a Kconfig file / translated cnf file" << std::endl; + out << " -a a .config file to be validated" << std::endl; + out << " (may be incomplete)" << std::endl; diff --git a/undertaker.spec b/undertaker.spec index 7c41718..df96ff1 100644 --- a/undertaker.spec +++ b/undertaker.spec @@ -9,6 +9,8 @@ URL: http://vamos.informatik.uni-erlangen.de/trac/undertaker Source0: http://vamos.informatik.uni-erlangen.de/files/%{name}-%{version}.tar.xz # Adapt to new picosat API Patch0: %{name}-picosat.patch +# Solve name clash with the satyr package +Patch1: %{name}-satyr.patch BuildRequires: boost-devel BuildRequires: emacs @@ -75,6 +77,7 @@ Source Elisp code for XEmacs support for %{name}. %prep %setup -q %patch0 +%patch1 # Fix python dependencies for fil in $(grep -FRls 'bin/env' .); do @@ -115,6 +118,9 @@ make %{?_smp_mflags} PREFIX=%{_prefix} LIBDIR=%{_libdir} \ make install DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_libdir} \ ETCDIR=%{_sysconfdir} +# Rename the satyr binary to avoid a conflict with the satyr package +mv -f %{buildroot}%{_bindir}/satyr %{buildroot}%{_bindir}/%{name}-satyr + # Fix permissions chmod 0644 %{buildroot}%{_libdir}/undertaker/Makefile* chmod 0755 %{buildroot}%{python_sitelib}/vamos/Model_test.py @@ -179,6 +185,9 @@ cd %{buildroot}%{_emacs_sitelispdir}/%{name} %{_xemacs_sitelispdir}/%{name}/*.el %changelog +* Fri Nov 7 2014 Jerry James - 1.6-2 +- Avoid a conflict with the satyr package + * Thu Oct 23 2014 Jerry James - 1.6-1 - New upstream version - Drop upstreamed -boost_mt patch From 894ac8b54c425303eaefda864d8af7de00b7e76b Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 7 Nov 2014 12:01:48 -0700 Subject: [PATCH 06/18] Actually update the release number. --- undertaker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/undertaker.spec b/undertaker.spec index df96ff1..85ff7bf 100644 --- a/undertaker.spec +++ b/undertaker.spec @@ -1,6 +1,6 @@ Name: undertaker Version: 1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Find always-on and always-off conditional C code Group: Development/Languages From 1b94fd41bee76f51025de6019334a7f3f8b94876 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 11 Dec 2014 10:08:12 -0700 Subject: [PATCH 07/18] New upstream version. --- .gitignore | 2 +- sources | 2 +- undertaker-picosat.patch | 77 ++++++++++++++++++---------------------- undertaker-satyr.patch | 28 +++++++-------- undertaker.spec | 19 +++++++--- 5 files changed, 65 insertions(+), 63 deletions(-) diff --git a/.gitignore b/.gitignore index feea2ae..1775a31 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/undertaker-1.6.tar.xz +/undertaker-1.6.1.tar.xz diff --git a/sources b/sources index e4597a0..eb2f3f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9d1c7022ad6624f2398f1e68b1e78612 undertaker-1.6.tar.xz +06bab0b89f38e4b2f40b8c64c5d5a232 undertaker-1.6.1.tar.xz diff --git a/undertaker-picosat.patch b/undertaker-picosat.patch index 2fa31cd..9cc18b3 100644 --- a/undertaker-picosat.patch +++ b/undertaker-picosat.patch @@ -1,31 +1,24 @@ ---- ./Makefile.orig 2014-10-12 10:18:47.000000000 -0600 -+++ ./Makefile 2014-10-23 20:00:00.000000000 -0600 -@@ -1,5 +1,5 @@ - PROGS = scripts/kconfig/dumpconf scripts/kconfig/conf undertaker/undertaker undertaker/predator undertaker/rsf2cnf \ -- undertaker/satyr python/rsf2model tailor/undertaker-traceutil ziz/zizler picosat/picomus -+ undertaker/satyr python/rsf2model tailor/undertaker-traceutil ziz/zizler - MANPAGES = doc/undertaker.1.gz doc/undertaker-linux-tree.1.gz doc/undertaker-kconfigdump.1.gz \ - doc/undertaker-kconfigpp.1.gz - -@@ -18,7 +18,7 @@ SETUP_PY_EXTRA_ARG = --root=$(DESTDIR) +--- ./Makefile.orig 2014-11-26 07:04:53.000000000 -0700 ++++ ./Makefile 2014-12-10 20:00:00.000000000 -0700 +@@ -23,7 +23,7 @@ SETUP_PY_EXTRA_ARG = --root=$(DESTDIR) SETUP_PY_INSTALL_EXTRA_ARG = $(SETUP_PY_EXTRA_ARG) endif --all: picosat/libpicosat.a $(PROGS) -+all: $(PROGS) +-all: picosat/libpicosat.a checkpuma $(PUMALIB) FORCE ++all: checkpuma $(PUMALIB) FORCE + $(MAKE) all_progs - version.h: generate-version.sh - ./$< -@@ -74,7 +74,7 @@ check: - $(MAKE) -C tailor $@ - $(MAKE) -s -C fm $@ + all_progs: $(OTHER_PROGS) checkpuma undertaker_progs +@@ -114,7 +114,7 @@ distclean: clean + test ! -f picosat/makefile || $(MAKE) -C picosat clean + test ! -f $(LOCALPUMA)/Makefile || $(MAKE) clean-Puma -models: picosat/libpicosat.a +models: $(MAKE) -C undertaker/kconfig-dumps/ - install: all $(MANPAGES) -@@ -115,8 +115,6 @@ install: all $(MANPAGES) + ################################################################################################### +@@ -183,8 +183,6 @@ install: all $(MANPAGES) @install -v undertaker/rsf2cnf $(DESTDIR)$(BINDIR) @install -v undertaker/satyr $(DESTDIR)$(BINDIR) @@ -34,14 +27,14 @@ @install -v ziz/zizler $(DESTDIR)$(BINDIR) @install -v scripts/Makefile.list $(DESTDIR)$(LIBDIR) ---- ./undertaker/Makefile.orig 2014-10-12 10:18:47.000000000 -0600 -+++ ./undertaker/Makefile 2014-10-23 20:00:00.000000000 -0600 +--- ./undertaker/Makefile.orig 2014-11-26 07:04:53.000000000 -0700 ++++ ./undertaker/Makefile 2014-12-10 20:00:00.000000000 -0700 @@ -5,15 +5,15 @@ SUFFIXES += .d - NODEPS:=clean clean-check clean-parsers + NODEPS:=clean clean-check clean-parsers clean-regenerate CFLAGS = -Wall -Wextra -O2 --CPPFLAGS = -I $(CURDIR)/../scripts/kconfig -I $(CURDIR)/../picosat -+CPPFLAGS = -I $(CURDIR)/../scripts/kconfig +-CPPFLAGS = -I../scripts/kconfig -I../picosat ++CPPFLAGS = -I../scripts/kconfig CXXFLAGS = $(CFLAGS) -std=gnu++11 # use g++ for linking, will automaticly use "-lstdc++ -lm" libraries @@ -50,36 +43,36 @@ -LDFLAGS = +LDFLAGS = -Wl,--as-needed BOOST_LIBS = -lboost_system -lboost_regex -lboost_filesystem -lboost_thread --LDLIBS = $(BOOST_LIBS) -lpthread -lPuma -+LDLIBS = $(BOOST_LIBS) -lpthread -lPuma -lpicosat +-LDLIBS = $(BOOST_LIBS) -lpthread ++LDLIBS = $(BOOST_LIBS) -lpthread -lpicosat # LDCOV = -coverage ifdef LDCOV -@@ -48,10 +48,10 @@ DEPFILES:=$(patsubst %.o,%.d,$(PARSEROBJ +@@ -72,10 +72,10 @@ PARSERDIR = BoolExpLP - all: $(PROGS) $(TESTPROGS) + all: $(PROGS) --undertaker: libparser.a ../picosat/libpicosat.a +-undertaker: libparser.a ../picosat/libpicosat.a $(PUMALIB) -rsf2cnf: libparser.a ../picosat/libpicosat.a -+undertaker: libparser.a ++undertaker: libparser.a $(PUMALIB) +rsf2cnf: libparser.a - predator: predator.o PredatorVisitor.o + predator: predator.o PredatorVisitor.o $(PUMALIB) -satyr: libsatyr.a zconf.tab.o ../picosat/libpicosat.a +satyr: libsatyr.a zconf.tab.o - ../picosat/libpicosat.a: - $(MAKE) -C .. picosat/libpicosat.a -@@ -104,7 +104,7 @@ clean-parsers: - rm -rf location.hh stack.hh position.hh BoolExpParser.hh - rm -rf BoolExpParser.cpp BoolExpLexer.cpp + ifneq ($(LOCALPUMA),) + $(PUMALIB): +@@ -126,7 +126,7 @@ endif + %.d: %.cpp + @$(CXX) $(CPPFLAGS) $(CXXFLAGS) -MM -MG $< > $@ --test-%: test-%.cpp libparser.a ../picosat/libpicosat.a -+test-%: test-%.cpp libparser.a +-test-%: test-%.cpp libparser.a ../picosat/libpicosat.a $(PUMALIB) ++test-%: test-%.cpp libparser.a $(PUMALIB) $(CXX) $(CPPFLAGS) $(CXXFLAGS) -g -O0 -o $@ $^ -lcheck -lrt $(LDFLAGS) $(LDLIBS) - ---- ./undertaker/PicosatCNF.cpp.orig 2014-10-12 10:18:47.000000000 -0600 -+++ ./undertaker/PicosatCNF.cpp 2014-10-21 20:00:00.000000000 -0600 + clean: clean-check +--- ./undertaker/PicosatCNF.cpp.orig 2014-11-26 07:04:53.000000000 -0700 ++++ ./undertaker/PicosatCNF.cpp 2014-12-10 20:00:00.000000000 -0700 @@ -30,7 +30,7 @@ namespace Picosat { // include picosat header as C @@ -87,7 +80,7 @@ - #include "picosat.h" + #include } - } + } // namespace Picosat @@ -39,6 +39,7 @@ using namespace kconfig; diff --git a/undertaker-satyr.patch b/undertaker-satyr.patch index 94ed057..e96e43e 100644 --- a/undertaker-satyr.patch +++ b/undertaker-satyr.patch @@ -1,15 +1,15 @@ ---- ./python/undertaker-kconfigdump.orig 2014-10-12 10:18:47.000000000 -0600 -+++ ./python/undertaker-kconfigdump 2014-11-06 20:00:00.000000000 -0700 -@@ -131,7 +131,7 @@ elif [ "$MODE" = "rsf" ] || [ "$MODE" = +--- ./python/undertaker-kconfigdump.orig 2014-11-26 07:04:53.000000000 -0700 ++++ ./python/undertaker-kconfigdump 2014-12-10 20:00:00.000000000 -0700 +@@ -130,7 +130,7 @@ elif [ "$MODE" = "rsf" ] || [ "$MODE" = fi - echo "Generating Format 1.0 (rsf) models" + echo "Generating Format 1.0 (RSF) models" else - if ! which satyr > /dev/null; then + if ! which undertaker-satyr > /dev/null; then echo "No satyr binary found." exit 1 fi -@@ -141,7 +141,7 @@ fi +@@ -140,7 +140,7 @@ fi debug "undertaker: $(which undertaker)" debug "rsf2model: $(which rsf2model)" debug "dumpconf: $(which dumpconf)" @@ -18,26 +18,26 @@ debug "undertaker-kconfigpp: $(which undertaker-kconfigpp)" function all_linux_archs () { -@@ -207,7 +207,7 @@ function do_convert() { +@@ -208,7 +208,7 @@ function do_convert() { if [ $MODE = "cnf" ]; then - # run satyr echo "Calculating CNF model for $ARCH" -- SUBARCH=$SUBARCH SRCARCH=$ARCH ARCH=$ARCH satyr arch/$ARCHSTR/$KCONFIG -c "$MODELS/$ARCH.cnf" -+ SUBARCH=$SUBARCH SRCARCH=$ARCH ARCH=$ARCH undertaker-satyr arch/$ARCHSTR/$KCONFIG -c "$MODELS/$ARCH.cnf" + # Run satyr to generate CNF models. +- SUBARCH=$SUBARCH SRCARCH=$ARCH ARCH=$ARCH satyr $KCONFIG_FILE -c "$MODELS/$ARCH.cnf" ++ SUBARCH=$SUBARCH SRCARCH=$ARCH ARCH=$ARCH undertaker-satyr $KCONFIG_FILE -c "$MODELS/$ARCH.cnf" fi } @@ -309,7 +309,7 @@ function do_rsf_or_satyr_call() { + done - # call satyr - echo "Calculating cnf model for '$1'" + echo "Calculating CNF model for '$1'" - satyr $2 -c "$MODELS/$1.cnf" + undertaker-satyr $2 -c "$MODELS/$1.cnf" - # create inferences (or at least an empty file) + # Create inferences (or at least an empty file). do_inference $1 ---- ./undertaker/satyr.cpp.orig 2014-10-12 10:18:47.000000000 -0600 -+++ ./undertaker/satyr.cpp 2014-11-06 20:00:00.000000000 -0700 +--- ./undertaker/satyr.cpp.orig 2014-11-26 07:04:53.000000000 -0700 ++++ ./undertaker/satyr.cpp 2014-12-10 20:00:00.000000000 -0700 @@ -39,7 +39,7 @@ using namespace kconfig; diff --git a/undertaker.spec b/undertaker.spec index 85ff7bf..6b0f40c 100644 --- a/undertaker.spec +++ b/undertaker.spec @@ -1,6 +1,6 @@ Name: undertaker -Version: 1.6 -Release: 2%{?dist} +Version: 1.6.1 +Release: 1%{?dist} Summary: Find always-on and always-off conditional C code Group: Development/Languages @@ -23,6 +23,9 @@ BuildRequires: python2-devel BuildRequires: xemacs BuildRequires: xemacs-packages-extra +# Needed for undertaker +Requires: picosat + # Needed for undertaker-calc-coverage Requires: cpp Requires: findutils @@ -92,15 +95,18 @@ sed -ri "s,Makefile\.(list|version).*\(LIBDIR\),&/undertaker," Makefile # Use the right flags when building and linking sed -e "s|-Wall -Wextra -O2|$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64|" \ - -e "s|^LDFLAGS =.*|LDFLAGS = $RPM_OPT_FLAGS|" \ + -e "s|^LDFLAGS =.*|LDFLAGS = $RPM_LD_FLAGS|" \ -i undertaker/Makefile sed -e "s|^LDXX=.*|LDXX=g++ \$(CXXFLAGS)|" \ -e "s|^DEBUG =.*|DEBUG=|" \ -e "s|-Wall -Wextra -O2|$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64|" \ -i ziz/Makefile -# Fix the Makefile so we don't rebuild everything when installing -sed -e "s|^all:.*|all: \$(PROGS) \$(TEMPLATED) \$(MANPAGES)|" \ +# The Makefile thinks the man pages are compressed, but they aren't + +# Fix the Makefile so we don't rebuild everything when installing, and we don't +# try to install compressed man pages when they are really not compressed +sed -e "s/\([^%]\.1\)\.gz/\1/g" \ -e "s|^install: all.*|install:|" \ -e "s|check undertaker-lcov|check install undertaker-lcov|" \ -i Makefile @@ -185,6 +191,9 @@ cd %{buildroot}%{_emacs_sitelispdir}/%{name} %{_xemacs_sitelispdir}/%{name}/*.el %changelog +* Thu Dec 11 2014 Jerry James - 1.6.1-1 +- New upstream version + * Fri Nov 7 2014 Jerry James - 1.6-2 - Avoid a conflict with the satyr package From e1e1701c18d55d6c2c9501cf28c829eaec850709 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 27 Jan 2015 12:37:13 +0100 Subject: [PATCH 08/18] Rebuild for boost 1.57.0 --- undertaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/undertaker.spec b/undertaker.spec index 6b0f40c..793e36f 100644 --- a/undertaker.spec +++ b/undertaker.spec @@ -1,6 +1,6 @@ Name: undertaker Version: 1.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Find always-on and always-off conditional C code Group: Development/Languages @@ -191,6 +191,9 @@ cd %{buildroot}%{_emacs_sitelispdir}/%{name} %{_xemacs_sitelispdir}/%{name}/*.el %changelog +* Tue Jan 27 2015 Petr Machata - 1.6.1-2 +- Rebuild for boost 1.57.0 + * Thu Dec 11 2014 Jerry James - 1.6.1-1 - New upstream version From 3c1b2c0091516b5145325945a02e31b5a2700ab4 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 9 Feb 2015 20:10:31 -0700 Subject: [PATCH 09/18] Add -const patch to fix build with gcc 5.0. --- undertaker-const.patch | 10 ++++++++++ undertaker.spec | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 undertaker-const.patch diff --git a/undertaker-const.patch b/undertaker-const.patch new file mode 100644 index 0000000..286eb73 --- /dev/null +++ b/undertaker-const.patch @@ -0,0 +1,10 @@ +--- ./undertaker/ConditionalBlock.h.orig 2014-11-26 07:04:53.000000000 -0700 ++++ ./undertaker/ConditionalBlock.h 2015-02-09 20:00:00.000000000 -0700 +@@ -72,6 +72,7 @@ public: + * \return map with defined symbol to define object + */ + DefineMap *getDefines() { return &define_map; }; ++ const DefineMap *getDefines() const { return &define_map; }; + + //! \return filename given in the constructor + const std::string &getFilename() const { return filename; }; diff --git a/undertaker.spec b/undertaker.spec index 793e36f..2942715 100644 --- a/undertaker.spec +++ b/undertaker.spec @@ -1,6 +1,6 @@ Name: undertaker Version: 1.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Find always-on and always-off conditional C code Group: Development/Languages @@ -11,6 +11,8 @@ Source0: http://vamos.informatik.uni-erlangen.de/files/%{name}-%{version} Patch0: %{name}-picosat.patch # Solve name clash with the satyr package Patch1: %{name}-satyr.patch +# Fix a const-ness problem that causes a build failure with g++ 5.0 +Patch2: %{name}-const.patch BuildRequires: boost-devel BuildRequires: emacs @@ -81,6 +83,7 @@ Source Elisp code for XEmacs support for %{name}. %setup -q %patch0 %patch1 +%patch2 # Fix python dependencies for fil in $(grep -FRls 'bin/env' .); do @@ -191,6 +194,9 @@ cd %{buildroot}%{_emacs_sitelispdir}/%{name} %{_xemacs_sitelispdir}/%{name}/*.el %changelog +* Mon Feb 9 2015 Jerry James - 1.6.1-3 +- Add -const patch to fix build with gcc 5.0 + * Tue Jan 27 2015 Petr Machata - 1.6.1-2 - Rebuild for boost 1.57.0 From c582eb2bb56808e975e46a2169e048f6fa09d50b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 18:20:38 +0200 Subject: [PATCH 10/18] Rebuilt for GCC 5 C++11 ABI change --- undertaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/undertaker.spec b/undertaker.spec index 2942715..c394b6d 100644 --- a/undertaker.spec +++ b/undertaker.spec @@ -1,6 +1,6 @@ Name: undertaker Version: 1.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Find always-on and always-off conditional C code Group: Development/Languages @@ -194,6 +194,9 @@ cd %{buildroot}%{_emacs_sitelispdir}/%{name} %{_xemacs_sitelispdir}/%{name}/*.el %changelog +* Sat May 02 2015 Kalev Lember - 1.6.1-4 +- Rebuilt for GCC 5 C++11 ABI change + * Mon Feb 9 2015 Jerry James - 1.6.1-3 - Add -const patch to fix build with gcc 5.0 From 909f5f3a4bfab72939bee59dbd10b5fc42e0eefd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 01:32:40 +0000 Subject: [PATCH 11/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- undertaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/undertaker.spec b/undertaker.spec index c394b6d..e4bf208 100644 --- a/undertaker.spec +++ b/undertaker.spec @@ -1,6 +1,6 @@ Name: undertaker Version: 1.6.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Find always-on and always-off conditional C code Group: Development/Languages @@ -194,6 +194,9 @@ cd %{buildroot}%{_emacs_sitelispdir}/%{name} %{_xemacs_sitelispdir}/%{name}/*.el %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 1.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 1.6.1-4 - Rebuilt for GCC 5 C++11 ABI change From 8f3116aefe4dd1efcaab9ce34d65a7eab24d898c Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 22 Jul 2015 19:42:18 +0200 Subject: [PATCH 12/18] rebuild for Boost 1.58 --- undertaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/undertaker.spec b/undertaker.spec index e4bf208..53d9452 100644 --- a/undertaker.spec +++ b/undertaker.spec @@ -1,6 +1,6 @@ Name: undertaker Version: 1.6.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Find always-on and always-off conditional C code Group: Development/Languages @@ -194,6 +194,9 @@ cd %{buildroot}%{_emacs_sitelispdir}/%{name} %{_xemacs_sitelispdir}/%{name}/*.el %changelog +* Wed Jul 22 2015 David Tardon - 1.6.1-6 +- rebuild for Boost 1.58 + * Fri Jun 19 2015 Fedora Release Engineering - 1.6.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 282247010703fa56c0deb285308f4f0b7eefe357 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 29 Jul 2015 13:29:51 -0500 Subject: [PATCH 13/18] - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 --- undertaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/undertaker.spec b/undertaker.spec index 53d9452..c729f34 100644 --- a/undertaker.spec +++ b/undertaker.spec @@ -1,6 +1,6 @@ Name: undertaker Version: 1.6.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Find always-on and always-off conditional C code Group: Development/Languages @@ -194,6 +194,9 @@ cd %{buildroot}%{_emacs_sitelispdir}/%{name} %{_xemacs_sitelispdir}/%{name}/*.el %changelog +* Wed Jul 29 2015 Fedora Release Engineering - 1.6.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 + * Wed Jul 22 2015 David Tardon - 1.6.1-6 - rebuild for Boost 1.58 From df1e0a120824054209ae9c0380085c82f4ef0ffe Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 5 Sep 2015 11:11:13 -0600 Subject: [PATCH 14/18] Fix FTBFS due to docdir handling changes. --- undertaker.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/undertaker.spec b/undertaker.spec index c729f34..5f33503 100644 --- a/undertaker.spec +++ b/undertaker.spec @@ -168,6 +168,7 @@ cd %{buildroot}%{_emacs_sitelispdir}/%{name} %files %doc AUTHORS README +%{_docdir}/%{name}/tailor/ %license LICENSE %{_bindir}/* %{_sbindir}/%{name}-traceutil From 8b7d7ff5557b73c3bfdd2e07ed482bc418063377 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 13 Jan 2016 21:18:14 -0700 Subject: [PATCH 15/18] Rebuild for picosat 965. --- undertaker.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/undertaker.spec b/undertaker.spec index 5f33503..e7211b9 100644 --- a/undertaker.spec +++ b/undertaker.spec @@ -1,9 +1,8 @@ Name: undertaker Version: 1.6.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Find always-on and always-off conditional C code -Group: Development/Languages License: GPLv2 and GPLv3+ URL: http://vamos.informatik.uni-erlangen.de/trac/undertaker Source0: http://vamos.informatik.uni-erlangen.de/files/%{name}-%{version}.tar.xz @@ -43,7 +42,6 @@ blocks that can't be selected or deselected. %package emacs Summary: Emacs support for %{name} -Group: Development/Languages Requires: emacs(bin) >= %{_emacs_version} Requires: %{name} = %{version}-%{release} BuildArch: noarch @@ -53,7 +51,6 @@ Emacs support for %{name}. %package emacs-el Summary: Source for Emacs support for %{name} -Group: Development/Languages Requires: %{name}-emacs = %{version}-%{release} BuildArch: noarch @@ -62,7 +59,6 @@ Source Elisp code for Emacs support for %{name}. %package xemacs Summary: XEmacs support for %{name} -Group: Development/Languages Requires: xemacs(bin) >= %{_xemacs_version}, xemacs-packages-extra Requires: %{name} = %{version}-%{release} BuildArch: noarch @@ -72,7 +68,6 @@ XEmacs support for %{name}. %package xemacs-el Summary: Source for XEmacs support for %{name} -Group: Development/Languages Requires: %{name}-xemacs = %{version}-%{release} BuildArch: noarch @@ -195,6 +190,9 @@ cd %{buildroot}%{_emacs_sitelispdir}/%{name} %{_xemacs_sitelispdir}/%{name}/*.el %changelog +* Wed Jan 13 2016 Jerry James - 1.6.1-8 +- Rebuild for picosat 965 + * Wed Jul 29 2015 Fedora Release Engineering - 1.6.1-7 - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 From e159c59783c55889f807f7a32122e3ee0328fd06 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sat, 16 Jan 2016 01:27:15 +0000 Subject: [PATCH 16/18] Rebuilt for Boost 1.60 --- undertaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/undertaker.spec b/undertaker.spec index e7211b9..03fae75 100644 --- a/undertaker.spec +++ b/undertaker.spec @@ -1,6 +1,6 @@ Name: undertaker Version: 1.6.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Find always-on and always-off conditional C code License: GPLv2 and GPLv3+ @@ -190,6 +190,9 @@ cd %{buildroot}%{_emacs_sitelispdir}/%{name} %{_xemacs_sitelispdir}/%{name}/*.el %changelog +* Sat Jan 16 2016 Jonathan Wakely - 1.6.1-9 +- Rebuilt for Boost 1.60 + * Wed Jan 13 2016 Jerry James - 1.6.1-8 - Rebuild for picosat 965 From d3ad66862d936ae23436bd89b6658c76b3514544 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:20:37 +0000 Subject: [PATCH 17/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- undertaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/undertaker.spec b/undertaker.spec index 03fae75..b02c921 100644 --- a/undertaker.spec +++ b/undertaker.spec @@ -1,6 +1,6 @@ Name: undertaker Version: 1.6.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Find always-on and always-off conditional C code License: GPLv2 and GPLv3+ @@ -190,6 +190,9 @@ cd %{buildroot}%{_emacs_sitelispdir}/%{name} %{_xemacs_sitelispdir}/%{name}/*.el %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 1.6.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sat Jan 16 2016 Jonathan Wakely - 1.6.1-9 - Rebuilt for Boost 1.60 From 9f95d8f96d02528be492a598591b999059555f01 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Thu, 19 May 2016 22:49:24 +0200 Subject: [PATCH 18/18] 2016-05-19: Retired orphaned package, because it was orphaned for more than six weeks. --- .gitignore | 1 - dead.package | 3 + sources | 1 - undertaker-const.patch | 10 -- undertaker-picosat.patch | 144 -------------------- undertaker-satyr.patch | 49 ------- undertaker.spec | 276 --------------------------------------- 7 files changed, 3 insertions(+), 481 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 undertaker-const.patch delete mode 100644 undertaker-picosat.patch delete mode 100644 undertaker-satyr.patch delete mode 100644 undertaker.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 1775a31..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/undertaker-1.6.1.tar.xz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..164cb9a --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +2016-05-19: Retired orphaned package, because it was orphaned for +more than six weeks. + diff --git a/sources b/sources deleted file mode 100644 index eb2f3f5..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -06bab0b89f38e4b2f40b8c64c5d5a232 undertaker-1.6.1.tar.xz diff --git a/undertaker-const.patch b/undertaker-const.patch deleted file mode 100644 index 286eb73..0000000 --- a/undertaker-const.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./undertaker/ConditionalBlock.h.orig 2014-11-26 07:04:53.000000000 -0700 -+++ ./undertaker/ConditionalBlock.h 2015-02-09 20:00:00.000000000 -0700 -@@ -72,6 +72,7 @@ public: - * \return map with defined symbol to define object - */ - DefineMap *getDefines() { return &define_map; }; -+ const DefineMap *getDefines() const { return &define_map; }; - - //! \return filename given in the constructor - const std::string &getFilename() const { return filename; }; diff --git a/undertaker-picosat.patch b/undertaker-picosat.patch deleted file mode 100644 index 9cc18b3..0000000 --- a/undertaker-picosat.patch +++ /dev/null @@ -1,144 +0,0 @@ ---- ./Makefile.orig 2014-11-26 07:04:53.000000000 -0700 -+++ ./Makefile 2014-12-10 20:00:00.000000000 -0700 -@@ -23,7 +23,7 @@ SETUP_PY_EXTRA_ARG = --root=$(DESTDIR) - SETUP_PY_INSTALL_EXTRA_ARG = $(SETUP_PY_EXTRA_ARG) - endif - --all: picosat/libpicosat.a checkpuma $(PUMALIB) FORCE -+all: checkpuma $(PUMALIB) FORCE - $(MAKE) all_progs - - all_progs: $(OTHER_PROGS) checkpuma undertaker_progs -@@ -114,7 +114,7 @@ distclean: clean - test ! -f picosat/makefile || $(MAKE) -C picosat clean - test ! -f $(LOCALPUMA)/Makefile || $(MAKE) clean-Puma - --models: picosat/libpicosat.a -+models: - $(MAKE) -C undertaker/kconfig-dumps/ - - ################################################################################################### -@@ -183,8 +183,6 @@ install: all $(MANPAGES) - @install -v undertaker/rsf2cnf $(DESTDIR)$(BINDIR) - @install -v undertaker/satyr $(DESTDIR)$(BINDIR) - -- @install -v picosat/picomus $(DESTDIR)$(BINDIR) -- - @install -v ziz/zizler $(DESTDIR)$(BINDIR) - - @install -v scripts/Makefile.list $(DESTDIR)$(LIBDIR) ---- ./undertaker/Makefile.orig 2014-11-26 07:04:53.000000000 -0700 -+++ ./undertaker/Makefile 2014-12-10 20:00:00.000000000 -0700 -@@ -5,15 +5,15 @@ SUFFIXES += .d - NODEPS:=clean clean-check clean-parsers clean-regenerate - - CFLAGS = -Wall -Wextra -O2 --CPPFLAGS = -I../scripts/kconfig -I../picosat -+CPPFLAGS = -I../scripts/kconfig - CXXFLAGS = $(CFLAGS) -std=gnu++11 - - # use g++ for linking, will automaticly use "-lstdc++ -lm" libraries - CC = g++ - --LDFLAGS = -+LDFLAGS = -Wl,--as-needed - BOOST_LIBS = -lboost_system -lboost_regex -lboost_filesystem -lboost_thread --LDLIBS = $(BOOST_LIBS) -lpthread -+LDLIBS = $(BOOST_LIBS) -lpthread -lpicosat - - # LDCOV = -coverage - ifdef LDCOV -@@ -72,10 +72,10 @@ PARSERDIR = BoolExpLP - - all: $(PROGS) - --undertaker: libparser.a ../picosat/libpicosat.a $(PUMALIB) --rsf2cnf: libparser.a ../picosat/libpicosat.a -+undertaker: libparser.a $(PUMALIB) -+rsf2cnf: libparser.a - predator: predator.o PredatorVisitor.o $(PUMALIB) --satyr: libsatyr.a zconf.tab.o ../picosat/libpicosat.a -+satyr: libsatyr.a zconf.tab.o - - ifneq ($(LOCALPUMA),) - $(PUMALIB): -@@ -126,7 +126,7 @@ endif - %.d: %.cpp - @$(CXX) $(CPPFLAGS) $(CXXFLAGS) -MM -MG $< > $@ - --test-%: test-%.cpp libparser.a ../picosat/libpicosat.a $(PUMALIB) -+test-%: test-%.cpp libparser.a $(PUMALIB) - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -g -O0 -o $@ $^ -lcheck -lrt $(LDFLAGS) $(LDLIBS) - - clean: clean-check ---- ./undertaker/PicosatCNF.cpp.orig 2014-11-26 07:04:53.000000000 -0700 -+++ ./undertaker/PicosatCNF.cpp 2014-12-10 20:00:00.000000000 -0700 -@@ -30,7 +30,7 @@ - namespace Picosat { - // include picosat header as C - extern "C" { -- #include "picosat.h" -+ #include - } - } // namespace Picosat - -@@ -39,6 +39,7 @@ using namespace kconfig; - - static bool picosatIsInitalized = false; - static PicosatCNF *currentContext = nullptr; -+static Picosat::PicoSAT *picosat_inst; - - PicosatCNF::PicosatCNF(Picosat::SATMode defaultPhase) : defaultPhase(defaultPhase) {} - -@@ -309,26 +310,26 @@ bool PicosatCNF::checkSatisfiable() { - if (this != currentContext){ - // if not, reset the context.... - if (picosatIsInitalized) -- Picosat::picosat_reset(); -- Picosat::picosat_init(); -+ Picosat::picosat_reset(picosat_inst); -+ picosat_inst = Picosat::picosat_init(); - picosatIsInitalized = true; - // and load the current context - currentContext = this; -- Picosat::picosat_set_global_default_phase(defaultPhase); -+ Picosat::picosat_set_global_default_phase(picosat_inst, defaultPhase); - } - if (pushed_clauses_index < clauses.size()) { - // tell picosat how many different variables it will receive -- Picosat::picosat_adjust(varcount); -+ Picosat::picosat_adjust(picosat_inst, varcount); - - for (unsigned int i = pushed_clauses_index, e = clauses.size(); i < e; ++i) -- Picosat::picosat_add(clauses[i]); -+ Picosat::picosat_add(picosat_inst, clauses[i]); - pushed_clauses_index = clauses.size(); - } - for (const int &assumption : assumptions) -- Picosat::picosat_assume(assumption); -+ Picosat::picosat_assume(picosat_inst, assumption); - - assumptions.clear(); -- return Picosat::picosat_sat(-1) == PICOSAT_SATISFIABLE; -+ return Picosat::picosat_sat(picosat_inst, -1) == PICOSAT_SATISFIABLE; - } - - void PicosatCNF::pushAssumptions(std::map &a) { -@@ -340,7 +341,7 @@ void PicosatCNF::pushAssumptions(std::ma - } - - bool PicosatCNF::deref(int s) const { -- return Picosat::picosat_deref(s) == 1; -+ return Picosat::picosat_deref(picosat_inst, s) == 1; - } - - bool PicosatCNF::deref(const std::string &s) const { -@@ -359,7 +360,7 @@ const std::string *PicosatCNF::getAssoci - } - - const int *PicosatCNF::failedAssumptions() const { -- return Picosat::picosat_failed_assumptions(); -+ return Picosat::picosat_failed_assumptions(picosat_inst); - } - - void PicosatCNF::addMetaValue(const std::string &key, const std::string &value) { diff --git a/undertaker-satyr.patch b/undertaker-satyr.patch deleted file mode 100644 index e96e43e..0000000 --- a/undertaker-satyr.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- ./python/undertaker-kconfigdump.orig 2014-11-26 07:04:53.000000000 -0700 -+++ ./python/undertaker-kconfigdump 2014-12-10 20:00:00.000000000 -0700 -@@ -130,7 +130,7 @@ elif [ "$MODE" = "rsf" ] || [ "$MODE" = - fi - echo "Generating Format 1.0 (RSF) models" - else -- if ! which satyr > /dev/null; then -+ if ! which undertaker-satyr > /dev/null; then - echo "No satyr binary found." - exit 1 - fi -@@ -140,7 +140,7 @@ fi - debug "undertaker: $(which undertaker)" - debug "rsf2model: $(which rsf2model)" - debug "dumpconf: $(which dumpconf)" --debug "satyr: $(which satyr)" -+debug "satyr: $(which undertaker-satyr)" - debug "undertaker-kconfigpp: $(which undertaker-kconfigpp)" - - function all_linux_archs () { -@@ -208,7 +208,7 @@ function do_convert() { - if [ $MODE = "cnf" ]; then - echo "Calculating CNF model for $ARCH" - # Run satyr to generate CNF models. -- SUBARCH=$SUBARCH SRCARCH=$ARCH ARCH=$ARCH satyr $KCONFIG_FILE -c "$MODELS/$ARCH.cnf" -+ SUBARCH=$SUBARCH SRCARCH=$ARCH ARCH=$ARCH undertaker-satyr $KCONFIG_FILE -c "$MODELS/$ARCH.cnf" - fi - } - -@@ -309,7 +309,7 @@ function do_rsf_or_satyr_call() { - done - - echo "Calculating CNF model for '$1'" -- satyr $2 -c "$MODELS/$1.cnf" -+ undertaker-satyr $2 -c "$MODELS/$1.cnf" - - # Create inferences (or at least an empty file). - do_inference $1 ---- ./undertaker/satyr.cpp.orig 2014-11-26 07:04:53.000000000 -0700 -+++ ./undertaker/satyr.cpp 2014-12-10 20:00:00.000000000 -0700 -@@ -39,7 +39,7 @@ using namespace kconfig; - - - void usage(std::ostream &out) { -- out << "usage: satyr [-V] [-a | -c ] " << std::endl; -+ out << "usage: undertaker-satyr [-V] [-a | -c ] " << std::endl; - out << " model: a Kconfig file / translated cnf file" << std::endl; - out << " -a a .config file to be validated" << std::endl; - out << " (may be incomplete)" << std::endl; diff --git a/undertaker.spec b/undertaker.spec deleted file mode 100644 index b02c921..0000000 --- a/undertaker.spec +++ /dev/null @@ -1,276 +0,0 @@ -Name: undertaker -Version: 1.6.1 -Release: 10%{?dist} -Summary: Find always-on and always-off conditional C code - -License: GPLv2 and GPLv3+ -URL: http://vamos.informatik.uni-erlangen.de/trac/undertaker -Source0: http://vamos.informatik.uni-erlangen.de/files/%{name}-%{version}.tar.xz -# Adapt to new picosat API -Patch0: %{name}-picosat.patch -# Solve name clash with the satyr package -Patch1: %{name}-satyr.patch -# Fix a const-ness problem that causes a build failure with g++ 5.0 -Patch2: %{name}-const.patch - -BuildRequires: boost-devel -BuildRequires: emacs -BuildRequires: flex -BuildRequires: libpuma-devel -BuildRequires: ncurses-devel -BuildRequires: picosat-devel -BuildRequires: pstreams-devel -BuildRequires: python2-devel -BuildRequires: xemacs -BuildRequires: xemacs-packages-extra - -# Needed for undertaker -Requires: picosat - -# Needed for undertaker-calc-coverage -Requires: cpp -Requires: findutils -Requires: git -Requires: make -Requires: sparse - -%description -The undertaker is an implementation of the Vamos project's preprocessor -and configuration analysis approaches. It can check the structure of -preprocessor directives against different configuration models to find -blocks that can't be selected or deselected. - -%package emacs -Summary: Emacs support for %{name} -Requires: emacs(bin) >= %{_emacs_version} -Requires: %{name} = %{version}-%{release} -BuildArch: noarch - -%description emacs -Emacs support for %{name}. - -%package emacs-el -Summary: Source for Emacs support for %{name} -Requires: %{name}-emacs = %{version}-%{release} -BuildArch: noarch - -%description emacs-el -Source Elisp code for Emacs support for %{name}. - -%package xemacs -Summary: XEmacs support for %{name} -Requires: xemacs(bin) >= %{_xemacs_version}, xemacs-packages-extra -Requires: %{name} = %{version}-%{release} -BuildArch: noarch - -%description xemacs -XEmacs support for %{name}. - -%package xemacs-el -Summary: Source for XEmacs support for %{name} -Requires: %{name}-xemacs = %{version}-%{release} -BuildArch: noarch - -%description xemacs-el -Source Elisp code for XEmacs support for %{name}. - -%prep -%setup -q -%patch0 -%patch1 -%patch2 - -# Fix python dependencies -for fil in $(grep -FRls 'bin/env' .); do - sed -i.orig 's|env python|python|' $fil - touch -r ${fil}.orig $fil - rm -f ${fil}.orig -done - -# Fix the installation path for the makefiles -sed -i "s|'\.\./lib'|'../%{libdir}/%{name}', &|" python/vamos/golem/kbuild.py -sed -ri "s,Makefile\.(list|version).*\(LIBDIR\),&/undertaker," Makefile - -# Use the right flags when building and linking -sed -e "s|-Wall -Wextra -O2|$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64|" \ - -e "s|^LDFLAGS =.*|LDFLAGS = $RPM_LD_FLAGS|" \ - -i undertaker/Makefile -sed -e "s|^LDXX=.*|LDXX=g++ \$(CXXFLAGS)|" \ - -e "s|^DEBUG =.*|DEBUG=|" \ - -e "s|-Wall -Wextra -O2|$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64|" \ - -i ziz/Makefile - -# The Makefile thinks the man pages are compressed, but they aren't - -# Fix the Makefile so we don't rebuild everything when installing, and we don't -# try to install compressed man pages when they are really not compressed -sed -e "s/\([^%]\.1\)\.gz/\1/g" \ - -e "s|^install: all.*|install:|" \ - -e "s|check undertaker-lcov|check install undertaker-lcov|" \ - -i Makefile - -# Make sure we don't use the bundled version of picosat -rm -fr picosat - -%build -make %{?_smp_mflags} PREFIX=%{_prefix} LIBDIR=%{_libdir} \ - ETCDIR=%{_sysconfdir} HOSTCFLAGS="${RPM_OPT_FLAGS} -D_FILE_OFFSET_BITS=64" \ - HOSTCXXFLAGS="${RPM_OPT_FLAGS} -D_FILE_OFFSET_BITS=64" \ - HOSTLDFLAGS="${RPM_LD_FLAGS} -Wl,--as-needed" - -%install -make install DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_libdir} \ - ETCDIR=%{_sysconfdir} - -# Rename the satyr binary to avoid a conflict with the satyr package -mv -f %{buildroot}%{_bindir}/satyr %{buildroot}%{_bindir}/%{name}-satyr - -# Fix permissions -chmod 0644 %{buildroot}%{_libdir}/undertaker/Makefile* -chmod 0755 %{buildroot}%{python_sitelib}/vamos/Model_test.py -chmod 0755 %{buildroot}%{python_sitelib}/vamos/busyfix/basic_test.py -chmod 0755 %{buildroot}%{python_sitelib}/vamos/rsf2model/BoolRewriter_test.py -chmod 0755 %{buildroot}%{python_sitelib}/vamos/rsf2model/RsfReader_test.py -chmod 0755 %{buildroot}%{python_sitelib}/vamos/vampyr/Coverage_test.py -chmod 0755 %{buildroot}%{python_sitelib}/vamos/vampyr/Message_test.py -chmod 0755 %{buildroot}%{python_sitelib}/vamos/vampyr/utils.py - -# Help the debuginfo generator -mkdir -p ../libpuma-1.2/aspectc++/Puma/gen-release -pushd ../libpuma-1.2/aspectc++/Puma/gen-release -mkdir -p step1/aspects -ln -s %{_includedir}/Puma step1/aspects/Puma -mkdir -p step1/inc -ln -s %{_includedir}/Puma step1/inc/Puma -mkdir -p step2/aspects -ln -s %{_includedir}/Puma step2/aspects/Puma -popd -ln -s BoolExpLP/BoolExpLexer.l undertaker/BoolExpLexer.l -ln -s BoolExpLP/BoolExpLexer.cpp_shipped undertaker/BoolExpLexer.cpp_shipped -ln -s BoolExpLP/BoolExpParser.y undertaker/BoolExpParser.y -ln -s BoolExpLP/BoolExpParser.cpp_shipped undertaker/BoolExpParser.cpp_shipped - -# Copy the Emacs support to the appropriate XEmacs dir and byte compile -mkdir -p %{buildroot}%{_xemacs_sitelispdir} -cp -a %{buildroot}%{_emacs_sitelispdir}/%{name} \ - %{buildroot}%{_xemacs_sitelispdir} -cd %{buildroot}%{_xemacs_sitelispdir}/%{name} -%{_xemacs_bytecompile} *.el - -# Byte compile the Emacs support file -cd %{buildroot}%{_emacs_sitelispdir}/%{name} -%{_emacs_bytecompile} *.el - -%files -%doc AUTHORS README -%{_docdir}/%{name}/tailor/ -%license LICENSE -%{_bindir}/* -%{_sbindir}/%{name}-traceutil -%{_libdir}/undertaker -%{_mandir}/man1/* -%dir %{_sysconfdir}/%{name}/ -%config(noreplace) %{_sysconfdir}/%{name}/blacklist* -%config(noreplace) %{_sysconfdir}/%{name}/whitelist* -%config(noreplace) %{_sysconfdir}/%{name}/undertaker.ignore -%{python_sitelib}/vamos* - -%files emacs -%dir %{_emacs_sitelispdir}/%{name} -%{_emacs_sitelispdir}/%{name}/*.elc - -%files emacs-el -%{_emacs_sitelispdir}/%{name}/*.el - -%files xemacs -%dir %{_xemacs_sitelispdir}/%{name} -%{_xemacs_sitelispdir}/%{name}/*.elc - -%files xemacs-el -%{_xemacs_sitelispdir}/%{name}/*.el - -%changelog -* Fri Feb 05 2016 Fedora Release Engineering - 1.6.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sat Jan 16 2016 Jonathan Wakely - 1.6.1-9 -- Rebuilt for Boost 1.60 - -* Wed Jan 13 2016 Jerry James - 1.6.1-8 -- Rebuild for picosat 965 - -* Wed Jul 29 2015 Fedora Release Engineering - 1.6.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 1.6.1-6 -- rebuild for Boost 1.58 - -* Fri Jun 19 2015 Fedora Release Engineering - 1.6.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 1.6.1-4 -- Rebuilt for GCC 5 C++11 ABI change - -* Mon Feb 9 2015 Jerry James - 1.6.1-3 -- Add -const patch to fix build with gcc 5.0 - -* Tue Jan 27 2015 Petr Machata - 1.6.1-2 -- Rebuild for boost 1.57.0 - -* Thu Dec 11 2014 Jerry James - 1.6.1-1 -- New upstream version - -* Fri Nov 7 2014 Jerry James - 1.6-2 -- Avoid a conflict with the satyr package - -* Thu Oct 23 2014 Jerry James - 1.6-1 -- New upstream version -- Drop upstreamed -boost_mt patch -- Build with -D_FILE_OFFSET_BITS=64 -- Fix license handling - -* Mon Aug 18 2014 Fedora Release Engineering - 1.2-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.2-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 23 2014 Petr Machata - 1.2-12 -- Rebuild for boost 1.55.0 - -* Wed Jul 31 2013 Jerry James - 1.2-11 -- Add -picosat patch to adapt to new reentrant picosat API - -* Sat Jul 27 2013 Petr Machata - 1.2-10 -- Rebuild for boost 1.54.0 -- Boost.Wave and Boost.System DSO's do not include -mt suffix anymore - (undertaker-boost_mt.patch). - -* Sat Feb 09 2013 Denis Arnaud - 1.2-9 -- Rebuild for Boost-1.53.0 - -* Mon Aug 20 2012 Jerry James - 1.2-8 -- Rebuild for new picosat - -* Mon Aug 6 2012 Jerry James - 1.2-7 -- Rebuild for boost 1.50 - -* Sun Jul 22 2012 Fedora Release Engineering - 1.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Feb 28 2012 Fedora Release Engineering - 1.2-5 -- Rebuilt for c++ ABI breakage - -* Tue Jan 10 2012 Jerry James - 1.2-4 -- Rebuild to fix python dependencies -- Drop unnecessary BRs -- Ensure correct LDFLAGS - -* Mon Jan 9 2012 Jerry James - 1.2-3 -- Rebuild for GCC 4.7 - -* Sun Nov 20 2011 Jerry James - 1.2-2 -- Rebuild for new boost - -* Tue Sep 20 2011 Jerry James - 1.2-1 -- Initial RPM