Packages: create and use LIBDIR environmental variable

Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>

16 files changed, 22 insertions, 32 deletions

diff --git a/mk/strace.mk b/mk/strace.mk
index 10c8b64..6d1ae13 100644
--- a/mk/strace.mk
+++ b/mk/strace.mk
@@ -70,7 +70,7 @@ $(STRACE_BUILD_DIR)/.configured:
 	--build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
 	CC=$(TARGETCC_CACHED) \
 	CFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="-L$(SYSROOT)/lib" \
+	LDFLAGS="-L$(LIBDIR1) -L$(LIBDIR2)" \
 	CPPFLAGS="-I$(SYSROOT)/usr/include"
 	@touch $@
 
diff --git a/mk/toolchain.mk b/mk/toolchain.mk
index b15f9c1..107bc0b 100644
--- a/mk/toolchain.mk
+++ b/mk/toolchain.mk
@@ -37,6 +37,13 @@ CROSS_COMPILE := $(TOOLS)/bin/$(STRICT_GNU_TARGET)-
 export TARGETCC TARGETCXX TARGETAR TARGETRANLIB TARGETLD TARGETNM
 export TARGETSTRIP TARGETOBJDUMP TARGETOBJCOPY TARGET_CFLAGS CROSS_COMPILE
 
+ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
+LIBDIR=lib32
+else
+LIBDIR=lib
+endif
+export LIBDIR
+
 #ccache on host
 include $(EMBTK_ROOT)/mk/ccache.mk
 
diff --git a/packages/graphics/atk/atk.mk b/packages/graphics/atk/atk.mk
index 8cb1012..3ec5013 100644
--- a/packages/graphics/atk/atk.mk
+++ b/packages/graphics/atk/atk.mk
@@ -79,8 +79,7 @@ $(ATK_BUILD_DIR)/.configured:
 	OBJCOPY=$(TARGETOBJCOPY) \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	CXXFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="-L$(SYSROOT)/lib -L$(SYSROOT)/usr/lib \
-	-L$(SYSROOT)/lib32 -L$(SYSROOT)/usr/lib32" \
+	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
 	CPPFLGAS="-I$(SYSROOT)/usr/include" \
 	PKG_CONFIG=$(PKGCONFIG_BIN) \
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
diff --git a/packages/graphics/cairo/cairo.mk b/packages/graphics/cairo/cairo.mk
index acbb48c..15721f3 100644
--- a/packages/graphics/cairo/cairo.mk
+++ b/packages/graphics/cairo/cairo.mk
@@ -73,8 +73,7 @@ $(CAIRO_BUILD_DIR)/.configured:
 	OBJCOPY=$(TARGETOBJCOPY) \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	CXXFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="-L$(SYSROOT)/lib -L$(SYSROOT)/usr/lib \
-	-L$(SYSROOT)/lib32 -L$(SYSROOT)/usr/lib32" \
+	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
 	CPPFLGAS="-I$(SYSROOT)/usr/include" \
 	PKG_CONFIG=$(PKGCONFIG_BIN) \
 	PKG_CONFIG_PATH=$(SYSROOT)/usr/lib/pkgconfig \
diff --git a/packages/graphics/directfb/directfb.mk b/packages/graphics/directfb/directfb.mk
index 1ac3535..c734f66 100644
--- a/packages/graphics/directfb/directfb.mk
+++ b/packages/graphics/directfb/directfb.mk
@@ -120,10 +120,7 @@ $(DIRECTFB_BUILD_DIR)/.decompressed:
 $(DIRECTFB_BUILD_DIR)/.configured:
 	cd $(DIRECTFB_BUILD_DIR); \
 	CC=$(TARGETCC_CACHED) CFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="-L$(ROOTFS)/usr/lib -L$(ROOTFS)/usr/lib32 \
-	-L$(ROOTFS)/lib -L$(ROOTFS)/lib32 \
-	-L$(SYSROOT)/usr/lib -L$(SYSROOT)/usr/lib32 \
-	-L$(SYSROOT)/lib -L$(SYSROOT)/lib32" \
+	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
 	CPPFLAGS="-I$(SYSROOT)/usr/include" \
 	./configure $(CONFIG_DIRECTFB_OPTS) $(CONFIG_DIRECTFB_GRAPHICS-y) \
 	$(CONFIG_DIRECTFB_INPUTS-y)
