Skip to content

Commit 7909f75

Browse files
committed
Add package_id
1 parent 9d534eb commit 7909f75

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

docker/debian/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)
139139
RUN <<EOF
140140
cat >> $(conan config home)/global.conf <<EOT
141141
tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
142+
tools.info.package_id:confs+=["Debian", "${DEBIAN_VERSION}"]
142143
EOT
143144
EOF
144145
# Print the Conan profile to verify the configuration.
@@ -231,6 +232,7 @@ CXX_VER=$(${CXX} -dumpversion)
231232
CXX_VER=${CXX_VER%%.*}
232233
cat >> $(conan config home)/global.conf <<EOT
233234
tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
235+
tools.info.package_id:confs+=["Debian", "${DEBIAN_VERSION}"]
234236
EOT
235237
EOF
236238

docker/rhel/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)
105105
RUN <<EOF
106106
cat >> $(conan config home)/global.conf <<EOT
107107
tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
108+
tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
108109
EOT
109110
EOF
110111

@@ -180,6 +181,7 @@ CXX_VER=$(${CXX} -dumpversion)
180181
CXX_VER=${CXX_VER%%.*}
181182
cat >> $(conan config home)/global.conf <<EOT
182183
tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
184+
tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
183185
EOT
184186
EOF
185187

docker/ubuntu/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)
123123
RUN <<EOF
124124
cat >> $(conan config home)/global.conf <<EOT
125125
tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
126+
tools.info.package_id:confs+=["Ubuntu", "${UBUNTU_VERSION}"]
126127
EOT
127128
EOF
128129

@@ -211,6 +212,7 @@ CXX_VER=$(${CXX} -dumpversion)
211212
CXX_VER=${CXX_VER%%.*}
212213
cat >> $(conan config home)/global.conf <<EOT
213214
tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
215+
tools.info.package_id:confs+=["Ubuntu", "${UBUNTU_VERSION}"]
214216
EOT
215217
EOF
216218

0 commit comments

Comments
 (0)