Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 1 addition & 7 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ Build-Depends: debhelper-compat (= 13),
libomp-dev,
# Should be needed but seems to mess up sbuild
# libexpat1-dev:native,
libboost-all-dev,
pkg-config,
libffi-dev,
lsb-release,
Expand Down Expand Up @@ -244,12 +243,7 @@ Package: libomccpp
Section: math
Architecture: amd64
Multi-Arch: same
Depends: libboost-dev,
libboost-filesystem-dev,
libboost-system-dev,
libboost-serialization-dev,
libboost-program-options-dev,
${shlibs:Depends},
Depends: ${shlibs:Depends},
${misc:Depends}
Description: Libraries for the C++ code generation target of OpenModelica

Expand Down
2 changes: 1 addition & 1 deletion docker/armcross/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN (grep arch=armhf /etc/apt/sources.list || echo "deb [arch=armhf] http://port
&& cat /etc/apt/sources.list \
&& apt-get update \
&& apt-get -qyy install --no-install-recommends libtinfo5:armhf \
&& apt-get -qyy install g++-arm-linux-gnueabihf libboost-filesystem-dev:armhf libboost-system-dev:armhf libreadline-dev:armhf cmake make git ca-certificates autoconf automake \
&& apt-get -qyy install g++-arm-linux-gnueabihf libreadline-dev:armhf cmake make git ca-certificates autoconf automake \
&& ln -sf /usr/bin/arm-linux-gnueabihf-ranlib /usr/bin/ranlib \
&& ln -sf /usr/bin/arm-linux-gnueabihf-ar /usr/bin/ar \
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
2 changes: 1 addition & 1 deletion docker/msyscross/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN sed -i s,http://archive.ubuntu.com/ubuntu/,mirror://mirrors.ubuntu.com/mirro
&& curl -s https://git.archlinux.org/pacman.git/snapshot/pacman-5.1.0.tar.xz | tar xJ \
&& cd pacman-5.1.0 && ./autogen.sh && ./configure --prefix=/opt/pacman --disable-doc && make -j4 && make -j4 install \
&& cp /workdir/pacman.conf /opt/pacman/etc/pacman.conf \
&& /opt/pacman/bin/pacman -Sy --noconfirm mingw-w64-$ARCH-readline mingw-w64-$ARCH-boost mingw-w64-$ARCH-python3 mingw-w64-$ARCH-libiconv mingw-w64-$ARCH-libxml2 mingw-w64-$ARCH-gcc \
&& /opt/pacman/bin/pacman -Sy --noconfirm mingw-w64-$ARCH-readline mingw-w64-$ARCH-python3 mingw-w64-$ARCH-libiconv mingw-w64-$ARCH-libxml2 mingw-w64-$ARCH-gcc \
&& apt-get -qyy install mingw-w64 cmake git software-properties-common unzip wine64 wine32 wine-stable perl libmldbm-perl flex gcc \
&& if $LINKCPPFS; then ln -s /opt/pacman/mingw64/lib/gcc/$ARCH-w64-mingw32/*/libstdc++fs.a /usr/lib/gcc/$ARCH-w64-mingw32/*-posix; fi \
&& cd /workdir \
Expand Down
7 changes: 0 additions & 7 deletions docker/osxcross/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@ RUN export PATH=$PATH:/workdir/osxcross/target/bin HOME=/workdir \
&& ./target/bin/osxcross-macports clear-cache \
&& mv target /opt/osxcross \
&& cd .. \
&& wget -q https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.gz \
&& tar xzf boost_1_67_0.tar.gz \
&& cd boost_1_67_0 \
&& ./bootstrap.sh \
&& echo "using gcc : darwin : x86_64-apple-darwin15-c++ ;" > $HOME/user-config.jam \
&& ./b2 --prefix=/opt/osxcross/macports/pkgs/opt/local/ -d0 --with-filesystem --with-system --no-tests toolset=gcc-darwin link=static cxxflags="-std=c++11 -stdlib=libc++" install \
&& find /opt/osxcross/macports/pkgs/opt/local/ -name "*.a" -exec x86_64-apple-darwin15-ranlib {} ";" \
&& rm -rf /var/lib/apt/lists/* \
&& rm -f /workdir/MacOSX10.11.sdk.tar.xz \
&& rm -rf /workdir/osxcross \
Expand Down
1 change: 0 additions & 1 deletion macports/Portfile.openmodelica.template
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ depends_lib port:lp_solve \
port:readline \
port:qjson \
port:ossp-uuid \
port:boost \
port:openblas

build.target
Expand Down
4 changes: 0 additions & 4 deletions rpm/SPECS/openmodelica.spec.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ BuildRequires: uuid
BuildRequires: uuid-devel
BuildRequires: libuuid-devel
BuildRequires: hdf5-devel
BuildRequires: boost-devel
BuildRequires: boost-static
BuildRequires: hwloc-devel
BuildRequires: readline-devel
BuildRequires: libffi-devel
Expand Down Expand Up @@ -117,8 +115,6 @@ Requires: lapack-devel
Requires(post): %{_sbindir}/update-alternatives
Requires(postun): %{_sbindir}/update-alternatives

Suggests: boost-devel
Suggests: boost-static
Suggests: lapack-static
Suggests: openblas-static

Expand Down
Loading