commit b2799446580998f9f3f4b9391ace2bfb75a25104
Author: Georg Baum <[email protected]>
Date: Wed Nov 5 20:31:31 2025 +0100
build: Exclude unneeded libiconv files.
Thanks Thibaut for the hint! These files are not needed in LyX.
---
3rdparty/libiconv/CMakeLists.txt | 6 ++----
3rdparty/libiconv/Makefile.am | 10 ++++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/3rdparty/libiconv/CMakeLists.txt b/3rdparty/libiconv/CMakeLists.txt
index a2bade9659..90d476da87 100644
--- a/3rdparty/libiconv/CMakeLists.txt
+++ b/3rdparty/libiconv/CMakeLists.txt
@@ -64,7 +64,7 @@
add_definitions(-Dset_relocation_prefix=libcharset_set_relocation_prefix -Dreloc
set(SRC_LIBCHARSET ${SRCDIR}/libcharset/lib/localcharset.c)
# libiconv
-set(SRC_LIBICONV ${SRCDIR}/lib/compat.c ${SRCDIR}/lib/genaliases2.c
${SRCDIR}/lib/genaliases.c ${SRCDIR}/lib/gentranslit.c ${SRCDIR}/lib/iconv.c)
+set(SRC_LIBICONV ${SRCDIR}/lib/compat.c ${SRCDIR}/lib/iconv.c)
add_library(iconv ${SRC_LIBICONV} ${SRC_LIBCHARSET})
set_target_properties(iconv PROPERTIES COMPILE_FLAGS -DBUILDING_LIBICONV)
@@ -73,13 +73,11 @@ set(ICONV_INCLUDE_DIR ${BINDIR}/include CACHE STRING
"libiconv include dir" FOR
set(ICONV_LIBRARY iconv CACHE STRING "libiconv library" FORCE)
set(ICONV_FOUND iconv CACHE STRING "libiconv found" FORCE)
-foreach(_base iconv genaliases2 genaliases)
+foreach(_base iconv)
handle_source_option("CC" ${SRCDIR}/lib/${_base}.c -Wno-unused-macros)
endforeach()
handle_source_option("CC" ${SRCDIR}/lib/iconv.c -Wno-cast-align
-Wno-parentheses-equality -Wno-static-in-inline -Wno-unused-parameter
-Wno-sign-compare -Wno-type-limits -Wno-missing-field-initializers
-Wno-redundant-decls -Wno-implicit-fallthrough -Wno-strict-prototypes)
-handle_source_option("CC" ${SRCDIR}/lib/genaliases2.c
-Wno-unused-but-set-variable -Wno-unused-function)
-handle_source_option("CC" ${SRCDIR}/lib/gentranslit.c -Wno-format)
set_target_properties(iconv PROPERTIES
FOLDER "3rd_party"
INTERPROCEDURAL_OPTIMIZATION ${LYX_IPO_SUPPORTED})
diff --git a/3rdparty/libiconv/Makefile.am b/3rdparty/libiconv/Makefile.am
index 8f8f0976a4..1c1e515a5e 100644
--- a/3rdparty/libiconv/Makefile.am
+++ b/3rdparty/libiconv/Makefile.am
@@ -37,6 +37,12 @@ EXTRA_DIST = \
# would require to generate libcharset.h from libcharset.h.build.in
EXTRA_DIST += ${LIBICONV_VERSION}/libcharset/lib/relocatable-stub.c
+# Generators are not needed
+EXTRA_DIST += ${LIBICONV_VERSION}/lib/genaliases2.c \
+ ${LIBICONV_VERSION}/lib/genaliases.c \
+ ${LIBICONV_VERSION}/lib/genflags.c \
+ ${LIBICONV_VERSION}/lib/gentranslit.c
+
AM_CPPFLAGS += -I$(srcdir)/${LIBICONV_VERSION}/srclib -DLIBDIR=\"\"
liblyxiconv_a_SOURCES = \
@@ -219,10 +225,6 @@ liblyxiconv_a_SOURCES = \
${LIBICONV_VERSION}/lib/gbkext2.h \
${LIBICONV_VERSION}/lib/gbkext_inv.h \
${LIBICONV_VERSION}/lib/gbk.h \
- ${LIBICONV_VERSION}/lib/genaliases2.c \
- ${LIBICONV_VERSION}/lib/genaliases.c \
- ${LIBICONV_VERSION}/lib/genflags.c \
- ${LIBICONV_VERSION}/lib/gentranslit.c \
${LIBICONV_VERSION}/lib/georgian_academy.h \
${LIBICONV_VERSION}/lib/georgian_ps.h \
${LIBICONV_VERSION}/lib/hkscs1999.h \
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
