File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1+ #! /bin/bash
2+ set -euo pipefail
3+
4+ THIRDPARTY_PREFIX=$1
5+
6+ rm -v ${THIRDPARTY_PREFIX} /lib/libintl.so
Original file line number Diff line number Diff line change 1+ message (FATAL_ERROR "Do not build this. Use NOOP libintl" )
2+
13include_guard (GLOBAL )
24
35# gettext doesn't provide pkg-config .pc
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ if(ANDROID_ABI STREQUAL armeabi-v7a)
77endif ()
88
99ExternalProjectMeson (glib-2.0
10- DEPENDS iconv gettext ${LIBFFI_DEPENDENCY}
10+ DEPENDS iconv libintl ${LIBFFI_DEPENDENCY}
1111 URL https://ftp.gnome.org/pub/gnome/sources/glib/2.61/glib-2.61.1.tar.xz
1212 URL_HASH SHA256=f8d827955f0d8e197ff5c2105dd6ac4f6b63d15cd021eb1de66534c92a762161
1313 CONFIGURE_ARGUMENTS -Dlibmount=false
@@ -18,9 +18,4 @@ ExternalProjectMeson(glib-2.0
1818 ${CMAKE_CURRENT_SOURCE_DIR} /packages/FixGlibSource.sh
1919 ${CMAKE_CURRENT_BINARY_DIR} /glib-2.0-prefix/src/glib-2.0/
2020 ${THIRDPARTY_PREFIX}
21-
22- # glib uses libintl (from gettext), but the glib-2.0.pc is wrong
23- # libintl.a needs to be included after libglib-2.0
24- TEST_COMMAND ${CMAKE_CURRENT_SOURCE_DIR} /packages/FixGlibInstall.sh ${THIRDPARTY_PREFIX}
25- LOG_TEST 1
2621)
Original file line number Diff line number Diff line change 1+ include_guard (GLOBAL )
2+
3+ ExternalProjectMeson (libintl
4+ URL https://github.com/frida/proxy-libintl/archive/0.1.tar.gz
5+ URL_HASH SHA256=202d90855943091b11ac91863ff5884f0eaf80318a32dc8504fcfdafc65992ed
6+
7+ EXTRA_ARGUMENTS
8+ # Delete libintl.so.
9+ TEST_COMMAND ${CMAKE_CURRENT_SOURCE_DIR} /packages/FixLibintlInstall.sh ${THIRDPARTY_PREFIX}
10+ LOG_TEST 1
11+ )
You can’t perform that action at this time.
0 commit comments