From 61036bea8978d2c6643d9793e904235b1462eb90 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Mon, 2 Jul 2012 10:37:10 +0200 Subject: [PATCH] Makefile.defs: set preferences for glibc vs. glibc-multilib in x86_64 --- Makefile.defs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Makefile.defs b/Makefile.defs index ed894fa..fb43f37 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -161,6 +161,18 @@ knetworkmanagervpnplugin = plasma-applet-networkmanagement-vpnc plasma-applet-ne packagekitgui = kpackagekit firewallgui = kcm_ufw +ifeq ($(ARCH),x86_64) +# x86_64 glibc vs. glibc-multilib-utils and ldconfig vs ldconfig-multilib preferences +/sbin/ldconfig = ldconfig +/usr/bin/gencat = glibc +/usr/bin/getconf = glibc +/usr/bin/iconv = glibc +/usr/bin/locale = glibc +/usr/bin/localedef = glibc +rtld[GNU_HASH] = ldconfig +rtld[GNU_UNIQUE] = ldconfig +endif + ifdef PLATFORM include $(TARGETSDIR)/$(TARGET)/platforms/$(PLATFORM)/Makefile.defs endif