diff --git a/packages/graphics/fontconfig/fontconfig.mk b/packages/graphics/fontconfig/fontconfig.mk
index 15763ba..3f8b9d7 100644
--- a/packages/graphics/fontconfig/fontconfig.mk
+++ b/packages/graphics/fontconfig/fontconfig.mk
@@ -80,9 +80,7 @@ $(FONTCONFIG_BUILD_DIR)/.configured:
 	OBJCOPY=$(TARGETOBJCOPY) \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	CXXFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="-L$(SYSROOT)/lib -L$(SYSROOT)/usr/lib \
-	-L$(SYSROOT)/lib32 -L$(SYSROOT)/usr/lib32" \
-	CPPFLGAS="-I$(SYSROOT)/usr/include" \
+	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
 	PKG_CONFIG=$(PKGCONFIG_BIN) \
 	PKG_CONFIG_PATH=$(SYSROOT)/usr/lib/pkgconfig \
 	PKG_CONFIG_LIBDIR=$(SYSROOT)/usr/lib \
diff --git a/packages/graphics/gtk/gtk.mk b/packages/graphics/gtk/gtk.mk
index 919a3c2..2e4747d 100644
--- a/packages/graphics/gtk/gtk.mk
+++ b/packages/graphics/gtk/gtk.mk
@@ -82,8 +82,7 @@ $(GTK_BUILD_DIR)/.configured:
 	OBJCOPY=$(TARGETOBJCOPY) \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	CXXFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="-L$(SYSROOT)/lib -L$(SYSROOT)/usr/lib \
-	-L$(SYSROOT)/lib32 -L$(SYSROOT)/usr/lib32" \
+	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
 	CPPFLGAS="-I$(SYSROOT)/usr/include" \
 	PKG_CONFIG=$(PKGCONFIG_BIN) \
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
diff --git a/packages/graphics/libtiff/libtiff.mk b/packages/graphics/libtiff/libtiff.mk
index 2d7af5b..5c1b1f9 100644
--- a/packages/graphics/libtiff/libtiff.mk
+++ b/packages/graphics/libtiff/libtiff.mk
@@ -81,8 +81,7 @@ $(LIBTIFF_BUILD_DIR)/.configured:
 	OBJCOPY=$(TARGETOBJCOPY) \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	CXXFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="-L$(SYSROOT)/lib -L$(SYSROOT)/usr/lib \
-	-L$(SYSROOT)/lib32 -L$(SYSROOT)/usr/lib32" \
+	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
 	CPPFLGAS="-I$(SYSROOT)/usr/include" \
 	PKG_CONFIG=$(PKGCONFIG_BIN) \
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
diff --git a/packages/graphics/pixman/pixman.mk b/packages/graphics/pixman/pixman.mk
index 51cc74e..c1d8bc5 100644
--- a/packages/graphics/pixman/pixman.mk
+++ b/packages/graphics/pixman/pixman.mk
@@ -78,8 +78,7 @@ $(PIXMAN_BUILD_DIR)/.configured:
 	OBJCOPY=$(TARGETOBJCOPY) \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	CXXFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="-L$(SYSROOT)/lib -L$(SYSROOT)/usr/lib \
-	-L$(SYSROOT)/lib32 -L$(SYSROOT)/usr/lib32" \
+	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
 	CPPFLGAS="-I$(SYSROOT)/usr/include" \
 	PKG_CONFIG=$(PKGCONFIG_BIN) \
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
diff --git a/packages/misc/foo/foo.mk b/packages/misc/foo/foo.mk
index d2002aa..9775521 100644
--- a/packages/misc/foo/foo.mk
+++ b/packages/misc/foo/foo.mk
@@ -71,8 +71,7 @@ $(FOO_BUILD_DIR)/.configured:
 	OBJCOPY=$(TARGETOBJCOPY) \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	CXXFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="-L$(SYSROOT)/lib -L$(SYSROOT)/usr/lib \
-	-L$(SYSROOT)/lib32 -L$(SYSROOT)/usr/lib32" \
+	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
 	CPPFLGAS="-I$(SYSROOT)/usr/include" \
 	PKG_CONFIG=$(PKGCONFIG_BIN) \
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
diff --git a/packages/misc/gettext/gettext.mk b/packages/misc/gettext/gettext.mk
index 39e47d7..dc74fe9 100644
--- a/packages/misc/gettext/gettext.mk
+++ b/packages/misc/gettext/gettext.mk
@@ -63,8 +63,7 @@ $(GETTEXT_BUILD_DIR)/.configured:
 	$(Q)cd $(GETTEXT_BUILD_DIR); \
 	CC=$(TARGETCC_CACHED) CXX=$(TARGETCXX_CACHED) \
 	CFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="-L$(SYSROOT)/lib -L$(SYSROOT)/usr/lib \
-	-L$(SYSROOT)/lib32 -L$(SYSROOT)/usr/lib32" \
+	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
 	CPPFLGAS="-I$(SYSROOT)/usr/include" \
 	gl_cv_func_wcwidth_works=yes \
 	am_cv_func_iconv_works=yes \
