Skip to content

Commit

Permalink
Changes from review
Browse files Browse the repository at this point in the history
  • Loading branch information
jreidinger committed Nov 28, 2017
1 parent dcf8f37 commit 437cebe
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ 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
1 change: 1 addition & 0 deletions base/src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ 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 \
Expand Down
2 changes: 1 addition & 1 deletion package/yast2-core.changes
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Tue Nov 28 15:08:32 UTC 2017 - jreidinger@suse.com

- add jemalloc dependency for y2base which is used only in old
testsuite and that workarounds problem with dynamic dlopening
of jemalloc in ruby (bsc#106883)
of jemalloc in ruby (bsc#1068883)
- 4.0.1

-------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions package/yast2-core.spec
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ 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
Expand Down

0 comments on commit 437cebe

Please sign in to comment.