pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
zero-epwing-git: skip installing libeb and don't link libintl
Module Name: pkgsrc-wip
Committed By: Dean Matzkov <bapabooiee%gmail.com@localhost>
Pushed By: bapa
Date: Thu Jan 17 22:12:19 2019 -0700
Changeset: 8284f4ce497ba66a75209d3d7870858bb728f0ae
Modified Files:
zero-epwing-git/TODO
zero-epwing-git/distinfo
zero-epwing-git/patches/patch-CMakeLists.txt
Log Message:
zero-epwing-git: skip installing libeb and don't link libintl
No need for libeb to be installed since it's only used for the
static library.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8284f4ce497ba66a75209d3d7870858bb728f0ae
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
zero-epwing-git/TODO | 3 +--
zero-epwing-git/distinfo | 2 +-
zero-epwing-git/patches/patch-CMakeLists.txt | 18 ++++++++++--------
3 files changed, 12 insertions(+), 11 deletions(-)
diffs:
diff --git a/zero-epwing-git/TODO b/zero-epwing-git/TODO
index 6e4238efce..520a8f0ad7 100644
--- a/zero-epwing-git/TODO
+++ b/zero-epwing-git/TODO
@@ -12,5 +12,4 @@
code, since (at least at a cursory glance) it didn't look like too much would need to
be changed.
-- There seems to be a lot of new documentation files in doc/ that we might be
- interested in installing.
+- The bundled libjansson shouldn't be built, since we use the pkgsrc-supplied one.
diff --git a/zero-epwing-git/distinfo b/zero-epwing-git/distinfo
index 650a337d0a..824d1aacd1 100644
--- a/zero-epwing-git/distinfo
+++ b/zero-epwing-git/distinfo
@@ -1,4 +1,4 @@
$NetBSD$
-SHA1 (patch-CMakeLists.txt) = 0209f2bc2ec9dc9e73637a125ea0e1b342a83c31
+SHA1 (patch-CMakeLists.txt) = 04f71eee451d3cbbae8aadea679f6b3cb8db88e3
SHA1 (patch-book.c) = de46c996e5cb82d8397ca24ac94a45669d3a1c40
diff --git a/zero-epwing-git/patches/patch-CMakeLists.txt b/zero-epwing-git/patches/patch-CMakeLists.txt
index 3073dcc1bd..7324d447ec 100644
--- a/zero-epwing-git/patches/patch-CMakeLists.txt
+++ b/zero-epwing-git/patches/patch-CMakeLists.txt
@@ -4,13 +4,20 @@ Changes:
1) Make libm, libz, libjansson and libiconv dynamically linked, instead of statically.
2) Use system libjansson instead of the one included with zero-epwing.
-3) Link libintl if |UNIX AND NOT APPLE|.
-4) Specify the full path to the libeb static library, since (at least on macOS) the linker
+3) Specify the full path to the libeb static library, since (at least on macOS) the linker
has trouble linking it otherwise.
+4) Skip install-ing libeb.
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -15,11 +15,20 @@
+@@ -9,17 +9,22 @@
+ PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/eb
+ BUILD_COMMAND make
+ BUILD_IN_SOURCE 1
++ INSTALL_COMMAND cmake -E echo "Skipping installing libeb"
+ )
+ include_directories(eb ${CMAKE_BINARY_DIR})
+ option(JANSSON_EXAMPLES "" OFF)
option(JANSSON_BUILD_DOCS "" OFF)
option(JANSSON_WITHOUT_TESTS "" ON)
add_subdirectory(jansson)
@@ -24,11 +31,6 @@ Changes:
+ ${CMAKE_CURRENT_SOURCE_DIR}/eb/eb/.libs/libeb.a
+)
+
-+# Dynamically link libintl on non-Apple UNIX-alikes
-+if (UNIX AND NOT APPLE)
-+ target_link_libraries(zero-epwing intl)
-+endif (UNIX AND NOT APPLE)
-+
+# Dynamically link libiconv on Windows or macOS
if (WIN32 OR APPLE)
- target_link_libraries(zero-epwing libiconv.a)
Home |
Main Index |
Thread Index |
Old Index