--- Begin Message ---
Source: graphite2
Version: 1.2.4-1
Severity: normal
Tags: patch
Hi,
the build system of graphite2 avoids the linking of libgraphite2 to
libstdc++, but only on Linux. This causes the failure of one of the
harfbuzz tests (check-libstdc++.sh), which checks that libharfbuzz
(which links to libgraphite2) does not (directly or indirectly) pull
libstdc++.
Attached there is a patch that extends the checks in the build system
also to GNU/k*BSD platforms (k*.BSD) and Hurd (GNU).
Thanks,
--
Pino
--- a/gr2fonttest/CMakeLists.txt
+++ b/gr2fonttest/CMakeLists.txt
@@ -17,14 +17,14 @@ if (GRAPHITE2_ASAN)
set(GRAPHITE_LINK_FLAGS "-fsanitize=address")
endif (GRAPHITE2_ASAN)
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
# -lgcc LINKER_LANGUAGE C
add_definitions(-fno-rtti -fno-exceptions)
set_target_properties(gr2fonttest PROPERTIES LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}" LINKER_LANGUAGE C)
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
# This script just fails
nolib_test(stdc++ $<TARGET_FILE:gr2fonttest>)
-endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
# copy the DLL so that gr2fonttest can find it
add_custom_target(${PROJECT_NAME}_copy_dll ALL
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -110,7 +110,7 @@ else (${CMAKE_BUILD_TYPE} STREQUAL "Clan
set(GRAPHITE_LINK_FLAGS "")
endif (${CMAKE_BUILD_TYPE} STREQUAL "ClangASN")
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
set_target_properties(graphite2 PROPERTIES
COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
@@ -128,7 +128,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linu
endif (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
-endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
set_target_properties(graphite2 PROPERTIES
--- a/tests/comparerenderer/CMakeLists.txt
+++ b/tests/comparerenderer/CMakeLists.txt
@@ -38,7 +38,7 @@ endif (${ICU_INCLUDE} STREQUAL "ICU_INCL
# set(HB1_LDFLAGS "-L${HB1_INCLUDE}/../../lib -lharfbuzz-1")
#endif (${HB1_INCLUDE})
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
find_package(Freetype)
find_package(PkgConfig)
@@ -63,7 +63,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux
set(GRAPHITE_LINK_FLAGS "-fsanitize=address")
endif (GRAPHITE2_ASAN)
-endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
find_path(GR_INCLUDE graphite/GrClient.h PATHS ENV SILGRAPHITE_HOME ${PROJECT_SOURCE_DIR}/../../../silgraphite-2.3.1 ${PROJECT_SOURCE_DIR}/../../../silgraphite-2.4.0 ${GRAPHITE_INSTALLED_PATH} ${PROJECT_SOURCE_DIR}/../../../graphite-trunk PATH_SUFFIXES engine/include include)
--- a/tests/examples/CMakeLists.txt
+++ b/tests/examples/CMakeLists.txt
@@ -26,12 +26,12 @@ macro(test_example TESTNAME SRCFILE)
set_tests_properties(${TESTNAME} PROPERTIES TIMEOUT 3)
endmacro(test_example)
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
find_package(Freetype)
if (${FREETYPE_FOUND})
include_directories(${FREETYPE_INCLUDE_DIRS})
endif (${FREETYPE_FOUND})
-endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
macro(test_freetype TESTNAME SRCFILE)
if (${FREETYPE_FOUND})
--- a/tests/vm/CMakeLists.txt
+++ b/tests/vm/CMakeLists.txt
@@ -38,12 +38,12 @@ if (GRAPHITE2_ASAN)
set_target_properties(vm-test-call PROPERTIES LINK_FLAGS "-fsanitize=address")
endif (GRAPHITE2_ASAN)
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
add_definitions(-fno-rtti -fno-exceptions)
if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
add_definitions(-DNDEBUG -fomit-frame-pointer)
endif ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
add_test(vm-test-call-threading vm-test-call ${testing_SOURCE_DIR}/fonts/tiny.ttf 1)
set_tests_properties(vm-test-call-threading PROPERTIES
--- End Message ---
--- Begin Message ---
Source: graphite2
Source-Version: 1.2.4-2
We believe that the bug you reported is fixed in the latest version of
graphite2, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 738353@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Rene Engelhard <rene@debian.org> (supplier of updated graphite2 package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Mon, 10 Feb 2014 09:47:01 +0100
Source: graphite2
Binary: libgraphite2-3 libgraphite2-dev libgraphite2-3-dbg libgraphite2-doc
Architecture: source armel all
Version: 1.2.4-2
Distribution: unstable
Urgency: low
Maintainer: Debian LibreOffice Team <debian-openoffice@lists.debian.org>
Changed-By: Rene Engelhard <rene@debian.org>
Description:
libgraphite2-3 - Font rendering engine for Complex Scripts -- library
libgraphite2-3-dbg - Debug symbols for libgraphite2
libgraphite2-dev - Development files for libgraphite2
libgraphite2-doc - Documentation for libgraphite2
Closes: 738353
Changes:
graphite2 (1.2.4-2) unstable; urgency=low
.
* add patch from Pino Toscano to also avoid linking to libstdc++ on
kFreeBSD and Hurd (closes: #738353)
Checksums-Sha1:
4e351c380c6d00498ac26a548797ff3a84b2a480 2109 graphite2_1.2.4-2.dsc
d25218be57f99ee545e6312a4aa57683626c67ba 9004 graphite2_1.2.4-2.debian.tar.xz
023336db8fde20ebba1babca7aa45e7850a8bb3e 49838 libgraphite2-3_1.2.4-2_armel.deb
22c8f626790bb0a5236d7203b8050552bc6b75b8 18794 libgraphite2-dev_1.2.4-2_armel.deb
3c81997b510d58d4eb6e96231544401da782d50a 494308 libgraphite2-3-dbg_1.2.4-2_armel.deb
99154e300d53f33dc98357fbe919257ab78adbc6 507908 libgraphite2-doc_1.2.4-2_all.deb
Checksums-Sha256:
3d658feefb81a6f77931e7d0cbbc9fb0c7c5b3115ed94cdac66f36584d20a7c9 2109 graphite2_1.2.4-2.dsc
d466c09dfae6ff06d0d8cae641929f2caaa684917da0bc028d1e66a6b283a9bb 9004 graphite2_1.2.4-2.debian.tar.xz
ad00e87fbe1aa859ef07b00df232d822b7a09018df60f082d7a8dc3034d11807 49838 libgraphite2-3_1.2.4-2_armel.deb
9de39adebdd5e0e45ff6e6fca3215ad61d01af7d29da116ce62618dbb7459d3f 18794 libgraphite2-dev_1.2.4-2_armel.deb
34b87995b05575b96a535c47c0ae0fe179e04e90ef38513dfcd3bda23a56325c 494308 libgraphite2-3-dbg_1.2.4-2_armel.deb
0ca647e5473caec92735d084d9726d8a35f1c5d391747a421fdb0bb94a590b41 507908 libgraphite2-doc_1.2.4-2_all.deb
Files:
606e8659dbe0bc33b1afade24a30042c 2109 libs optional graphite2_1.2.4-2.dsc
0ac69cde0aa5f38c943b7ed8d6f0d4bd 9004 libs optional graphite2_1.2.4-2.debian.tar.xz
2fb986e24d3bdc25724c27e758aa4c8d 49838 libs optional libgraphite2-3_1.2.4-2_armel.deb
afe2d3e884fb63fdbe1523c8cb12c780 18794 libdevel optional libgraphite2-dev_1.2.4-2_armel.deb
374a1fc314446adffb72e09e86d7409d 494308 debug extra libgraphite2-3-dbg_1.2.4-2_armel.deb
ea24a8107e24e1e89b38f03f400cddbe 507908 doc optional libgraphite2-doc_1.2.4-2_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAEBAgAGBQJS+VIdAAoJEAqgRXHQPj5wGbgP/jxWpN2c+v/RSKg1Xuh3aXUe
hnx+1yglXGk8/n95QwAzF9/dKZxuWXbOuCZzr/81a2UAHWenro4eY2p/ZSYS2OVZ
5a28e43vx8tZurJfqiW2Rjh8skWNOPAe44+Q8cC7KqSra1kSoaPDIxBTapTrddJe
fF4UPZxf+1vK+xA/7QZyEGjKznjRETstFillPFq8oJpIqfnCgv6mMYWNKNNYmuL+
k5A18zwGAUiOYBSZTd3TelGmbDNirETj/qPwvVzp7p9IAs6yd9hjgxa0tv5i2YOX
RUdlCMa9v4mM+m7GeoyDZTIdI6EyMcvm94EXQccE9XMl4f55o60v6NW4aOvmpJds
6wi1uNd5ThVXUGLMN3ttMgsfflO5rS4Ep8PvfHElSfOgWtmnlENeLbglWcGSb5Lq
anm9Pl8S/fyyvHyBoRz8R7XAtTQfMzoOM533J9P07bMYNVCmKVCvleZo3+yznUBj
j14e7n4PBKRzAMsmDjv3X3tefX5GsGnJIV5XKBbivmpWVNKLGAi8bsOPy86qf9Pu
6EtVrE2ImWbtRUbVIpH9k7jE5QttEblTs5LLidOcVoqN/0gEmkMIaoqLcfbP8PK4
2llggDAOG+QXpjkJ+jDmHjTkN/QriJ27HsZ8m8LdYS/VQJEbZ8BjJJcBZ0yyO8ia
xlDKZ35lLKSMcNGV0grY
=20n1
-----END PGP SIGNATURE-----
--- End Message ---