From 95b9c32999409563f09dceb44ea74a3759d3931e Mon Sep 17 00:00:00 2001 From: pho Date: Fri, 16 May 2014 01:21:12 +0000 Subject: Fix build errors on Darwin patches/patch-Graphite.cmake (CREATE_LIBTOOL_FILE): Fix incorrect library_names patches/patch-src_CMakeLists.txt: Don't pass -nodefaultlibs to compiler or the build fails for missing symbols on PowerPC and possibly other platforms. --- graphics/graphite2/Makefile | 3 ++- graphics/graphite2/PLIST | 6 ++--- graphics/graphite2/distinfo | 4 ++- graphics/graphite2/patches/patch-Graphite.cmake | 15 +++++++++++ .../graphite2/patches/patch-src_CMakeLists.txt | 29 ++++++++++++++++++++++ 5 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 graphics/graphite2/patches/patch-Graphite.cmake create mode 100644 graphics/graphite2/patches/patch-src_CMakeLists.txt (limited to 'graphics/graphite2') diff --git a/graphics/graphite2/Makefile b/graphics/graphite2/Makefile index 534837eb419..9518077c3ac 100644 --- a/graphics/graphite2/Makefile +++ b/graphics/graphite2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2014/02/02 07:47:36 ryoon Exp $ +# $NetBSD: Makefile,v 1.2 2014/05/16 01:21:12 pho Exp $ DISTNAME= graphite2-1.2.4 CATEGORIES= graphics @@ -12,5 +12,6 @@ LICENSE= gnu-lgpl-v2 USE_LANGUAGES= c c++ USE_CMAKE= yes +USE_LIBTOOL= yes .include "../../mk/bsd.pkg.mk" diff --git a/graphics/graphite2/PLIST b/graphics/graphite2/PLIST index 3766081bce4..a2c250ccb0d 100644 --- a/graphics/graphite2/PLIST +++ b/graphics/graphite2/PLIST @@ -1,12 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1 2014/02/02 07:47:36 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.2 2014/05/16 01:21:12 pho Exp $ bin/gr2fonttest include/graphite2/Font.h include/graphite2/Log.h include/graphite2/Segment.h include/graphite2/Types.h -lib/libgraphite2.so -lib/libgraphite2.so.3 -lib/libgraphite2.so.3.0.1 +lib/libgraphite2.la lib/pkgconfig/graphite2.pc share/graphite2/graphite2-release.cmake share/graphite2/graphite2.cmake diff --git a/graphics/graphite2/distinfo b/graphics/graphite2/distinfo index 92a1cc93f8f..509e154e144 100644 --- a/graphics/graphite2/distinfo +++ b/graphics/graphite2/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.1 2014/02/02 07:47:36 ryoon Exp $ +$NetBSD: distinfo,v 1.2 2014/05/16 01:21:12 pho Exp $ SHA1 (graphite2-1.2.4.tgz) = 5b3a907fee3ce0c6efcc2b31d0d98939ec031b7d RMD160 (graphite2-1.2.4.tgz) = a4adc89befc86a9adcab3b0dbd6caf2ac3866fb4 Size (graphite2-1.2.4.tgz) = 6938866 bytes +SHA1 (patch-Graphite.cmake) = 32cab319afa56ecb5f379e4097fe9059a89d2b59 +SHA1 (patch-src_CMakeLists.txt) = 4ea7c6f237f05334dffd09b33edf2ab00ee1059a diff --git a/graphics/graphite2/patches/patch-Graphite.cmake b/graphics/graphite2/patches/patch-Graphite.cmake new file mode 100644 index 00000000000..9604b9d0721 --- /dev/null +++ b/graphics/graphite2/patches/patch-Graphite.cmake @@ -0,0 +1,15 @@ +$NetBSD: patch-Graphite.cmake,v 1.1 2014/05/16 01:21:12 pho Exp $ + +CREATE_LIBTOOL_FILE: Fix incorrect library_names on Darwin + +--- Graphite.cmake.orig 2014-05-16 01:00:36.000000000 +0000 ++++ Graphite.cmake +@@ -46,7 +46,7 @@ FUNCTION(CREATE_LIBTOOL_FILE _target _in + FILE(APPEND ${_laname} "dlname='${_soname}'\n\n") + FILE(APPEND ${_laname} "# Names of this library.\n") + if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") +- FILE(APPEND ${_laname} "library_names='${_lanamwe}.${_target_current}.${_target_revision}.${_target_age}.${_soext} ${_lanamewe}.${_target_current}.${_soext} ${_soname}'\n\n") ++ FILE(APPEND ${_laname} "library_names='${_lanamewe}.${_target_current}.${_target_revision}.${_target_age}${_soext} ${_lanamewe}.${_target_current}${_soext} ${_soname}'\n\n") + else (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + FILE(APPEND ${_laname} "library_names='${_soname}.${_target_current}.${_target_revision}.${_target_age} ${_soname}.${_target_current} ${_soname}'\n\n") + endif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") diff --git a/graphics/graphite2/patches/patch-src_CMakeLists.txt b/graphics/graphite2/patches/patch-src_CMakeLists.txt new file mode 100644 index 00000000000..f8ce4630900 --- /dev/null +++ b/graphics/graphite2/patches/patch-src_CMakeLists.txt @@ -0,0 +1,29 @@ +$NetBSD: patch-src_CMakeLists.txt,v 1.1 2014/05/16 01:21:12 pho Exp $ + +Don't pass -nodefaultlibs to compiler or the build fails for missing +symbols on PowerPC and possibly other platforms. I can't see any +reason why they do this at all. + +The problem is already reported to the upstream: +http://sourceforge.net/p/silgraphite/bugs/56/ + +--- src/CMakeLists.txt.orig 2013-11-29 06:21:26.000000000 +0000 ++++ src/CMakeLists.txt +@@ -113,7 +113,7 @@ endif (${CMAKE_BUILD_TYPE} STREQUAL "Cla + if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + 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}" ++ LINK_FLAGS "${GRAPHITE_LINK_FLAGS}" + LINKER_LANGUAGE C) + if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*") + target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32) +@@ -133,7 +133,7 @@ endif (${CMAKE_SYSTEM_NAME} STREQUAL "Li + if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + set_target_properties(graphite2 PROPERTIES + COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector" +- LINK_FLAGS "-nodefaultlibs" ++ LINK_FLAGS "${GRAPHITE_LINK_FLAGS}" + LINKER_LANGUAGE C) + target_link_libraries(graphite2 c) + include(Graphite) -- cgit v1.2.3