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

Makefile.defs: recent fixes

Browse Source
This commit is contained in:
Silvan Calarco 2019-09-08 10:40:10 +02:00
parent ad148ef769
commit 3fc16c4068
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.defs
View File

@ -19,6 +19,8 @@ _initsystem = systemd
/usr/bin/chfn = util-linux /usr/bin/chfn = util-linux
/usr/bin/chsh = util-linux /usr/bin/chsh = util-linux
/usr/bin/python3 = python3 python33
#xorgproprietary = xorg-drv-video-fglrx xorg-drv-video-nvidia #xorgproprietary = xorg-drv-video-fglrx xorg-drv-video-nvidia
ifneq ($(ARCH),arm) ifneq ($(ARCH),arm)
@ -284,7 +286,7 @@ libswresample.so.0[LIBSWRESAMPLE_0][64bit] = libswresample-ffmpeg2
libswscale.so.4[][64bit] = libswscale-ffmpeg libswscale.so.4[][64bit] = libswscale-ffmpeg
libswscale.so.4[LIBSWSCALE_4][64bit] = libswscale-ffmpeg libswscale.so.4[LIBSWSCALE_4][64bit] = libswscale-ffmpeg
libpoppler-qt4.so.4[][64bit] = libpoppler-qt4 libpoppler-qt4.so.4[][64bit] = libpoppler-qt4
libpoppler-cpp.so.0[][64bit] = libpoppler libpoppler-cpp.so.0[][64bit] = libpoppler-cpp
libpoppler-glib.so.8[][64bit] = libpoppler-glib libpoppler-glib.so.8[][64bit] = libpoppler-glib
libpoppler-qt5.so.1[][64bit] = libpoppler-qt5 libpoppler-qt5.so.1[][64bit] = libpoppler-qt5
else else
@ -360,7 +362,7 @@ libswresample.so.0[LIBSWRESAMPLE_0] = libswresample-ffmpeg2
libswscale.so.4 = libswscale-ffmpeg libswscale.so.4 = libswscale-ffmpeg
libswscale.so.4[LIBSWSCALE_4] = libswscale-ffmpeg libswscale.so.4[LIBSWSCALE_4] = libswscale-ffmpeg
libpoppler-qt4.so.4 = libpoppler-qt4 libpoppler-qt4.so.4 = libpoppler-qt4
libpoppler-cpp.so.0 = libpoppler libpoppler-cpp.so.0 = libpoppler-cpp
libpoppler-glib.so.8 = libpoppler-glib libpoppler-glib.so.8 = libpoppler-glib
libboost_python-mt.so.1.65.1 = python-boost libboost_python-mt.so.1.65.1 = python-boost
libpoppler-qt5.so.1 = libpoppler-qt5 libpoppler-qt5.so.1 = libpoppler-qt5
@ -468,6 +470,8 @@ knetworkmanagervpnplugin = plasma-applet-networkmanagement-openvpn
packagekitgui = kpackagekit packagekitgui = kpackagekit
firewallgui = kcm_ufw firewallgui = kcm_ufw
pkgconfig[libffi] := libffi-devel
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x86_64)
libexpect5.44.1.15.so[][64bit] = expect libexpect5.44.1.15.so[][64bit] = expect
# x86_64 glibc vs. glibc-multilib-utils and ldconfig vs ldconfig-multilib preferences # x86_64 glibc vs. glibc-multilib-utils and ldconfig vs ldconfig-multilib preferences