Compare commits

...
Sign in to create a new pull request.

11 commits

Author SHA1 Message Date
Till Maas
9f95d8f96d 2016-05-19: Retired orphaned package, because it was orphaned for
more than six weeks.
2016-05-19 22:49:24 +02:00
Fedora Release Engineering
d3ad66862d - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-05 02:20:37 +00:00
Jonathan Wakely
e159c59783 Rebuilt for Boost 1.60 2016-01-16 01:27:15 +00:00
Jerry James
8b7d7ff555 Rebuild for picosat 965. 2016-01-13 21:18:14 -07:00
Jerry James
df1e0a1208 Fix FTBFS due to docdir handling changes. 2015-09-05 11:11:13 -06:00
Dennis Gilmore
2822470107 - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 2015-07-29 13:29:51 -05:00
David Tardon
8f3116aefe rebuild for Boost 1.58 2015-07-22 19:42:18 +02:00
Dennis Gilmore
909f5f3a4b - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-19 01:32:40 +00:00
Kalev Lember
c582eb2bb5 Rebuilt for GCC 5 C++11 ABI change 2015-05-02 18:20:38 +02:00
Jerry James
3c1b2c0091 Add -const patch to fix build with gcc 5.0. 2015-02-09 20:10:31 -07:00
Petr Machata
e1e1701c18 Rebuild for boost 1.57.0 2015-01-27 12:37:13 +01:00
6 changed files with 3 additions and 445 deletions

1
.gitignore vendored
View file

@ -1 +0,0 @@
/undertaker-1.6.1.tar.xz

3
dead.package Normal file
View file

@ -0,0 +1,3 @@
2016-05-19: Retired orphaned package, because it was orphaned for
more than six weeks.

View file

@ -1 +0,0 @@
06bab0b89f38e4b2f40b8c64c5d5a232 undertaker-1.6.1.tar.xz

View file

@ -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 <picosat.h>
}
} // 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<std::string, bool> &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) {

View file

@ -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 <assumtion.config> | -c <out.cnf>] <model>" << std::endl;
+ out << "usage: undertaker-satyr [-V] [-a <assumtion.config> | -c <out.cnf>] <model>" << std::endl;
out << " model: a Kconfig file / translated cnf file" << std::endl;
out << " -a <assumtion> a .config file to be validated" << std::endl;
out << " (may be incomplete)" << std::endl;

View file

@ -1,250 +0,0 @@
Name: undertaker
Version: 1.6.1
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.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
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}
Group: Development/Languages
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}
Group: Development/Languages
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}
Group: Development/Languages
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}
Group: Development/Languages
Requires: %{name}-xemacs = %{version}-%{release}
BuildArch: noarch
%description xemacs-el
Source Elisp code for XEmacs support for %{name}.
%prep
%setup -q
%patch0
%patch1
# 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
%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
* Thu Dec 11 2014 Jerry James <loganjerry@gmail.com> - 1.6.1-1
- New upstream version
* Fri Nov 7 2014 Jerry James <loganjerry@gmail.com> - 1.6-2
- Avoid a conflict with the satyr package
* Thu Oct 23 2014 Jerry James <loganjerry@gmail.com> - 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 <rel-eng@lists.fedoraproject.org> - 1.2-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Fri May 23 2014 Petr Machata <pmachata@redhat.com> - 1.2-12
- Rebuild for boost 1.55.0
* Wed Jul 31 2013 Jerry James <loganjerry@gmail.com> - 1.2-11
- Add -picosat patch to adapt to new reentrant picosat API
* Sat Jul 27 2013 Petr Machata <pmachata@redhat.com> - 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 <denis.arnaud_fedora@m4x.org> - 1.2-9
- Rebuild for Boost-1.53.0
* Mon Aug 20 2012 Jerry James <loganjerry@gmail.com> - 1.2-8
- Rebuild for new picosat
* Mon Aug 6 2012 Jerry James <loganjerry@gmail.com> - 1.2-7
- Rebuild for boost 1.50
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-5
- Rebuilt for c++ ABI breakage
* Tue Jan 10 2012 Jerry James <loganjerry@gmail.com> - 1.2-4
- Rebuild to fix python dependencies
- Drop unnecessary BRs
- Ensure correct LDFLAGS
* Mon Jan 9 2012 Jerry James <loganjerry@gmail.com> - 1.2-3
- Rebuild for GCC 4.7
* Sun Nov 20 2011 Jerry James <loganjerry@gmail.com> - 1.2-2
- Rebuild for new boost
* Tue Sep 20 2011 Jerry James <loganjerry@gmail.com> - 1.2-1
- Initial RPM