Skip to content

Commit 0a09e7e

Browse files
benjaminguttmann-avtqpaketo-bot
benjaminguttmann-avtq
and
paketo-bot
authored
Adds further missing libs (#1088)
* Adds further missing libs * Enforce new 8.3.X artifcats to include missing libs * Updating buildpack.toml with new versions 8.3.29, 8.3.30 * Enforce new 8.4.X artifcats to include missing libs * Updating buildpack.toml with new versions 8.4.17, 8.4.18 * Enforce new 8.5.X artifcats to include missing libs * Updating buildpack.toml with new versions 8.5.3, 8.5.2 --------- Co-authored-by: paketo-bot <paketobuildpacks@gmail.com>
1 parent c90b809 commit 0a09e7e

7 files changed

Lines changed: 129 additions & 48 deletions

File tree

‎buildpack.toml‎

Lines changed: 48 additions & 48 deletions
Large diffs are not rendered by default.

‎dependency/actions/compile/binary-builder/cflinuxfs4/recipe/php_common_recipes.rb‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,32 @@ def configure_options
268268
'--with-external-gd'
269269
]
270270
end
271+
272+
def setup_tar
273+
lib_dir = `dpkg-architecture -qDEB_HOST_MULTIARCH`.strip
274+
275+
system <<-EOF
276+
cp -a -v /usr/lib/#{lib_dir}/libgd.so* #{@php_path}/lib/
277+
cp -a -v /usr/lib/#{lib_dir}/libpng*.so* #{@php_path}/lib/ 2>/dev/null || true
278+
cp -a -v /usr/lib/#{lib_dir}/libfreetype.so* #{@php_path}/lib/ 2>/dev/null || true
279+
cp -a -v /usr/lib/#{lib_dir}/libjpeg.so* #{@php_path}/lib/ 2>/dev/null || true
280+
cp -a -v /usr/lib/#{lib_dir}/libwebp.so* #{@php_path}/lib/ 2>/dev/null || true
281+
cp -a -v /usr/lib/#{lib_dir}/libtiff.so* #{@php_path}/lib/ 2>/dev/null || true
282+
cp -a -v /usr/lib/#{lib_dir}/libfontconfig.so* #{@php_path}/lib/ 2>/dev/null || true
283+
cp -a -v /usr/lib/#{lib_dir}/libXpm.so* #{@php_path}/lib/ 2>/dev/null || true
284+
cp -a -v /usr/lib/#{lib_dir}/libexpat.so* #{@php_path}/lib/ 2>/dev/null || true
285+
cp -a -v /usr/lib/#{lib_dir}/libbrotlidec.so* #{@php_path}/lib/ 2>/dev/null || true
286+
cp -a -v /usr/lib/#{lib_dir}/libbrotlicommon.so* #{@php_path}/lib/ 2>/dev/null || true
287+
cp -a -v /usr/lib/#{lib_dir}/libX11.so* #{@php_path}/lib/ 2>/dev/null || true
288+
cp -a -v /usr/lib/#{lib_dir}/libxcb.so* #{@php_path}/lib/ 2>/dev/null || true
289+
cp -a -v /usr/lib/#{lib_dir}/libXau.so* #{@php_path}/lib/ 2>/dev/null || true
290+
cp -a -v /usr/lib/#{lib_dir}/libXdmcp.so* #{@php_path}/lib/ 2>/dev/null || true
291+
cp -a -v /usr/lib/#{lib_dir}/libjbig.so* #{@php_path}/lib/ 2>/dev/null || true
292+
cp -a -v /usr/lib/#{lib_dir}/libdeflate.so* #{@php_path}/lib/ 2>/dev/null || true
293+
cp -a -v /usr/lib/#{lib_dir}/libbsd.so* #{@php_path}/lib/ 2>/dev/null || true
294+
cp -a -v /usr/lib/#{lib_dir}/libmd.so* #{@php_path}/lib/ 2>/dev/null || true
295+
EOF
296+
end
271297
end
272298

273299
class OdbcRecipe < FakePeclRecipe