diff --git a/packages/misc/glib/glib.mk b/packages/misc/glib/glib.mk
index 620658d..2d0f72c 100644
--- a/packages/misc/glib/glib.mk
+++ b/packages/misc/glib/glib.mk
@@ -76,8 +76,7 @@ $(GLIB_BUILD_DIR)/.configured:
 	OBJCOPY=$(TARGETOBJCOPY) \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	CXXFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="-L$(SYSROOT)/lib -L$(SYSROOT)/usr/lib \
-	-L$(SYSROOT)/lib32 -L$(SYSROOT)/usr/lib32" \
+	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
 	CPPFLGAS="-I$(SYSROOT)/usr/include" \
 	PKG_CONFIG=$(PKGCONFIG_BIN) \
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
diff --git a/packages/misc/libelf/libelf.mk b/packages/misc/libelf/libelf.mk
index 2515adf..ea28e89 100644
--- a/packages/misc/libelf/libelf.mk
+++ b/packages/misc/libelf/libelf.mk
@@ -86,8 +86,7 @@ $(LIBELF_BUILD_DIR)/.configured:
 	OBJCOPY=$(TARGETOBJCOPY) \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	CXXFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="-L$(SYSROOT)/lib -L$(SYSROOT)/usr/lib \
-	-L$(SYSROOT)/lib32 -L$(SYSROOT)/usr/lib32" \
+	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
 	CPPFLGAS="-I$(SYSROOT)/usr/include" \
 	PKG_CONFIG=$(PKGCONFIG_BIN) \
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
diff --git a/packages/misc/libxml/libxml.mk b/packages/misc/libxml/libxml.mk
index fd924e3..f1e91b1 100644
--- a/packages/misc/libxml/libxml.mk
+++ b/packages/misc/libxml/libxml.mk
@@ -63,8 +63,7 @@ $(LIBXML2_BUILD_DIR)/.configured:
 	$(Q)cd $(LIBXML2_BUILD_DIR); \
 	CC=$(TARGETCC_CACHED) CXX=$(TARGETCXX_CACHED) \
 	CFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="-L$(SYSROOT)/lib -L$(SYSROOT)/usr/lib \
-	-L$(SYSROOT)/lib32 -L$(SYSROOT)/usr/lib32" \
+	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
 	CPPFLGAS="-I$(SYSROOT)/usr/include" \
 	PKG_CONFIG=$(PKGCONFIG_BIN) \
 	PKG_CONFIG_PATH=$(SYSROOT)/usr \
diff --git a/packages/misc/ncurses/ncurses.mk b/packages/misc/ncurses/ncurses.mk
index 016d141..d66280e 100644
--- a/packages/misc/ncurses/ncurses.mk
+++ b/packages/misc/ncurses/ncurses.mk
@@ -82,8 +82,7 @@ $(NCURSES_BUILD_DIR)/.configured:
 	OBJCOPY=$(TARGETOBJCOPY) \
 	CFLAGS="$(TARGET_CFLAGS) -fPIC" \
 	CXXFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="-L$(SYSROOT)/lib -L$(SYSROOT)/usr/lib \
-	-L$(SYSROOT)/lib32 -L$(SYSROOT)/usr/lib32" \
+	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
 	CPPFLGAS="-I$(SYSROOT)/usr/include" \
 	PKG_CONFIG=$(PKGCONFIG_BIN) \
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
diff --git a/packages/misc/pango/pango.mk b/packages/misc/pango/pango.mk
index 1c1e91a..5f6d007 100644
--- a/packages/misc/pango/pango.mk
+++ b/packages/misc/pango/pango.mk
@@ -82,8 +82,7 @@ $(PANGO_BUILD_DIR)/.configured:
 	OBJCOPY=$(TARGETOBJCOPY) \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	CXXFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="-L$(SYSROOT)/lib -L$(SYSROOT)/usr/lib \
-	-L$(SYSROOT)/lib32 -L$(SYSROOT)/usr/lib32" \
+	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
 	CPPFLGAS="-I$(SYSROOT)/usr/include" \
 	PKG_CONFIG=$(PKGCONFIG_BIN) \
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \