Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/454b02eac1059e78c1de9e73da4e7773a6128c2e
...commit
http://git.netsurf-browser.org/toolchains.git/commit/454b02eac1059e78c1de9e73da4e7773a6128c2e
...tree
http://git.netsurf-browser.org/toolchains.git/tree/454b02eac1059e78c1de9e73da4e7773a6128c2e
The branch, master has been updated
via 454b02eac1059e78c1de9e73da4e7773a6128c2e (commit)
via 95e34cee83355e1d802847a6f97625d38a0f3464 (commit)
from 517219aa415eccb7002b036e4ca24323b8a92b73 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=454b02eac1059e78c1de9e73da4e7773a6128c2e
commit 454b02eac1059e78c1de9e73da4e7773a6128c2e
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
sdk: utf8proc: Patch to disable -fPIC
diff --git a/sdk/recipes/patches/utf8proc/disable-fPIC.p
b/sdk/recipes/patches/utf8proc/disable-fPIC.p
new file mode 100644
index 0000000000..bb4a68a2da
--- /dev/null
+++ b/sdk/recipes/patches/utf8proc/disable-fPIC.p
@@ -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}
+ )
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=95e34cee83355e1d802847a6f97625d38a0f3464
commit 95e34cee83355e1d802847a6f97625d38a0f3464
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
sdk: Add utf8proc
diff --git a/sdk/Makefile b/sdk/Makefile
index da53edadc1..66d5640a99 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -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)
@@ -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)
@@ -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
-----------------------------------------------------------------------
Summary of changes:
sdk/Makefile | 22 +++++++++++++++++++++-
sdk/recipes/patches/utf8proc/disable-fPIC.p | 11 +++++++++++
2 files changed, 32 insertions(+), 1 deletion(-)
create mode 100644 sdk/recipes/patches/utf8proc/disable-fPIC.p
diff --git a/sdk/Makefile b/sdk/Makefile
index da53edadc1..66d5640a99 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -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)
@@ -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)
@@ -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
diff --git a/sdk/recipes/patches/utf8proc/disable-fPIC.p
b/sdk/recipes/patches/utf8proc/disable-fPIC.p
new file mode 100644
index 0000000000..bb4a68a2da
--- /dev/null
+++ b/sdk/recipes/patches/utf8proc/disable-fPIC.p
@@ -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}
+ )
--
Cross-compilation toolchains and environments
