Browse Source

makepackage: don't use deprecated dpkg-shlibdeps option

rdb 4 months ago
parent
commit
39c620d1c7
1 changed files with 2 additions and 2 deletions
  1. 2 2
      makepanda/makepackage.py

+ 2 - 2
makepanda/makepackage.py

@@ -335,8 +335,8 @@ def MakeInstallerLinux(version, debversion=None, rpmversion=None, rpmrelease=1,
 
 
         # Library dependencies are required, binary dependencies are recommended.
         # Library dependencies are required, binary dependencies are recommended.
         # We explicitly exclude libphysx-extras since we don't want to depend on PhysX.
         # We explicitly exclude libphysx-extras since we don't want to depend on PhysX.
-        oscmd(f"cd targetroot && LD_LIBRARY_PATH=usr/{lib_dir}/panda3d {dpkg_shlibdeps} -Tdebian/substvars_dep --ignore-missing-info -x{pkg_name} -xlibphysx-extras {lib_pattern}")
-        oscmd(f"cd targetroot && LD_LIBRARY_PATH=usr/{lib_dir}/panda3d {dpkg_shlibdeps} -Tdebian/substvars_rec --ignore-missing-info -x{pkg_name} {bin_pattern}")
+        oscmd(f"cd targetroot && {dpkg_shlibdeps} -lusr/{lib_dir}/panda3d -Tdebian/substvars_dep --ignore-missing-info -x{pkg_name} -xlibphysx-extras {lib_pattern}")
+        oscmd(f"cd targetroot && {dpkg_shlibdeps} -lusr/{lib_dir}/panda3d -Tdebian/substvars_rec --ignore-missing-info -x{pkg_name} {bin_pattern}")
 
 
         # Parse the substvars files generated by dpkg-shlibdeps.
         # Parse the substvars files generated by dpkg-shlibdeps.
         depends = ReadFile("targetroot/debian/substvars_dep").replace("shlibs:Depends=", "").strip()
         depends = ReadFile("targetroot/debian/substvars_dep").replace("shlibs:Depends=", "").strip()