summaryrefslogtreecommitdiffstats
path: root/package/libgdiplus/0001-Fix-compile-error-when-cross-compiling.patch
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-12-01 21:56:44 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-12-01 21:56:44 +0100
commit1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7 (patch)
treedd26d5bc619271f8cccf0c9d7abdda9a1749d13f /package/libgdiplus/0001-Fix-compile-error-when-cross-compiling.patch
parent57dcad243e6daefefbe21109e1fc97272053a7a0 (diff)
parent787a31fed42f98a8e2e6a0bd2079376c861436f2 (diff)
downloadbuildroot-1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7.tar.gz
buildroot-1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7.zip
Merge branch 'next'
This merges the next branch accumulated during the 2017.11 release cycle back into the master branch. A few conflicts had to be resolved: - In the DEVELOPERS file, because Fabrice Fontaine was added as a developer for libupnp in master, and for libupnp18 in next. Resolution is simple: add him for both. - linux/Config.in, because we updated the 4.13.x release used by default in master, while we moved to 4.14 in next. Resolution: use 4.14. - package/libupnp/libupnp.hash: a hash for the license file was added in master, while the package was bumped into next. Resolution: keep the hash for the license file, and keep the hash for the newest version of libupnp. - package/linux-headers/Config.in.host: default version of the kernel headers for 4.13 was bumped to the latest 4.13.x in master, but was changed to 4.14 in next. Resolution: use 4.14. - package/samba4/: samba was bumped to 4.6.11 in master for security reasons, but was bumped to 4.7.3 in next. Resolution: keep 4.7.3. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/libgdiplus/0001-Fix-compile-error-when-cross-compiling.patch')
-rw-r--r--package/libgdiplus/0001-Fix-compile-error-when-cross-compiling.patch35
1 files changed, 0 insertions, 35 deletions
diff --git a/package/libgdiplus/0001-Fix-compile-error-when-cross-compiling.patch b/package/libgdiplus/0001-Fix-compile-error-when-cross-compiling.patch
deleted file mode 100644
index db67d467df..0000000000
--- a/package/libgdiplus/0001-Fix-compile-error-when-cross-compiling.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From daf96b07c02734dceaf3c3b78c10e4e758b74d9e Mon Sep 17 00:00:00 2001
-From: Sergio Prado <sergio.prado@e-labworks.com>
-Date: Fri, 18 Dec 2015 15:08:58 -0200
-Subject: [PATCH 1/1] Fix compile error when cross-compiling.
-
-When cross-compiling with libjpeg enabled, we can get errors like the
-following when linking:
-
-sh-linux-gnu-gcc: ERROR: unsafe header/library path used in
-cross-compilation: '/lib'
-
-That's because there is an error in the configure script that are not
-generating ldflags correctly, and are trying to link with -L/lib.
-
-Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 772d5fc9d87a..58d55ade48e3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -223,7 +223,7 @@ AC_ARG_WITH([libjpeg],
- jpeg_ok=no)
- AC_MSG_RESULT($jpeg_ok)
- if test "$jpeg_ok" = yes; then
-- JPEG='jpeg'; LIBJPEG='-L${libjpeg_prefix}/lib -ljpeg'
-+ JPEG='jpeg'; LIBJPEG="-L${libjpeg_prefix}/lib -ljpeg"
- else
- AC_MSG_WARN(*** JPEG loader will not be built (JPEG header file not found) ***)
- fi
---
-1.9.1
-
OpenPOWER on IntegriCloud