Skip to content

Commit c97a068

Browse files
committed
mingw: Building on Fedora 22 works as well.
1 parent 51de1ce commit c97a068

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

mingw/Dockerfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1-
FROM fedora:21
1+
FROM fedora:22
22
33

44
# Linux build.
5-
RUN yum update -y
6-
RUN yum install -y git gcc make wget
7-
RUN yum install -y autoconf automake libtool
5+
RUN dnf update -y
6+
RUN dnf install -y git gcc make wget xz
7+
RUN dnf install -y autoconf automake libtool
88

99
# mingw cross build.
10-
RUN yum install -y mingw32-gcc zip
10+
RUN dnf install -y mingw32-gcc zip
1111

12-
RUN yum clean all
12+
RUN dnf clean all
1313

1414
RUN git clone https://git.xiph.org/opusfile.git
1515

1616
WORKDIR opusfile
1717
RUN git pull
1818
RUN make -C mingw
1919
RUN ./autogen.sh && ./configure --host=i686-w64-mingw32 --prefix=${PWD}/mingw PKG_CONFIG_PATH=${PWD}/mingw/lib/pkgconfig && make && make check && make install
20+
RUN make -C mingw package

mingw/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ ssl_BUILD: $(ssl_DIR)
8888
# CROSS_COMPILE="i686-w64-mingw32-" ./Configure mingw no-asm no-shared --prefix=$PWD/mingw && make depend && make -j8 && make install
8989

9090
# Package the binaries.
91-
DIST=opusfile-0.7rc-f22docker-win32
91+
DIST := opusfile-0.7rc-f22docker-win32
9292
package: $(DIST).zip
9393

9494
$(DIST).zip: $(DIST)

0 commit comments

Comments
 (0)