diff --git a/Dockerfile b/Dockerfile index e1ebdb6bb..93a33e9a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,5 +4,4 @@ ENV LANG=POSIX LC_ALL= # Remove the preinstalled yast2-core, it interferes with the built one # when running the tests... (huh??) RUN zypper --non-interactive rm yast2-core -RUN zypper --non-interactive in jemalloc-devel COPY . /usr/src/app diff --git a/base/src/Makefile.am b/base/src/Makefile.am index 7c2be0762..a6b406399 100644 --- a/base/src/Makefile.am +++ b/base/src/Makefile.am @@ -24,10 +24,8 @@ y2base_DEPENDENCIES = $(YAST2CORE) y2base_LDADD = ${Y2UTIL_LIBS} -# -ljemalloc: workaround for error when jemalloc is dlopened in ruby in old testsuite (bsc#1068883) y2base_LDFLAGS = \ -Xlinker --whole-archive \ - -ljemalloc \ $(PERL_LDFLAGS) \ $(YAST2CORE) \ -Xlinker --no-whole-archive diff --git a/package/yast2-core.spec b/package/yast2-core.spec index 9e25a55ba..71f7f393c 100644 --- a/package/yast2-core.spec +++ b/package/yast2-core.spec @@ -44,8 +44,6 @@ BuildRequires: libtool # we have a parser BuildRequires: bison BuildRequires: flex -# workaround for error when jemalloc is dlopened in ruby in old testsuite (bsc#1068883) -BuildRequires: jemalloc-devel # incompatible change, parser.h -> parser.hh BuildRequires: automake >= 1.12 # needed for all yast packages