mirror of
https://github.com/godotengine/buildroot.git
synced 2026-01-12 22:09:53 +03:00
Compare commits
15 Commits
2017.02-rc
...
2017.02
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
083c0735e9 | ||
|
|
962d153084 | ||
|
|
1a8b1eac87 | ||
|
|
f920873b41 | ||
|
|
1c186c6ca1 | ||
|
|
6395652c0a | ||
|
|
39b5a72ee5 | ||
|
|
84617352f3 | ||
|
|
4422eca2d4 | ||
|
|
35e02aeb7b | ||
|
|
68cebedeb9 | ||
|
|
0fae8618a3 | ||
|
|
ba1dd18a49 | ||
|
|
076095a860 | ||
|
|
2c2920c457 |
12
CHANGES
12
CHANGES
@@ -1,3 +1,15 @@
|
||||
2017.02, Released February 28th, 2017
|
||||
|
||||
Minor fixes, mainly fixing autobuilder issues.
|
||||
|
||||
Don't use cmake 3.7.x from the build host as it is also
|
||||
affected by the RPATH handling issues, and instead build our
|
||||
own if needed.
|
||||
|
||||
Updated/fixed packages: assimp, classpath, genimage, mplayer,
|
||||
mpv, openocd, python-libconfig, qt5base, qt5quickcontrols,
|
||||
vlc, xterm
|
||||
|
||||
2017.02-rc3, Released February 26th, 2017
|
||||
|
||||
Fixes all over the tree.
|
||||
|
||||
4
Makefile
4
Makefile
@@ -86,9 +86,9 @@ else # umask / $(CURDIR) / $(O)
|
||||
all:
|
||||
|
||||
# Set and export the version string
|
||||
export BR2_VERSION := 2017.02-rc3
|
||||
export BR2_VERSION := 2017.02
|
||||
# Actual time the release is cut (for reproducible builds)
|
||||
BR2_VERSION_EPOCH = 1488147000
|
||||
BR2_VERSION_EPOCH = 1488315000
|
||||
|
||||
# Save running make version since it's clobbered by the make package
|
||||
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
|
||||
|
||||
@@ -8,40 +8,40 @@
|
||||
<div class="panel-heading">Download</div>
|
||||
<div class="panel-body">
|
||||
|
||||
<h3 style="text-align: center;">Latest stable release: <b>2016.11.2</b></h3>
|
||||
<h3 style="text-align: center;">Latest stable release: <b>2017.02</b></h3>
|
||||
|
||||
<div class="row mt centered">
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2016.11.2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2017.02.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2016.11.2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2017.02.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h3><a href="/downloads/buildroot-2016.11.2.tar.gz">buildroot-2016.11.2.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2016.11.2.tar.gz.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2017.02.tar.gz">buildroot-2017.02.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2017.02.tar.gz.sign">PGP signature</a></p>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2016.11.2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2017.02.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2016.11.2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2017.02.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2016.11.2.tar.bz2">buildroot-2016.11.2.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2016.11.2.tar.bz2.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2017.02.tar.bz2">buildroot-2017.02.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2017.02.tar.bz2.sign">PGP signature</a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!--
|
||||
<h3 style="text-align: center;">Latest release candidate: <b>2017.02-rc3</b></h3>
|
||||
<div class="row mt centered">
|
||||
<div class="col-sm-6">
|
||||
@@ -75,7 +75,7 @@
|
||||
<p><a href="/downloads/buildroot-2017.02-rc3.tar.bz2.sign">PGP signature</a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
-->
|
||||
This and earlier releases (and their PGP signatures) can always be downloaded from
|
||||
<a href="/downloads/">http://buildroot.net/downloads/</a>.
|
||||
</div>
|
||||
|
||||
@@ -9,6 +9,24 @@
|
||||
<h2>News</h2>
|
||||
<ul class="timeline">
|
||||
|
||||
<li>
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
<div class="timeline-heading">
|
||||
<h4 class="timeline-title">2017.02 released</h4>
|
||||
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>28 February 2017</small></p>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>The stable 2017.02 release is out - Thanks to everyone
|
||||
contributing and testing the release candidates. See the
|
||||
<a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.02">CHANGES</a>
|
||||
file for more details
|
||||
and go to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
<a href="/downloads/buildroot-2017.02.tar.bz2">2017.02 release</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<li class="timeline-inverted">
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
|
||||
@@ -4,11 +4,6 @@ config BR2_PACKAGE_ASSIMP
|
||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71124, that
|
||||
# cause an infinite loop in gcc when building this package.
|
||||
depends on !BR2_microblaze
|
||||
# The ADI Blackfin toolchain does not build assimp properly,
|
||||
# fails with "internal compiler error: in simplify_subreg, at
|
||||
# simplify-rtx.c:5001". It builds fine with a mainline gcc for
|
||||
# Blackfin.
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
select BR2_PACKAGE_ZLIB
|
||||
help
|
||||
|
||||
@@ -16,6 +16,14 @@ ifeq ($(BR2_m68k),y)
|
||||
ASSIMP_CXXFLAGS += -mxgot
|
||||
endif
|
||||
|
||||
# workaround SuperH compiler failure when static linking (i.e -fPIC is
|
||||
# not passed) in gcc versions 5.x or older. The -Os optimization level
|
||||
# causes a "unable to find a register to spill in class
|
||||
# ‘GENERAL_REGS’" error. -O2 works fine.
|
||||
ifeq ($(BR2_sh):$(BR2_STATIC_LIBS):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:y:)
|
||||
ASSIMP_CXXFLAGS += -O2
|
||||
endif
|
||||
|
||||
ASSIMP_CONF_OPTS += -DASSIMP_BUILD_TESTS=OFF \
|
||||
-DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(ASSIMP_CXXFLAGS)"
|
||||
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
Set endianess for or1k
|
||||
|
||||
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
|
||||
|
||||
diff -Nur classpath-0.98.orig/native/fdlibm/ieeefp.h classpath-0.98/native/fdlibm/ieeefp.h
|
||||
--- classpath-0.98.orig/native/fdlibm/ieeefp.h 2008-01-13 18:33:50.000000000 +0100
|
||||
+++ classpath-0.98/native/fdlibm/ieeefp.h 2017-02-26 12:39:12.316327363 +0100
|
||||
@@ -123,6 +123,10 @@
|
||||
#define __IEEE_BIG_ENDIAN
|
||||
#endif
|
||||
|
||||
+#ifdef __or1k__
|
||||
+#define __IEEE_BIG_ENDIAN
|
||||
+#endif
|
||||
+
|
||||
#ifdef __v800
|
||||
#define __IEEE_LITTLE_ENDIAN
|
||||
#endif
|
||||
@@ -1,7 +1,15 @@
|
||||
config BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
|
||||
bool
|
||||
default y if BR2_arm || BR2_armeb || BR2_i386 || BR2_m68k \
|
||||
|| BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el \
|
||||
|| BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le \
|
||||
|| BR2_sh || BR2_x86_64
|
||||
|
||||
config BR2_PACKAGE_CLASSPATH
|
||||
bool "classpath"
|
||||
select BR2_NEEDS_HOST_JAR
|
||||
select BR2_NEEDS_HOST_JAVAC
|
||||
depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
|
||||
help
|
||||
GNU Classpath, Essential Libraries for Java, is a GNU
|
||||
project to create free core class libraries for use with
|
||||
|
||||
@@ -5,7 +5,7 @@ config BR2_PACKAGE_HOST_GENIMAGE
|
||||
images from a given root filesystem tree. genimage is
|
||||
intended to be run in a fakeroot environment.
|
||||
|
||||
Configuration is done is a config file parsed by
|
||||
Configuration is done in a config file parsed by
|
||||
libconfuse. Options like the path to tools can be given in
|
||||
environment variables, the config file or commandline
|
||||
switches.
|
||||
|
||||
@@ -4,6 +4,7 @@ config BR2_PACKAGE_JAMVM
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \
|
||||
|| BR2_mips || BR2_mipsel || BR2_powerpc
|
||||
depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
|
||||
select BR2_PACKAGE_ZLIB
|
||||
select BR2_PACKAGE_CLASSPATH
|
||||
help
|
||||
@@ -15,4 +16,5 @@ config BR2_PACKAGE_JAMVM
|
||||
comment "jamvm needs a toolchain w/ threads, dynamic library"
|
||||
depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \
|
||||
|| BR2_mips || BR2_mipsel || BR2_powerpc
|
||||
depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
|
||||
@@ -3,7 +3,7 @@ config BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
|
||||
default y
|
||||
# Those architectures are not supported by MPlayer
|
||||
depends on !(BR2_bfin || BR2_sh2a || BR2_sh4a || BR2_sh4aeb \
|
||||
|| BR2_m68k || BR2_microblaze || BR2_nios2)
|
||||
|| BR2_m68k || BR2_microblaze || BR2_nios2 || BR2_or1k)
|
||||
# Broken support for <ARMv5
|
||||
depends on !BR2_ARM_CPU_ARMV4
|
||||
# configure script barfs on the -Wl,-elf2flt we add in the toolchain
|
||||
|
||||
@@ -4,6 +4,8 @@ config BR2_PACKAGE_MPV
|
||||
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
|
||||
depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8
|
||||
# ARC toolchain issue
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC
|
||||
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
select BR2_PACKAGE_FFMPEG
|
||||
select BR2_PACKAGE_FFMPEG_SWSCALE
|
||||
@@ -21,3 +23,4 @@ comment "mpv needs a toolchain w/ threads, gcc >= 4.5"
|
||||
depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC
|
||||
|
||||
@@ -99,5 +99,20 @@ HOST_OPENOCD_CONF_OPTS = \
|
||||
|
||||
HOST_OPENOCD_DEPENDENCIES = host-libftdi host-libusb host-libusb-compat
|
||||
|
||||
# Avoid documentation rebuild. On PowerPC64(le), we patch the
|
||||
# configure script. Due to this, the version.texi files gets
|
||||
# regenerated, and then since it has a newer date than openocd.info,
|
||||
# openocd build system rebuilds the documentation. Unfortunately, this
|
||||
# documentation rebuild fails on old machines. We work around this by
|
||||
# faking the date of the generated version.texi file, to make the
|
||||
# build system believe the documentation doesn't need to be
|
||||
# regenerated.
|
||||
define OPENOCD_FIX_VERSION_TEXI
|
||||
touch -r $(@D)/doc/openocd.info $(@D)/doc/version.texi
|
||||
endef
|
||||
OPENOCD_POST_BUILD_HOOKS += OPENOCD_FIX_VERSION_TEXI
|
||||
HOST_OPENOCD_POST_BUILD_HOOKS += OPENOCD_FIX_VERSION_TEXI
|
||||
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
comment "python-libconfig needs a toolchain w/ C++, threads"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
comment "python-libconfig needs a glibc or uClibc toolchain w/ C++, threads"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
BR2_TOOLCHAIN_USES_MUSL
|
||||
|
||||
config BR2_PACKAGE_PYTHON_LIBCONFIG
|
||||
bool "python-libconfig"
|
||||
@@ -8,6 +9,8 @@ config BR2_PACKAGE_PYTHON_LIBCONFIG
|
||||
select BR2_PACKAGE_LIBCONFIG
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
# error: invalid use of incomplete type 'struct _IO_FILE'
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL
|
||||
help
|
||||
Python bindings to the C++ library libconfig
|
||||
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
From 35ee8b53549fab6ebffe289417e1d94298447af7 Mon Sep 17 00:00:00 2001
|
||||
From: Shawn Rutledge <shawn.rutledge@digia.com>
|
||||
Date: Fri, 10 Feb 2017 13:56:58 +0100
|
||||
Subject: [PATCH] fix VNC platform plugin build on big-endian machines
|
||||
|
||||
Task-number: QTBUG-58734
|
||||
Change-Id: I3e44ee4be5003acaba2f1b8ed2658a3ff1bd700e
|
||||
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
||||
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
|
||||
|
||||
Upstream: http://code.qt.io/cgit/qt/qtbase.git/patch/?id=6f64bfa654fb7e20bb75ec3b0544b81482babb44
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
src/plugins/platforms/vnc/qvncclient.cpp | 6 +++---
|
||||
src/plugins/platforms/vnc/qvncscreen.cpp | 7 ++++++-
|
||||
src/plugins/platforms/vnc/qvncscreen.h | 2 +-
|
||||
3 files changed, 10 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/platforms/vnc/qvncclient.cpp b/src/plugins/platforms/vnc/qvncclient.cpp
|
||||
index dae3e83f..58dcfc9b 100644
|
||||
--- a/src/plugins/platforms/vnc/qvncclient.cpp
|
||||
+++ b/src/plugins/platforms/vnc/qvncclient.cpp
|
||||
@@ -142,7 +142,7 @@ void QVncClient::convertPixels(char *dst, const char *src, int count) const
|
||||
case 16: {
|
||||
quint16 p = *reinterpret_cast<const quint16*>(src);
|
||||
#if Q_BYTE_ORDER == Q_BIG_ENDIAN
|
||||
- if (swapBytes)
|
||||
+ if (m_swapBytes)
|
||||
p = ((p & 0xff) << 8) | ((p & 0xff00) >> 8);
|
||||
#endif
|
||||
r = (p >> 11) & 0x1f;
|
||||
@@ -484,7 +484,7 @@ void QVncClient::setPixelFormat()
|
||||
m_sameEndian = (QSysInfo::ByteOrder == QSysInfo::BigEndian) == !!m_pixelFormat.bigEndian;
|
||||
m_needConversion = pixelConversionNeeded();
|
||||
#if Q_BYTE_ORDER == Q_BIG_ENDIAN
|
||||
- m_swapBytes = qvnc_screen->swapBytes();
|
||||
+ m_swapBytes = server()->screen()->swapBytes();
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@@ -639,7 +639,7 @@ bool QVncClient::pixelConversionNeeded() const
|
||||
return true;
|
||||
|
||||
#if Q_BYTE_ORDER == Q_BIG_ENDIAN
|
||||
- if (qvnc_screen->swapBytes())
|
||||
+ if (server()->screen()->swapBytes())
|
||||
return true;
|
||||
#endif
|
||||
|
||||
diff --git a/src/plugins/platforms/vnc/qvncscreen.cpp b/src/plugins/platforms/vnc/qvncscreen.cpp
|
||||
index 34def457..64f1bc0b 100644
|
||||
--- a/src/plugins/platforms/vnc/qvncscreen.cpp
|
||||
+++ b/src/plugins/platforms/vnc/qvncscreen.cpp
|
||||
@@ -43,6 +43,7 @@
|
||||
#include <QtFbSupport/private/qfbcursor_p.h>
|
||||
|
||||
#include <QtGui/QPainter>
|
||||
+#include <QtGui/QScreen>
|
||||
#include <QtCore/QRegularExpression>
|
||||
|
||||
|
||||
@@ -172,14 +173,18 @@ QPixmap QVncScreen::grabWindow(WId wid, int x, int y, int width, int height) con
|
||||
}
|
||||
|
||||
#if Q_BYTE_ORDER == Q_BIG_ENDIAN
|
||||
-bool QVNCScreen::swapBytes() const
|
||||
+bool QVncScreen::swapBytes() const
|
||||
{
|
||||
+ return false;
|
||||
+
|
||||
+ /* TODO
|
||||
if (depth() != 16)
|
||||
return false;
|
||||
|
||||
if (screen())
|
||||
return screen()->frameBufferLittleEndian();
|
||||
return frameBufferLittleEndian();
|
||||
+ */
|
||||
}
|
||||
#endif
|
||||
|
||||
diff --git a/src/plugins/platforms/vnc/qvncscreen.h b/src/plugins/platforms/vnc/qvncscreen.h
|
||||
index 785abd6d..0b42c3c7 100644
|
||||
--- a/src/plugins/platforms/vnc/qvncscreen.h
|
||||
+++ b/src/plugins/platforms/vnc/qvncscreen.h
|
||||
@@ -73,7 +73,7 @@ public:
|
||||
void clearDirty() { dirtyRegion = QRegion(); }
|
||||
|
||||
#if Q_BYTE_ORDER == Q_BIG_ENDIAN
|
||||
- bool swapBytes() const
|
||||
+ bool swapBytes() const;
|
||||
#endif
|
||||
|
||||
QStringList mArgs;
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -30,20 +30,25 @@ define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
|
||||
define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5BASE_WIDGETS),yy)
|
||||
define QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick
|
||||
endef
|
||||
else
|
||||
define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
|
||||
define QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Layouts $(TARGET_DIR)/usr/qml/QtQuick
|
||||
endef
|
||||
endif
|
||||
|
||||
define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick
|
||||
$(QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS)
|
||||
$(QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS)
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
||||
@@ -15,6 +15,13 @@ VLC_AUTORECONF = YES
|
||||
# Install vlc libraries in staging.
|
||||
VLC_INSTALL_STAGING = YES
|
||||
|
||||
# gcc bug internal compiler error: in merge_overlapping_regs, at
|
||||
# regrename.c:304. This bug is fixed since gcc 6.
|
||||
ifeq ($(BR2_microblaze):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:)
|
||||
VLC_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O0"
|
||||
VLC_CONF_OPTS += --disable-optimizations
|
||||
endif
|
||||
|
||||
# VLC defines two autoconf functions which are also defined by our own pkg.m4
|
||||
# from pkgconf. Unfortunately, they are defined in a different way: VLC adds
|
||||
# --enable- options, but pkg.m4 adds --with- options. To make sure we use
|
||||
|
||||
@@ -4,6 +4,8 @@ config BR2_PACKAGE_XTERM
|
||||
select BR2_PACKAGE_XLIB_LIBXAW
|
||||
depends on BR2_PACKAGE_XORG7
|
||||
depends on BR2_USE_MMU # fork()
|
||||
# ARC toolchain issue
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC
|
||||
help
|
||||
xterm terminal emulator
|
||||
|
||||
|
||||
@@ -6,6 +6,9 @@ version_min="${2}"
|
||||
major_min="${version_min%.*}"
|
||||
minor_min="${version_min#*.}"
|
||||
|
||||
# cmake-3.7 incorrectly handles rpath, linking to host libraries
|
||||
blacklist_version="3.7"
|
||||
|
||||
cmake=`which ${candidate}`
|
||||
if [ ! -x "${cmake}" ]; then
|
||||
# echo nothing: no suitable cmake found
|
||||
@@ -27,6 +30,11 @@ version="$(${cmake} --version \
|
||||
major="${version%.*}"
|
||||
minor="${version#*.}"
|
||||
|
||||
if [ "${version}" = "${blacklist_version}" ]; then
|
||||
# echo nothing: no suitable cmake found
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ${major} -gt ${major_min} ]; then
|
||||
echo "${cmake}"
|
||||
else
|
||||
|
||||
2
support/misc/Vagrantfile
vendored
2
support/misc/Vagrantfile
vendored
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
# Buildroot version to use
|
||||
RELEASE='2016.11.2'
|
||||
RELEASE='2017.02'
|
||||
|
||||
### Change here for more memory/cores ###
|
||||
VM_MEMORY=2048
|
||||
|
||||
Reference in New Issue
Block a user