Skip to content

Commit 4a79665

Browse files
Provide iconv.pc file
1 parent f2dbfdd commit 4a79665

5 files changed

Lines changed: 29 additions & 7 deletions

File tree

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/bash
2+
set -euo pipefail
3+
4+
THIRDPARTY_PREFIX=$1
5+
PC_TARGET_DIR=${THIRDPARTY_PREFIX}/lib/pkgconfig/
6+
7+
if [ ! -d "${PC_TARGET_DIR}" ]; then
8+
mkdir -p -v "${PC_TARGET_DIR}"
9+
fi
10+
11+
THIS_FILE=$(readlink -f "$0")
12+
BASEDIR=$(dirname "$THIS_FILE")
13+
echo "prefix=\"${THIRDPARTY_PREFIX}\"" > $PC_TARGET_DIR/iconv.pc
14+
cat ${BASEDIR}/iconv.pc.in >> $PC_TARGET_DIR/iconv.pc

3rdparty/packages/FixLibintlInstall.sh

Lines changed: 0 additions & 6 deletions
This file was deleted.

3rdparty/packages/glib-2.0.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ ExternalProjectMeson(glib-2.0
1414

1515
EXTRA_ARGUMENTS
1616
UPDATE_COMMAND
17-
#@TODO: attempt to libiconv.pc (pkg-config) so that this hack would not be needed
1817
${CMAKE_CURRENT_SOURCE_DIR}/packages/FixGlibSource.sh
1918
${CMAKE_CURRENT_BINARY_DIR}/glib-2.0-prefix/src/glib-2.0/
2019
${THIRDPARTY_PREFIX}

3rdparty/packages/iconv.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,8 @@ endif()
1414
ExternalProjectAutotools(iconv
1515
URL https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz
1616
URL_HASH SHA256=e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04
17+
EXTRA_ARGUMENTS
18+
# libiconv does not provide libiconv.pc
19+
TEST_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/packages/FixIconvInstall.sh ${THIRDPARTY_PREFIX}
20+
LOG_TEST 1
1721
)

3rdparty/packages/iconv.pc.in

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#prefix=[Will be prepended by "Fix Libiconv Install" script]
2+
libdir=${prefix}/lib
3+
includedir=${prefix}/include
4+
5+
Name: libiconv
6+
Description: libiconv
7+
Version: 1.18
8+
9+
Requires:
10+
Libs: -L${libdir} -liconv
11+
Cflags: -I${includedir}

0 commit comments

Comments
 (0)