‎dependency/actions/compile/binary-builder/cflinuxfs4/recipe/php_meal.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ def setup_tar
7777
@extensions.detect { |r| r.name == 'oci8' }.setup_tar
7878
@extensions.detect { |r| r.name == 'pdo_oci' }.setup_tar
7979
end
80+
@extensions.detect { |r| r.name == 'gd' }&.setup_tar
8081
@extensions.detect { |r| r.name == 'odbc' }&.setup_tar
8182
@extensions.detect { |r| r.name == 'pdo_odbc' }&.setup_tar
8283
@extensions.detect { |r| r.name == 'sodium' }&.setup_tar

‎dependency/actions/compile/binary-builder/cflinuxfs5/recipe/php_common_recipes.rb‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,32 @@ def configure_options
268268
'--with-external-gd'
269269
]
270270
end
271+
272+
def setup_tar
273+
lib_dir = `dpkg-architecture -qDEB_HOST_MULTIARCH`.strip
274+
275+
system <<-EOF
276+
cp -a -v /usr/lib/#{lib_dir}/libgd.so* #{@php_path}/lib/
277+
cp -a -v /usr/lib/#{lib_dir}/libpng*.so* #{@php_path}/lib/ 2>/dev/null || true
278+
cp -a -v /usr/lib/#{lib_dir}/libfreetype.so* #{@php_path}/lib/ 2>/dev/null || true
279+
cp -a -v /usr/lib/#{lib_dir}/libjpeg.so* #{@php_path}/lib/ 2>/dev/null || true
280+
cp -a -v /usr/lib/#{lib_dir}/libwebp.so* #{@php_path}/lib/ 2>/dev/null || true
281+
cp -a -v /usr/lib/#{lib_dir}/libtiff.so* #{@php_path}/lib/ 2>/dev/null || true
282+
cp -a -v /usr/lib/#{lib_dir}/libfontconfig.so* #{@php_path}/lib/ 2>/dev/null || true
283+
cp -a -v /usr/lib/#{lib_dir}/libXpm.so* #{@php_path}/lib/ 2>/dev/null || true
284+
cp -a -v /usr/lib/#{lib_dir}/libexpat.so* #{@php_path}/lib/ 2>/dev/null || true
285+
cp -a -v /usr/lib/#{lib_dir}/libbrotlidec.so* #{@php_path}/lib/ 2>/dev/null || true
286+
cp -a -v /usr/lib/#{lib_dir}/libbrotlicommon.so* #{@php_path}/lib/ 2>/dev/null || true
287+
cp -a -v /usr/lib/#{lib_dir}/libX11.so* #{@php_path}/lib/ 2>/dev/null || true
288+
cp -a -v /usr/lib/#{lib_dir}/libxcb.so* #{@php_path}/lib/ 2>/dev/null || true
289+
cp -a -v /usr/lib/#{lib_dir}/libXau.so* #{@php_path}/lib/ 2>/dev/null || true
290+
cp -a -v /usr/lib/#{lib_dir}/libXdmcp.so* #{@php_path}/lib/ 2>/dev/null || true
291+
cp -a -v /usr/lib/#{lib_dir}/libjbig.so* #{@php_path}/lib/ 2>/dev/null || true
292+
cp -a -v /usr/lib/#{lib_dir}/libdeflate.so* #{@php_path}/lib/ 2>/dev/null || true
293+
cp -a -v /usr/lib/#{lib_dir}/libbsd.so* #{@php_path}/lib/ 2>/dev/null || true
294+
cp -a -v /usr/lib/#{lib_dir}/libmd.so* #{@php_path}/lib/ 2>/dev/null || true
295+
EOF
296+
end
271297
end
272298

273299
class OdbcRecipe < FakePeclRecipe

