RepositoryExternal.mk | 1 -
config_host.mk.in | 1 -
configure.ac | 2 --
3 files changed, 4 deletions(-)
New commits:
commit c4b83dc2c4b8d4ea4b664b34309fbf0cf2fd8ad1
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Thu Dec 9 22:45:04 2021 +0100
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Fri Jan 7 10:00:53 2022 +0100
CUCKOO_CFLAGS is unused
The include is set explicitly in RepositoryExternal.mk . And
when using system cuckoo, it's not necessary to refer to the
unpacked tarball location.
Change-Id: Idd241f7551fb98cb5948c4e7007204ad3a8d87a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128061
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 7262a0eaa7af..cf9b2aa13dc4 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -4179,7 +4179,6 @@ gb_ExternalProject__use_cuckoo_headers :=
define gb_LinkTarget__use_cuckoo_headers
$(call gb_LinkTarget_set_include,$(1),\
- -I$(call gb_UnpackedTarball_get_dir,cuckoo) \
$$(INCLUDE) \
)
diff --git a/config_host.mk.in b/config_host.mk.in
index 8b4f723399ab..92118880debc 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -92,7 +92,6 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
export CPUNAME=@CPUNAME@
export CROSS_COMPILING=@CROSS_COMPILING@
-export CUCKOO_CFLAGS=$(gb_SPACE)@CUCKOO_CFLAGS@
export CURL=@CURL@
export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
export CURL_LIBS=$(gb_SPACE)@CURL_LIBS@
diff --git a/configure.ac b/configure.ac
index 0d3dec0eeaf1..a7a0b220e0e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10378,9 +10378,7 @@ else
AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE CUCKOO"
SYSTEM_CUCKOO=
- CUCKOO_CFLAGS="${ISYSTEM}${WORKDIR}/UnpackedTarball/cuckoo"
fi
-AC_SUBST([CUCKOO_CFLAGS])
AC_SUBST([SYSTEM_CUCKOO])
dnl ===================================================================
