mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: date: Update to 3.0.1.
* gnu/packages/calendar.scm (date): Update to 3.0.1. [arguments]{phases}: Add phase 'skip-failing-test, adapt phase 'check. * gnu/packages/patches/date-output-pkg-config-files.patch: Update patch accordingly. Change-Id: Ie8b5dff4e8005b2654f2da295a6dd1cc629df001 Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
This commit is contained in:
parent
e14ccf95b1
commit
bc62e66b9b
2 changed files with 57 additions and 59 deletions
|
@ -1,4 +1,4 @@
|
|||
From e56b2dce7e89a92e1b9b35caa13b3e938c4cedea Mon Sep 17 00:00:00 2001
|
||||
From 13762204d70733b6e7510ccd323b9b1e77c06c0f Mon Sep 17 00:00:00 2001
|
||||
From: Cole Mickens <cole.mickens@gmail.com>
|
||||
Date: Sun, 26 Jan 2020 01:27:08 -0800
|
||||
Subject: [PATCH] CMakeLists.txt: output date.pc for pkg-config
|
||||
|
@ -10,16 +10,16 @@ Subject: [PATCH] CMakeLists.txt: output date.pc for pkg-config
|
|||
create mode 100644 date.pc.in
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f30c473..fe778e8 100644
|
||||
index 012512a..5fbea80 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -128,6 +128,15 @@ if( BUILD_TZ_LIB )
|
||||
@@ -158,6 +158,15 @@ if( BUILD_TZ_LIB )
|
||||
endif( )
|
||||
endif( )
|
||||
|
||||
+if ( BUILD_TZ_LIB )
|
||||
+ # Cflags: -I${includedir} @TZ_COMPILE_DEFINITIONS@
|
||||
+ set( TZ_COMPILE_DEFINITIONS "$<IF:$<TARGET_EXISTS:tz>,-D$<JOIN:$<TARGET_PROPERTY:tz,INTERFACE_COMPILE_DEFINITIONS>, -D>,>" )
|
||||
+ set( TZ_COMPILE_DEFINITIONS "$<IF:$<TARGET_EXISTS:date-tz>,-D$<JOIN:$<TARGET_PROPERTY:date-tz,INTERFACE_COMPILE_DEFINITIONS>, -D>,>" )
|
||||
+ configure_file(date.pc.in date.pc.cf @ONLY)
|
||||
+ file( GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/date.pc"
|
||||
+ INPUT "${CMAKE_CURRENT_BINARY_DIR}/date.pc.cf" )
|
||||
|
@ -29,7 +29,7 @@ index f30c473..fe778e8 100644
|
|||
#[===================================================================[
|
||||
installation
|
||||
#]===================================================================]
|
||||
@@ -171,6 +180,12 @@ install (
|
||||
@@ -201,6 +210,12 @@ install (
|
||||
FILES cmake/dateConfig.cmake "${version_config}"
|
||||
DESTINATION ${CONFIG_LOC})
|
||||
|
||||
|
@ -56,5 +56,5 @@ index 0000000..b9c4623
|
|||
+Name: date
|
||||
+Description: A date and time library based on the C++11/14/17 <chrono> header
|
||||
+Version: @PACKAGE_VERSION@
|
||||
+Libs: -L${libdir} -ltz
|
||||
+Libs: -L${libdir} -ldate-tz
|
||||
+Cflags: -I${includedir} @TZ_COMPILE_DEFINITIONS@
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue