Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion sdk/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ VERSION_LIBCARES := 1.34.5
# https://curl.se/
VERSION_LIBCURL := 8.17.0

# Text processing

# https://github.com/JuliaStrings/utf8proc
VERSION_UTF8PROC := 2.11.3

############################################################################

# Platforms with no native iconv (AmigaOS, Atari, Windows)
Expand Down Expand Up @@ -176,7 +181,7 @@ REPACK := $(CURDIR)/../tools/repack
# Compute the SDK components
SDK_ITEMS :=

COMMON_SDK_ITEMS := zlib.d openssl.d libpng.d libcares.d libcurl.d libexpat.d
COMMON_SDK_ITEMS := zlib.d openssl.d libpng.d libcares.d libcurl.d libexpat.d utf8proc.d

LIBCURL_SSL := openssl
LIBCURL_DISABLES := $(patsubst %,--disable-%,ftp file dict ldap ldaps mqtt rtsp telnet gopher tftp pop3 imap smb smtp manual)
Expand Down Expand Up @@ -383,6 +388,21 @@ $(BUILDSTEPS)/libiconv-gensrc.d: $(BUILDSTEPS)/builddir.d
wget -q -O $(BUILDDIR)/$(subst $(SOURCEDIR)/,,$(SOURCETARBALL_LIBICONV)) "https://ftp.gnu.org/pub/gnu/libiconv/$(subst _,-,$(subst $(SOURCEDIR)/,,$(SOURCETARBALL_LIBICONV)))"
touch $@

###########
# utf8proc
###########

$(eval $(call patched_source_rule,utf8proc,$(VERSION_UTF8PROC)))

$(BUILDSTEPS)/utf8proc.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEP_SRC_UTF8PROC)
mkdir -p $(BUILDDIR_UTF8PROC)/ns-sdk-build
cd $(BUILDDIR_UTF8PROC)/ns-sdk-build && $(env) $(UTF8PROC_ENV) $(NS_SDK_CMAKE_CMD) -DCMAKE_BUILD_TYPE=Release ..
cd $(BUILDDIR_UTF8PROC)/ns-sdk-build && $(env) make install VERBOSE=1
touch $@

$(BUILDSTEPS)/utf8proc-gensrc.d: $(BUILDSTEPS)/builddir.d
wget -q -O $(BUILDDIR)/$(subst $(SOURCEDIR)/,,$(SOURCETARBALL_UTF8PROC)) "https://github.com/JuliaStrings/utf8proc/archive/refs/tags/v$(VERSION_UTF8PROC).tar.gz"
touch $@

###########
# libgnurx
Expand Down
11 changes: 11 additions & 0 deletions sdk/recipes/patches/utf8proc/disable-fPIC.p
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -46,7 +46,7 @@ if (NOT MSVC)
endif ()

set_target_properties (utf8proc PROPERTIES
- POSITION_INDEPENDENT_CODE ON
+ POSITION_INDEPENDENT_CODE OFF
VERSION "${SO_MAJOR}.${SO_MINOR}.${SO_PATCH}"
SOVERSION ${SO_MAJOR}
)