diff options
| author | fuzzard <fuzzard@kodi.tv> | 2021-10-09 17:34:21 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2021-10-17 07:31:21 +1000 |
| commit | b8ee296a3b3e568745fe566a11e3572742c38d2d (patch) | |
| tree | b9f19011ddb7d4f3da5844af1df568509440c2c7 /tools/depends/target/python3 | |
| parent | 1b42e9722a50d1d79fe2eeac1dda37edfb2cfbb3 (diff) | |
[tools/depends][target] python simplify localemodule sed replace
Diffstat (limited to 'tools/depends/target/python3')
| -rw-r--r-- | tools/depends/target/python3/Makefile | 6 | ||||
| -rw-r--r-- | tools/depends/target/python3/modules.setup | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tools/depends/target/python3/Makefile b/tools/depends/target/python3/Makefile index 9f7456095f..b184a8cc59 100644 --- a/tools/depends/target/python3/Makefile +++ b/tools/depends/target/python3/Makefile @@ -11,7 +11,7 @@ BASE_URL=https://www.python.org/ftp/python/$(VERSION) ifeq ($(findstring apple-darwin, $(HOST)), apple-darwin) HOSTPLATFORM=_PYTHON_HOST_PLATFORM="darwin" - LINK_ICONV=-framework CoreFoundation -liconv + LINK_ICONV=-liconv endif ifeq ($(OS), darwin_embedded) @@ -56,9 +56,7 @@ endif #Add -liconv as needed, and add the _scproxy module for darwin # disable locale altogether for Android ifeq ($(OS),android) - cd $(PLATFORM); sed -ie 's|_locale -DPy_BUILD_CORE_BUILTIN _localemodule.c # -lintl|#_locale -DPy_BUILD_CORE_BUILTIN _localemodule.c # -lintl|' Modules/Setup -else - cd $(PLATFORM); sed -ie 's|_locale -DPy_BUILD_CORE_BUILTIN _localemodule.c # -lintl|_locale -DPy_BUILD_CORE_BUILTIN _localemodule.c -lintl $(LINK_ICONV)|' Modules/Setup + cd $(PLATFORM); sed -ie 's|_locale -DPy_BUILD_CORE_BUILTIN _localemodule.c -lintl \$$(LINK_ICONV)|#_locale -DPy_BUILD_CORE_BUILTIN _localemodule.c -lintl \$$(LINK_ICONV)|' Modules/Setup endif ifeq ($(OS),linux) # _posixshmem module requires librt for linux for SHM_OPEN/SHM_UNLINK diff --git a/tools/depends/target/python3/modules.setup b/tools/depends/target/python3/modules.setup index f3cf194329..44fea4c8a9 100644 --- a/tools/depends/target/python3/modules.setup +++ b/tools/depends/target/python3/modules.setup @@ -120,7 +120,7 @@ time -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal timemodule.c # -lm # t _thread -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal _threadmodule.c # low-level threading interface # access to ISO C locale support -_locale -DPy_BUILD_CORE_BUILTIN _localemodule.c # -lintl +_locale -DPy_BUILD_CORE_BUILTIN _localemodule.c -lintl $(LINK_ICONV) # Standard I/O baseline _io -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal -I$(srcdir)/Modules/_io _io/_iomodule.c _io/iobase.c _io/fileio.c _io/bytesio.c _io/bufferedio.c _io/textio.c _io/stringio.c |