File tree Expand file tree Collapse file tree 3 files changed +6
-6
lines changed
Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Original file line number Diff line number Diff line change 139139RUN <<EOF
140140cat >> $(conan config home)/global.conf <<EOT
141141tools.build:compiler_executables={"c" : "${CC}" , "cpp" : "${CXX}" }
142- user.package:distro="debian-${DEBIAN_VERSION}"
143142tools.info.package_id:confs=["user.package:distro" ]
143+ user.package:distro="debian-${DEBIAN_VERSION}"
144144EOT
145145EOF
146146
228228RUN <<EOF
229229cat >> $(conan config home)/global.conf <<EOT
230230tools.build:compiler_executables={"c" : "${CC}" , "cpp" : "${CXX}" }
231- user.package:distro="debian-${DEBIAN_VERSION}"
232231tools.info.package_id:confs=["user.package:distro" ]
232+ user.package:distro="debian-${DEBIAN_VERSION}"
233233EOT
234234EOF
235235
Original file line number Diff line number Diff line change 109109RUN <<EOF
110110cat >> $(conan config home)/global.conf <<EOT
111111tools.build:compiler_executables={"c" : "${CC}" , "cpp" : "${CXX}" }
112- user.package:distro="rhel-${RHEL_VERSION}"
113112tools.info.package_id:confs=["user.package:distro" ]
113+ user.package:distro="rhel-${RHEL_VERSION}"
114114EOT
115115EOF
116116
184184RUN <<EOF
185185cat >> $(conan config home)/global.conf <<EOT
186186tools.build:compiler_executables={"c" : "${CC}" , "cpp" : "${CXX}" }
187- user.package:distro="rhel-${RHEL_VERSION}"
188187tools.info.package_id:confs=["user.package:distro" ]
188+ user.package:distro="rhel-${RHEL_VERSION}"
189189EOT
190190EOF
191191
Original file line number Diff line number Diff line change 125125RUN <<EOF
126126cat >> $(conan config home)/global.conf <<EOT
127127tools.build:compiler_executables={"c" : "${CC}" , "cpp" : "${CXX}" }
128- user.package:distro="ubuntu-${UBUNTU_VERSION}"
129128tools.info.package_id:confs=["user.package:distro" ]
129+ user.package:distro="ubuntu-${UBUNTU_VERSION}"
130130EOT
131131EOF
132132
211211RUN <<EOF
212212cat >> $(conan config home)/global.conf <<EOT
213213tools.build:compiler_executables={"c" : "${CC}" , "cpp" : "${CXX}" }
214- user.package:distro="ubuntu-${UBUNTU_VERSION}"
215214tools.info.package_id:confs=["user.package:distro" ]
215+ user.package:distro="ubuntu-${UBUNTU_VERSION}"
216216EOT
217217EOF
218218
You can’t perform that action at this time.
0 commit comments