Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makefile.am: fix AM_CFLAGS #146

Merged
merged 2 commits into from
Aug 30, 2019
Merged

Makefile.am: fix AM_CFLAGS #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d7d67a
Makefile.am: fix AM_CFLAGS
AkihiroSuda Aug 30, 2019
c27f70e
Dockerfile.buildtests: add openSUSE 15.1
AkihiroSuda Aug 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Dockerfile.buildtests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,20 @@ RUN yum-config-manager --add-repo=https://cbs.centos.org/repos/virt7-container-c
yum install --nogpgcheck -y libseccomp-static
RUN ./configure LDFLAGS="-static" && make && cp -f slirp4netns /

# openSUSE (dynamic only)
FROM opensuse/leap:15.1 AS buildtest-opensuse151-common
RUN zypper install -y --no-recommends autoconf automake gcc glib2-devel git make libcap-devel libseccomp-devel
COPY . /src
WORKDIR /src
RUN ./autogen.sh

FROM buildtest-opensuse151-common AS buildtest-opensuse151-dynamic
RUN ./configure && make && cp -f slirp4netns /

FROM scratch AS buildtest-final-stage
COPY --from=buildtest-alpine310-static /slirp4netns /buildtest-alpine310-static
COPY --from=buildtest-ubuntu1804-dynamic /slirp4netns /buildtest-ubuntu1804-dynamic
COPY --from=buildtest-ubuntu1804-static /slirp4netns /buildtest-ubuntu1804-static
COPY --from=buildtest-centos76-dynamic /slirp4netns /buildtest-centos76-dynamic
COPY --from=buildtest-centos76-static /slirp4netns /buildtest-centos76-static
COPY --from=buildtest-opensuse151-dynamic /slirp4netns /buildtest-opensuse151-dynamic
2 changes: 1 addition & 1 deletion Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
bin_PROGRAMS = slirp4netns

AM_CFLAGS = @GLIB_CFLAGS@
AM_CFLAGS = @GLIB_CFLAGS@ @LIBCAP_CFLAGS@ @LIBSECCOMP_CFLAGS@

noinst_LIBRARIES = libslirp.a libparson.a

Expand Down