mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-01 21:23:51 -09:00
2be1f2004e
Commit 8f88a644ed ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.
Due to this change, libgdiplus fails to build with output:
Applying 0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch using patch:
patching file Makefile.am
patching file configure.ac
Hunk #1 FAILED at 39.
1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej
This commit refreshes the package patch on the current package version.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
57 lines
1.7 KiB
Diff
57 lines
1.7 KiB
Diff
From ae92a466e203c8aec43f682a3a7aa617b820c3ba Mon Sep 17 00:00:00 2001
|
|
From: Sergio Prado <sergio.prado@e-labworks.com>
|
|
Date: Sat, 10 Apr 2021 11:03:38 -0300
|
|
Subject: [PATCH] Build unit tests only when --enable-unit-tests is passed
|
|
|
|
Building unit tests by default requires all dependencies to be
|
|
installed (jpeg, tiff, etc) and users may not want that.
|
|
|
|
So let's disable the build of unit tests by default and introduce
|
|
--enable-unit-tests configure option to enable it.
|
|
|
|
Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
|
|
Upstream: https://github.com/mono/libgdiplus/pull/701
|
|
[Dario: make the patch to be applied with fuzz factor 0]
|
|
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
|
|
---
|
|
Makefile.am | 8 ++++++--
|
|
configure.ac | 4 ++++
|
|
2 files changed, 10 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index f40bdee0c2e9..152e0d64fdd9 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -1,7 +1,11 @@
|
|
ACLOCAL_AMFLAGS = -I m4
|
|
|
|
-SUBDIRS = src tests
|
|
-DIST_SUBDIRS = src tests
|
|
+if BUILD_UNIT_TESTS
|
|
+SUBDIRS_TESTS = tests
|
|
+endif
|
|
+
|
|
+SUBDIRS = src $(SUBDIRS_TESTS)
|
|
+DIST_SUBDIRS = src $(SUBDIRS_TESTS)
|
|
|
|
pkgconfigdir = $(libdir)/pkgconfig
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 098fd0a664bd..c126ff091e58 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -47,6 +47,10 @@
|
|
GDIPLUS_CFLAGS="$GDIPLUS_CFLAGS -Werror -Wno-unknown-warning-option -Wno-clobbered"
|
|
fi
|
|
|
|
+AC_ARG_ENABLE(unittests, AS_HELP_STRING([--enable-unittests],[Enable building unit tests.]),[unittests=yes],[unittests=no])
|
|
+
|
|
+AM_CONDITIONAL([BUILD_UNIT_TESTS], [test x$unittests = xyes])
|
|
+
|
|
AC_ARG_ENABLE(asan, AS_HELP_STRING([--enable-asan],[Enable address sanitizer.]),[asan=yes],[asan=no])
|
|
|
|
if test $asan = "yes"; then
|
|
--
|
|
2.17.1
|
|
|