mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 10:59:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[gettext] Remove SUBPATH, add iconv linking info (#20090)

Browse Source 
* Replace SUBPATH argument

* Add iconv to libintl link libraries

* x-add-version

* Fix tools build on mingw-dynamic

* Update versions

* [skip actions] Trigger CI
This commit is contained in:
Kai Pastor 2021-09-17 01:24:13 +02:00 committed by GitHub
parent b7aa438291
commit fbe07843a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ports/gettext/Makefile
View File

@ -6,6 +6,11 @@ install: install-gettext-runtime-intl install-gettext-runtime-po install-gettext
install: install-gettext-tools install-gettext-tools-gnulib install-gettext-tools-its install-gettext-tools-m4 install-gettext-tools-misc install-gettext-tools-po install-gettext-tools-projects install-gettext-tools-styles
install: install-libtextstyle
build-intl:
$(MAKE) -C intl all
install-intl:
$(MAKE) -C intl install
build-gettext-runtime-gnulib: build-gettext-runtime-intl
$(MAKE) -C gettext-runtime/gnulib-lib all
build-gettext-runtime-intl:

14
ports/gettext/gettext-tools_woe32dll_gettextsrc-exports.c.patch Normal file
View File

@ -0,0 +1,14 @@
X-Git-Url: https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=blobdiff_plain;f=gettext-tools%2Fwoe32dll%2Fgettextsrc-exports.c;h=6d760895961db57e013552b6b3f248bfa8eb17c2;hp=4477ae8d4b2e887592d4019432b91ea31b84ba59;hb=7cf68dffb2adb76375bfb0781e277510523a1f3e;hpb=3564f5f885544514bd2e345c36b74e5d91cad3e8
diff --git a/gettext-tools/woe32dll/gettextsrc-exports.c b/gettext-tools/woe32dll/gettextsrc-exports.c
index 4477ae8..6d76089 100644
--- a/gettext-tools/woe32dll/gettextsrc-exports.c
+++ b/gettext-tools/woe32dll/gettextsrc-exports.c
@@ -50,6 +50,7 @@ VARIABLE(formatstring_python)
VARIABLE(formatstring_python_brace)
VARIABLE(formatstring_qt)
VARIABLE(formatstring_qt_plural)
+VARIABLE(formatstring_ruby)
VARIABLE(formatstring_scheme)
VARIABLE(formatstring_sh)
VARIABLE(formatstring_smalltalk)

7
ports/gettext/portfile.cmake
View File

@ -28,6 +28,7 @@ vcpkg_extract_source_archive_ex(
0003-Fix-win-unicode-paths.patch
rel_path.patch
android.patch
gettext-tools_woe32dll_gettextsrc-exports.c.patch
${PATCHES}
)
vcpkg_find_acquire_program(BISON)
@ -87,7 +88,11 @@ function(build_libintl_only)
OPTIONS
${OPTIONS}
)
vcpkg_install_make(SUBPATH "/intl")
vcpkg_install_make(
MAKEFILE "${CMAKE_CURRENT_LIST_DIR}/Makefile"
BUILD_TARGET build-intl
INSTALL_TARGET install-intl
)
endfunction()
if("tools" IN_LIST FEATURES)

6
ports/gettext/vcpkg-cmake-wrapper.cmake
View File

@ -7,4 +7,8 @@ if(Intl_FOUND AND Intl_LIBRARIES)
unset(Intl_LIBRARIES)
unset(Intl_LIBRARIES CACHE)
select_library_configurations(Intl)
endif()
find_package(Iconv) # Since CMake 3.11
if(Iconv_FOUND AND NOT Iconv_IS_BUILT_IN)
list(APPEND Intl_LIBRARIES ${Iconv_LIBRARIES})
endif()
endif()

2
ports/gettext/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "gettext",
"version": "0.21",
"port-version": 5,
"port-version": 6,
"description": "GNU gettext provides libintl and a set of tools to help produce multi-lingual messages.",
"homepage": "https://www.gnu.org/software/gettext/",
"dependencies": [

2
versions/baseline.json
View File

@ -2350,7 +2350,7 @@
},
"gettext": {
"baseline": "0.21",
"port-version": 5
"port-version": 6
},
"gettimeofday": {
"baseline": "2017-10-14",

5
versions/g-/gettext.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "72394a1e7b0ea6333d78849f864c4b7bc8c7e8dc",
"version": "0.21",
"port-version": 6
},
{
"git-tree": "d1089dfcf335a94ca47c5b918c56a7ab6fc0ae92",
"version": "0.21",