‎dependency/actions/compile/binary-builder/cflinuxfs5/recipe/php_meal.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ def setup_tar
7777
@extensions.detect { |r| r.name == 'oci8' }.setup_tar
7878
@extensions.detect { |r| r.name == 'pdo_oci' }.setup_tar
7979
end
80+
@extensions.detect { |r| r.name == 'gd' }&.setup_tar
8081
@extensions.detect { |r| r.name == 'odbc' }&.setup_tar
8182
@extensions.detect { |r| r.name == 'pdo_odbc' }&.setup_tar
8283
@extensions.detect { |r| r.name == 'sodium' }&.setup_tar

‎dependency/actions/compile/binary-builder/recipe/php_common_recipes.rb‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,32 @@ def configure_options
283283
"--with-external-gd"
284284
]
285285
end
286+
287+
def setup_tar
288+
lib_dir = `dpkg-architecture -qDEB_HOST_MULTIARCH`.strip
289+
290+
system <<-eof
291+
cp -a -v /usr/lib/#{lib_dir}/libgd.so* #{@php_path}/lib/
292+
cp -a -v /usr/lib/#{lib_dir}/libpng*.so* #{@php_path}/lib/ 2>/dev/null || true
293+
cp -a -v /usr/lib/#{lib_dir}/libfreetype.so* #{@php_path}/lib/ 2>/dev/null || true
294+
cp -a -v /usr/lib/#{lib_dir}/libjpeg.so* #{@php_path}/lib/ 2>/dev/null || true
295+
cp -a -v /usr/lib/#{lib_dir}/libwebp.so* #{@php_path}/lib/ 2>/dev/null || true
296+
cp -a -v /usr/lib/#{lib_dir}/libtiff.so* #{@php_path}/lib/ 2>/dev/null || true
297+
cp -a -v /usr/lib/#{lib_dir}/libfontconfig.so* #{@php_path}/lib/ 2>/dev/null || true
298+
cp -a -v /usr/lib/#{lib_dir}/libXpm.so* #{@php_path}/lib/ 2>/dev/null || true
299+
cp -a -v /usr/lib/#{lib_dir}/libexpat.so* #{@php_path}/lib/ 2>/dev/null || true
300+
cp -a -v /usr/lib/#{lib_dir}/libbrotlidec.so* #{@php_path}/lib/ 2>/dev/null || true
301+
cp -a -v /usr/lib/#{lib_dir}/libbrotlicommon.so* #{@php_path}/lib/ 2>/dev/null || true
302+
cp -a -v /usr/lib/#{lib_dir}/libX11.so* #{@php_path}/lib/ 2>/dev/null || true
303+
cp -a -v /usr/lib/#{lib_dir}/libxcb.so* #{@php_path}/lib/ 2>/dev/null || true
304+
cp -a -v /usr/lib/#{lib_dir}/libXau.so* #{@php_path}/lib/ 2>/dev/null || true
305+
cp -a -v /usr/lib/#{lib_dir}/libXdmcp.so* #{@php_path}/lib/ 2>/dev/null || true
306+
cp -a -v /usr/lib/#{lib_dir}/libjbig.so* #{@php_path}/lib/ 2>/dev/null || true
307+
cp -a -v /usr/lib/#{lib_dir}/libdeflate.so* #{@php_path}/lib/ 2>/dev/null || true
308+
cp -a -v /usr/lib/#{lib_dir}/libbsd.so* #{@php_path}/lib/ 2>/dev/null || true
309+
cp -a -v /usr/lib/#{lib_dir}/libmd.so* #{@php_path}/lib/ 2>/dev/null || true
310+
eof
311+
end
286312
end
287313

288314
class OdbcRecipe < FakePeclRecipe

‎dependency/actions/compile/binary-builder/recipe/php_meal.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ def setup_tar
7777
@extensions.detect{|r| r.name=='oci8'}.setup_tar
7878
@extensions.detect{|r| r.name=='pdo_oci'}.setup_tar
7979
end
80+
@extensions.detect{|r| r.name=='gd'}&.setup_tar
8081
@extensions.detect{|r| r.name=='odbc'}&.setup_tar
8182
@extensions.detect{|r| r.name=='pdo_odbc'}&.setup_tar
8283
@extensions.detect{|r| r.name=='sodium'}&.setup_tar

0 commit comments

Comments
 (0)