diff options
| author | ryoon <ryoon> | 2016-02-07 01:05:11 +0000 |
|---|---|---|
| committer | ryoon <ryoon> | 2016-02-07 01:05:11 +0000 |
| commit | d703f86112991ee686211e6e5b58c88b7e0c381b (patch) | |
| tree | a3cbae8d40548ff2c44b751ee2b579b4d150b87f /graphics/graphite2 | |
| parent | a5a35e90fa6227a5b5a1a7fb93455ffc4b507b3c (diff) | |
| download | pkgsrc-d703f86112991ee686211e6e5b58c88b7e0c381b.tar.gz | |
PR pkg/50775. Fix build under Linux.
pkgsrc removes Graphite.cmake inclusion and nolib_test function is
defined in it. Remove it for Linux.
Diffstat (limited to 'graphics/graphite2')
| -rw-r--r-- | graphics/graphite2/distinfo | 4 | ||||
| -rw-r--r-- | graphics/graphite2/patches/patch-src_CMakeLists.txt | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/graphics/graphite2/distinfo b/graphics/graphite2/distinfo index bb66c6d1a40..4ac441e9905 100644 --- a/graphics/graphite2/distinfo +++ b/graphics/graphite2/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2016/01/26 13:56:23 wiz Exp $ +$NetBSD: distinfo,v 1.6 2016/02/07 01:05:11 ryoon Exp $ SHA1 (graphite2-1.3.5.tgz) = 044f65d5b4ade3169f5fcd75a25f047c81f5d33e RMD160 (graphite2-1.3.5.tgz) = 49c0c9d919a23ab215402d082670083b7cfba61e SHA512 (graphite2-1.3.5.tgz) = 70e85ff44d63dcca6beb55aa68966888453610c4ec1fca0d0986910a8f396ad64fd0b9f393270fd403c93e7e5d45cdc134c3965f47761cd40cd659b92b8abcec Size (graphite2-1.3.5.tgz) = 3880214 bytes -SHA1 (patch-src_CMakeLists.txt) = 6466c211c92374ddafe009ff9e79bfd0be986be9 +SHA1 (patch-src_CMakeLists.txt) = 4751d4cb699a368b9b612a18c45176346e29968b diff --git a/graphics/graphite2/patches/patch-src_CMakeLists.txt b/graphics/graphite2/patches/patch-src_CMakeLists.txt index 5c90a5e77e5..1ce6df21856 100644 --- a/graphics/graphite2/patches/patch-src_CMakeLists.txt +++ b/graphics/graphite2/patches/patch-src_CMakeLists.txt @@ -1,4 +1,4 @@ -$NetBSD: patch-src_CMakeLists.txt,v 1.3 2016/01/26 13:56:23 wiz Exp $ +$NetBSD: patch-src_CMakeLists.txt,v 1.4 2016/02/07 01:05:11 ryoon 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 @@ -18,12 +18,12 @@ http://sourceforge.net/p/silgraphite/bugs/56/ LINKER_LANGUAGE C) if (CMAKE_COMPILER_IS_GNUCXX) add_definitions(-Wdouble-promotion) -@@ -126,23 +126,19 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linu +@@ -126,23 +126,17 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linu else (GRAPHITE2_ASAN) target_link_libraries(graphite2 c gcc) endif (GRAPHITE2_ASAN) - include(Graphite) - nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>) +- nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>) endif (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*") set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "") - CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}") @@ -37,7 +37,7 @@ http://sourceforge.net/p/silgraphite/bugs/56/ LINKER_LANGUAGE C) target_link_libraries(graphite2 c) - include(Graphite) - nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>) +- nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>) set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "") - CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}") endif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") |