openmamba/makedist-openmamba
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile.defs: fix not using 64bit libraries defs for aarch64, other defs added

Browse Source
This commit is contained in:
Silvan Calarco 2023-06-22 15:13:02 +02:00
parent 777e64885d
commit a53a533fd3
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile.defs
View File

@ -19,6 +19,7 @@ shadow-extra = util-linux
/sbin/nologin = util-linux
/usr/bin/chfn = util-linux
/usr/bin/chsh = util-linux
/usr/bin/su = util-linux
/usr/bin/python3 = python3
/usr/bin/ruby = ruby
@ -232,7 +233,7 @@ alsaplayer_output = alsaplayer-output-alsa
java-openjdk-runtime = java-openjdk11-runtime
ifeq ($(ARCH),x86_64)
#ifeq ($(ARCH),x86_64)
libOpenCL.so.1[][64bit] = ocl-icd
libOpenCL.so.1[OPENCL_1.0][64bit] = ocl-icd
libEGL.so.1[][64bit] = libEGL
@ -304,6 +305,8 @@ libpostproc.so.52[][64bit] = libpostproc-ffmpeg2
libpostproc.so.52[LIBPOSTPROC_52][64bit] = libpostproc-ffmpeg2
libswresample.so.0[][64bit] = libswresample-ffmpeg2
libswresample.so.0[LIBSWRESAMPLE_0][64bit] = libswresample-ffmpeg2
libswresample.so.4[][64bit] = libswresample-ffmpeg
libswresample.so.4[LIBSWRESAMPLE_4][64bit] = libswresample-ffmpeg
libswscale.so.4[][64bit] = libswscale-ffmpeg
libswscale.so.4[LIBSWSCALE_4][64bit] = libswscale-ffmpeg
libpoppler-qt4.so.4[][64bit] = libpoppler-qt4
@ -312,7 +315,7 @@ libpoppler-glib.so.8[][64bit] = libpoppler-glib
libpoppler-qt5.so.1[][64bit] = libpoppler-qt5
libcommon.so[][64bit] = mariadb-columnstore
libvulkan.so.1[][64bit] = libvulkan
else
#else
libOpenCL.so.1 = ocl-icd
libOpenCL.so.1[OPENCL_1.0] = ocl-icd
libEGL.so.1 = libEGL
@ -383,6 +386,8 @@ libpostproc.so.52 = libpostproc-ffmpeg2
libpostproc.so.52[LIBPOSTPROC_52] = libpostproc-ffmpeg2
libswresample.so.0 = libswresample-ffmpeg2
libswresample.so.0[LIBSWRESAMPLE_0] = libswresample-ffmpeg2
libswresample.so.4 = libswresample-ffmpeg
libswresample.so.4[LIBSWRESAMPLE_4] = libswresample-ffmpeg
libswscale.so.4 = libswscale-ffmpeg
libswscale.so.4[LIBSWSCALE_4] = libswscale-ffmpeg
libpoppler-qt4.so.4 = libpoppler-qt4
@ -391,7 +396,8 @@ libpoppler-glib.so.8 = libpoppler-glib
libboost_python-mt.so.1.65.1 = python-boost
libpoppler-qt5.so.1 = libpoppler-qt5
libcommon.so = mariadb-columnstore
endif
#endif
# Common to all archs
/usr/bin/python = python
python[abi] = python
libpython = libpython
@ -740,9 +746,15 @@ perl[Automake__Struct__Tie_ISA] = automake
perl[Automake__XFile] = automake
perl[DynaLoader] = perl
perl[Module__Metadata] = perl
perl[Encode] = perl
perl[Encode__Alias] = perl
perl[Exporter] = perl
perl[Exporter__Heavy] = perl
perl[File__pushd] = perl
perl[List__Util] = perl-Scalar-List-Utils
perl[List__Util__XS] = perl-Scalar-List-Utils
perl[Scalar__Util] = perl-Scalar-List-Utils
perl[Sub__Util] = perl-Scalar-List-Utils
perl[parent] = perl
perl[version] = perl
perl[version__regex] = perl