| Message ID | 79662cee8b26cb83d7c7e76effcdf5a217112d82.1495055675.git.yann.morin.1998@free.fr |
|---|---|
| State | Accepted |
| Headers | show |
Am Wed, 17 May 2017 23:15:28 +0200 schrieb Yann E. MORIN: > For some architectures, it is necessary to link with additional > libraries, such as -latomic for sparc. > > Add a bit of support to make that easy; actual use will be introduced in > the following patch. > > Signed-off-by: "Yann E. MORIN" > <yann.morin.1998@free.fr> Cc: Julien Corjon > <corjon.j@ecagroup.com> > Cc: Peter Seiderer <ps.report@gmx.net> Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de> (compile-tested using http://autobuild.buildroot.net/ results/967/967e7b7b6960ff49afc5c845832abd49d93ed676/ ) This patch series also fixes http://autobuild.buildroot.net/ results/967/967e7b7b6960ff49afc5c845832abd49d93ed676/
diff --git a/package/qt5/qt5base/qmake.conf b/package/qt5/qt5base/qmake.conf index 49cf898316..8b6debe583 100644 --- a/package/qt5/qt5base/qmake.conf +++ b/package/qt5/qt5base/qmake.conf @@ -21,5 +21,8 @@ CONFIG += nostrip QMAKE_LIBS += -lrt -lpthread -ldl QMAKE_CFLAGS_ISYSTEM = +# Architecturespecific configuration +include(arch.conf) + include(../common/linux_device_post.conf) load(qt_config) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 0c088350e5..81774b74a6 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -214,12 +214,15 @@ define QT5BASE_CONFIGURE_CONFIG_FILE endef endif +QT5BASE_ARCH_CONFIG_FILE = $(@D)/mkspecs/devices/linux-buildroot-g++/arch.conf define QT5BASE_CONFIGURE_CMDS $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qmake.conf \ $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qplatformdefs.h \ $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h $(QT5BASE_CONFIGURE_CONFIG_FILE) + touch $(QT5BASE_ARCH_CONFIG_FILE) + $(QT5BASE_CONFIGURE_ARCH_CONFIG) (cd $(@D); \ $(TARGET_MAKE_ENV) \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
For some architectures, it is necessary to link with additional libraries, such as -latomic for sparc. Add a bit of support to make that easy; actual use will be introduced in the following patch. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Julien Corjon <corjon.j@ecagroup.com> Cc: Peter Seiderer <ps.report@gmx.net> --- Changes v1 -> v2: - rename macro --- package/qt5/qt5base/qmake.conf | 3 +++ package/qt5/qt5base/qt5base.mk | 3 +++ 2 files changed, 6 insertions(+)