Compatibility with old libraries used on webOS: GMP, GnuTLS, Nettle

package/Config.in

@@ -2704,6 +2704,8 @@ menu "WebOS"
 	source "package/pmloglib/Config.in"
 	source "package/umediaserver/Config.in"
 	source "package/webos/Config.in"
+	source "package/webos-gmp/Config.in"
+	source "package/webos-gnutls/Config.in"
 	source "package/webos-userland/Config.in"
 	source "package/webos-wayland-extensions/Config.in"
 endmenu

package/coreutils/coreutils.mk

@@ -81,8 +81,8 @@ ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y)
 COREUTILS_CONF_OPTS += --with-libintl-prefix=$(STAGING_DIR)/usr
 endif
 
-ifeq ($(BR2_PACKAGE_GMP),y)
-COREUTILS_DEPENDENCIES += gmp
+ifneq ($(BR2_PACKAGE_GMP)$(BR2_PACKAGE_WEBOS_GMP),)
+COREUTILS_DEPENDENCIES += $(if $(BR2_PACKAGE_WEBOS_GMP),webos-gmp,gmp)
 else
 COREUTILS_CONF_OPTS += --without-gmp
 endif

package/dnsmasq/dnsmasq.mk

@@ -24,7 +24,7 @@ DNSMASQ_COPTS += -DNO_DHCP
 endif
 
 ifeq ($(BR2_PACKAGE_DNSMASQ_DNSSEC),y)
-DNSMASQ_DEPENDENCIES += gmp nettle
+DNSMASQ_DEPENDENCIES += $(if $(BR2_PACKAGE_WEBOS_GMP),webos-gmp,gmp) nettle
 DNSMASQ_COPTS += -DHAVE_DNSSEC
 endif
 

package/gdb/gdb.mk

@@ -154,7 +154,7 @@ endif
 ifeq ($(BR2_GDB_VERSION_10)$(BR2_arc):$(BR2_PACKAGE_GDB_DEBUGGER),:y)
 GDB_CONF_OPTS += \
 	--with-libgmp-prefix=$(STAGING_DIR)/usr
-GDB_DEPENDENCIES += gmp
+GDB_DEPENDENCIES += $(if $(BR2_PACKAGE_WEBOS_GMP),webos-gmp,gmp)
 endif
 
 ifeq ($(BR2_PACKAGE_GDB_SERVER),y)

package/glib-networking/glib-networking.mk

@@ -23,7 +23,7 @@ GLIB_NETWORKING_LICENSE_FILES = COPYING
 GLIB_NETWORKING_CPE_ID_VENDOR = gnome
 
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
-GLIB_NETWORKING_DEPENDENCIES += gnutls
+GLIB_NETWORKING_DEPENDENCIES += $(if $(BR2_PACKAGE_WEBOS_GNUTLS),webos-gnutls,gnutls)
 GLIB_NETWORKING_CONF_OPTS += -Dgnutls=enabled
 else
 GLIB_NETWORKING_CONF_OPTS += -Dgnutls=disabled

package/gmp/gmp.mk

@@ -29,5 +29,9 @@ else
 GMP_CONF_OPTS += --disable-cxx
 endif
 
+# Don't build for target if using webOS GMP instead
+#ifneq ($(BR2_PACKAGE_WEBOS_GMP),y)
 $(eval $(autotools-package))
+#endif
+
 $(eval $(host-autotools-package))

package/gnuradio/gnuradio.mk

@@ -19,7 +19,7 @@ GNURADIO_DEPENDENCIES = \
 	host-swig \
 	boost \
 	log4cpp \
-	gmp \
+	$(if $(BR2_PACKAGE_WEBOS_GMP),webos-gmp,gmp) \
 	volk
 
 GNURADIO_CONF_OPTS = \

package/gnutls/gnutls.mk

@@ -127,5 +127,8 @@ endif
 
 GNUTLS_CONF_ENV += LIBS="$(GNUTLS_LIBS)"
 
+# Don't build for target if using webOS package instead
+ifneq ($(BR2_PACKAGE_WEBOS_GNUTLS),y)
 $(eval $(autotools-package))
+endif
 $(eval $(host-autotools-package))

package/guile/guile.mk

@@ -16,7 +16,7 @@ GUILE_LICENSE = LGPL-3.0+
 GUILE_LICENSE_FILES = LICENSE COPYING COPYING.LESSER
 GUILE_CPE_ID_VENDOR = gnu
 
-GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf
+GUILE_DEPENDENCIES = host-guile libunistring libffi $(if $(BR2_PACKAGE_WEBOS_GMP),webos-gmp,gmp) bdwgc host-pkgconf
 HOST_GUILE_DEPENDENCIES = \
 	host-libunistring host-libffi host-gmp host-bdwgc host-flex \
 	host-pkgconf host-gettext host-gperf

package/libbytesize/libbytesize.mk

@@ -13,7 +13,7 @@ LIBBYTESIZE_INSTALL_STAGING = YES
 LIBBYTESIZE_DEPENDENCIES = \
 	host-pkgconf \
 	host-gettext \
-	gmp \
+	$(if $(BR2_PACKAGE_WEBOS_GMP),webos-gmp,gmp) \
 	mpfr \
 	pcre2
 

package/libpbnjson/libpbnjson.mk

@@ -16,7 +16,7 @@ LIBPBNJSON_DEPENDENCIES = \
 	host-lemon \
 	cmake-modules-webos \
 	boost \
-	gmp \
+	$(if $(BR2_PACKAGE_WEBOS_GMP),webos-gmp,gmp) \
 	libglib2 \
 	liburiparser \
 	yajl

package/minetest/minetest.mk

@@ -10,7 +10,7 @@ MINETEST_LICENSE = LGPL-2.1+ (code), CC-BY-SA-3.0 (textures and sounds), Zlib (i
 MINETEST_LICENSE_FILES = LICENSE.txt lib/irrlichtmt/doc/irrlicht-license.txt
 MINETEST_CPE_ID_VENDOR = minetest
 
-MINETEST_DEPENDENCIES = gmp jsoncpp luajit sqlite zlib zstd
+MINETEST_DEPENDENCIES = $(if $(BR2_PACKAGE_WEBOS_GMP),webos-gmp,gmp) jsoncpp luajit sqlite zlib zstd
 
 MINETEST_IRRLICHTMT_VERSION = 1.9.0mt5
 MINETEST_EXTRA_DOWNLOADS = $(call github,minetest,irrlicht,$(MINETEST_IRRLICHTMT_VERSION))/irrlicht-$(MINETEST_IRRLICHTMT_VERSION).tar.gz

package/mpc/mpc.mk

@@ -9,7 +9,7 @@ MPC_SITE = $(BR2_GNU_MIRROR)/mpc
 MPC_LICENSE = LGPL-3.0+
 MPC_LICENSE_FILES = COPYING.LESSER
 MPC_INSTALL_STAGING = YES
-MPC_DEPENDENCIES = gmp mpfr
+MPC_DEPENDENCIES = $(if $(BR2_PACKAGE_WEBOS_GMP),webos-gmp,gmp) mpfr
 HOST_MPC_DEPENDENCIES = host-gmp host-mpfr
 
 $(eval $(autotools-package))

package/mpfr/mpfr.mk

@@ -11,7 +11,7 @@ MPFR_LICENSE = LGPL-3.0+
 MPFR_LICENSE_FILES = COPYING.LESSER
 MPFR_CPE_ID_VENDOR = gnu
 MPFR_INSTALL_STAGING = YES
-MPFR_DEPENDENCIES = gmp
+MPFR_DEPENDENCIES = $(if $(BR2_PACKAGE_WEBOS_GMP),webos-gmp,gmp)
 HOST_MPFR_DEPENDENCIES = host-gmp
 MPFR_MAKE_OPTS = RANLIB=$(TARGET_RANLIB)
 

package/mpir/mpir.mk

@@ -10,7 +10,7 @@ MPIR_SOURCE = mpir-$(MPIR_VERSION).tar.bz2
 MPIR_LICENSE = LGPL-3.0+
 MPIR_LICENSE_FILES = COPYING.LIB
 MPIR_INSTALL_STAGING = YES
-MPIR_DEPENDENCIES = gmp host-yasm
+MPIR_DEPENDENCIES = $(if $(BR2_PACKAGE_WEBOS_GMP),webos-gmp,gmp) host-yasm
 
 ifeq ($(BR2_MIPS_NABI32),y)
 MPIR_CONF_OPTS += ABI=n32

package/nettle/0001-fix-shared-only-build.patch

@@ -0,0 +1,75 @@
+static/shared: use available libraries when linking our tools/examples/testsuite
+
+For a shared-only build, static libraries do not exist, so the build fails as
+soon as we try to link either of our tools, examples or testsuite utils.
+
+Use whatever libraries are available, with a preference toward using shared
+libraries.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN nettle-2.7.1.orig/config.make.in nettle-2.7.1/config.make.in
+--- nettle-2.7.1.orig/config.make.in	2013-05-28 16:21:53.000000000 +0200
++++ nettle-2.7.1/config.make.in	2014-12-12 19:56:07.031292752 +0100
+@@ -30,6 +30,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+
+ SHLIBCFLAGS = @SHLIBCFLAGS@
++@IF_STATIC@LIBS_EXT = .a
++@IF_SHARED@LIBS_EXT = .so
+
+ LIBNETTLE_MAJOR = @LIBNETTLE_MAJOR@
+ LIBNETTLE_MINOR = @LIBNETTLE_MINOR@
+diff -durN nettle-2.7.1.orig/tools/Makefile.in nettle-2.7.1/tools/Makefile.in
+--- nettle-2.7.1.orig/tools/Makefile.in	2013-05-28 16:21:54.000000000 +0200
++++ nettle-2.7.1/tools/Makefile.in	2014-12-12 19:57:12.499805574 +0100
+@@ -34,19 +34,19 @@
+ DISTFILES = $(SOURCES) Makefile.in input.h misc.h output.h parse.h
+
+ sexp_conv_OBJS = $(sexp_conv_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS)
+-sexp-conv$(EXEEXT): $(sexp_conv_OBJS) ../libnettle.a
++sexp-conv$(EXEEXT): $(sexp_conv_OBJS) ../libnettle$(LIBS_EXT)
+ 	$(LINK) $(sexp_conv_OBJS) -lnettle $(LIBS) -o $@
+
+-nettle-lfib-stream$(EXEEXT): nettle-lfib-stream.$(OBJEXT) ../libnettle.a
++nettle-lfib-stream$(EXEEXT): nettle-lfib-stream.$(OBJEXT) ../libnettle$(LIBS_EXT)
+ 	$(LINK) nettle-lfib-stream.$(OBJEXT) -lnettle $(LIBS) -o $@
+
+ pkcs1_conv_OBJS = $(pkcs1_conv_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS)
+-pkcs1-conv$(EXEEXT): $(pkcs1_conv_OBJS) ../libnettle.a ../libhogweed.a
++pkcs1-conv$(EXEEXT): $(pkcs1_conv_OBJS) ../libnettle$(LIBS_EXT) ../libhogweed$(LIBS_EXT)
+ 	$(LINK) $(pkcs1_conv_OBJS) -lhogweed -lnettle $(LIBS) -o $@
+
+ # FIXME: Avoid linking with gmp
+ nettle_hash_OBJS = $(nettle_hash_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS)
+-nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../libnettle.a
++nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../libnettle$(LIBS_EXT)
+ 	$(LINK) $(nettle_hash_OBJS) -lnettle $(LIBS) -o $@
+
+
+diff -durN nettle-2.7.1.orig/examples/Makefile.in nettle-2.7.1/examples/Makefile.in
+--- nettle-2.7.1.orig/examples/Makefile.in	2013-05-28 16:21:54.000000000 +0200
++++ nettle-2.7.1/examples/Makefile.in	2014-12-12 21:54:48.286251022 +0100
+@@ -117,8 +117,8 @@
+ 	-lhogweed -lnettle $(BENCH_LIBS) $(LIBS) $(OPENSSL_LIBFLAGS) \
+ 	-o hogweed-benchmark$(EXEEXT)
+
+-$(TARGETS) : io.$(OBJEXT) ../libnettle.a
+-$(HOGWEED_TARGETS): ../libhogweed.a
++$(TARGETS) : io.$(OBJEXT) ../libnettle$(LIBS_EXT)
++$(HOGWEED_TARGETS): ../libhogweed$(LIBS_EXT)
+
+ check: $(TS_ALL)
+ 	LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" srcdir="$(srcdir)" \
+diff -durN nettle-2.7.1.orig/testsuite/Makefile.in nettle-2.7.1/testsuite/Makefile.in
+--- nettle-2.7.1.orig/testsuite/Makefile.in	2013-05-28 16:21:54.000000000 +0200
++++ nettle-2.7.1/testsuite/Makefile.in	2014-12-12 21:55:30.414814549 +0100
+@@ -96,7 +96,7 @@
+ include $(srcdir)/.test-rules.make
+
+ $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \
+-	../libnettle.a @IF_HOGWEED@ ../libhogweed.a
++	../libnettle$(LIBS_EXT) @IF_HOGWEED@ ../libhogweed$(LIBS_EXT)
+
+ # For use as, e.g.,
+ #

package/nettle/nettle.hash

@@ -1,6 +1,5 @@
 # Locally calculated after checking pgp signature
-# https://ftp.gnu.org/gnu/nettle/nettle-3.8.1.tar.gz.sig
-sha256  364f3e2b77cd7dcde83fd7c45219c834e54b0c75e428b6f894a23d12dd41cbfe  nettle-3.8.1.tar.gz
+# https://ftp.gnu.org/gnu/nettle/nettle-2.7.1.tar.gz
+sha256  bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40  nettle-2.7.1.tar.gz
 # Locally calculated
-sha256  a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c  COPYING.LESSERv3
-sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYINGv2
+sha256  a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861  COPYING.LIB

package/nettle/nettle.mk

@@ -4,13 +4,12 @@
 #
 ################################################################################
 
-NETTLE_VERSION = 3.8.1
+NETTLE_VERSION = 2.7.1
 NETTLE_SITE = https://ftp.gnu.org/gnu/nettle
-NETTLE_DEPENDENCIES = gmp
+NETTLE_DEPENDENCIES = $(if $(BR2_PACKAGE_WEBOS_GMP),webos-gmp,gmp)
 NETTLE_INSTALL_STAGING = YES
-NETTLE_LICENSE = Dual GPL-2.0+/LGPL-3.0+
-NETTLE_LICENSE_FILES = COPYING.LESSERv3 COPYINGv2
-NETTLE_CPE_ID_VENDOR = nettle_project
+NETTLE_LICENSE = LGPLv2.1+
+NETTLE_LICENSE_FILES = COPYING.LIB
 # don't include openssl support for (unused) examples as it has problems
 # with static linking
 NETTLE_CONF_OPTS = --disable-openssl
@@ -20,11 +19,18 @@ ifeq ($(BR2_ARM_CPU_ARMV4)$(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV7M),y)
 NETTLE_CONF_OPTS += --disable-assembler
 endif
 
-ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
+# ARM NEON, requires binutils 2.21+
+ifeq ($(BR2_ARM_CPU_HAS_NEON)$(BR2_TOOLCHAIN_BUILDROOT)$(BR2_BINUTILS_VERSION_2_20_1),yy)
 NETTLE_CONF_OPTS += --enable-arm-neon
 else
 NETTLE_CONF_OPTS += --disable-arm-neon
 endif
 
+define NETTLE_DITCH_DEBUGGING_CFLAGS
+	$(SED) '/CFLAGS/ s/ -ggdb3//' $(@D)/configure
+endef
+
+NETTLE_POST_EXTRACT_HOOKS += NETTLE_DITCH_DEBUGGING_CFLAGS
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/nftables/nftables.mk

@@ -14,7 +14,7 @@ NFTABLES_CONF_OPTS = --disable-debug --disable-man-doc --disable-pdf-doc
 NFTABLES_SELINUX_MODULES = iptables
 
 ifeq ($(BR2_PACKAGE_GMP),y)
-NFTABLES_DEPENDENCIES += gmp
+NFTABLES_DEPENDENCIES += $(if $(BR2_PACKAGE_WEBOS_GMP),webos-gmp,gmp)
 NFTABLES_CONF_OPTS += --without-mini-gmp
 else
 NFTABLES_CONF_OPTS += --with-mini-gmp

package/openldap/openldap.mk

@@ -36,7 +36,7 @@ OPENLDAP_DEPENDENCIES += openssl
 OPENLDAP_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto`"
 else ifeq ($(BR2_PACKAGE_GMP),y)
 OPENLDAP_MP = gmp
-OPENLDAP_DEPENDENCIES += gmp
+OPENLDAP_DEPENDENCIES += $(if $(BR2_PACKAGE_WEBOS_GMP),webos-gmp,gmp)
 else
 OPENLDAP_MP = longlong
 endif

package/openswan/openswan.mk

@@ -10,7 +10,7 @@ OPENSWAN_LICENSE = GPL-2.0+, BSD-3-Clause
 OPENSWAN_LICENSE_FILES = COPYING LICENSE
 OPENSWAN_CPE_ID_VENDOR = xelerance
 
-OPENSWAN_DEPENDENCIES = host-bison host-flex gmp iproute2
+OPENSWAN_DEPENDENCIES = host-bison host-flex $(if $(BR2_PACKAGE_WEBOS_GMP),webos-gmp,gmp) iproute2
 OPENSWAN_MAKE_OPTS = ARCH=$(BR2_ARCH) CC="$(TARGET_CC)" POD2MAN="" XMLTO="" \
 	USERCOMPILE="$(TARGET_CFLAGS) $(if $(BR2_TOOLCHAIN_SUPPORTS_PIE),-fPIE)" \
 	USERLINK="$(TARGET_LDFLAGS) $(if $(BR2_TOOLCHAIN_SUPPORTS_PIE),-fPIE)" \

package/php/php.mk

@@ -203,7 +203,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_PHP_EXT_GMP),y)
 PHP_CONF_OPTS += --with-gmp=$(STAGING_DIR)/usr
-PHP_DEPENDENCIES += gmp
+PHP_DEPENDENCIES += $(if $(BR2_PACKAGE_WEBOS_GMP),webos-gmp,gmp)
 endif
 
 ifeq ($(BR2_PACKAGE_PHP_EXT_READLINE),y)

package/ruby/ruby.mk

@@ -76,7 +76,7 @@ ifeq ($(BR2_PACKAGE_ZLIB),y)
 RUBY_DEPENDENCIES += zlib
 endif
 ifeq ($(BR2_PACKAGE_GMP),y)
-RUBY_DEPENDENCIES += gmp
+RUBY_DEPENDENCIES += $(if $(BR2_PACKAGE_WEBOS_GMP),webos-gmp,gmp)
 RUBY_CONF_OPTS += --with-gmp
 else
 RUBY_CONF_OPTS += --without-gmp

package/webos-gmp/0001-disable-stdc.patch

@@ -0,0 +1,33 @@
+Upstream-Status: Pending
+
+# "extern inline" in traditional gcc means that the function should be 
+# inlined wherever it's seen, while in C99, "extern inline" means that i
+# the function should only be inlined where the inline definition is 
+# seen while in other places it's not inlined:
+# http://gcc.gnu.org/ml/gcc/2006-11/msg00006.html
+#
+# gmp checks "--std=gnu99" to use C99 convention however it internally 
+# defines some "extern inline" functions in gmp.h, which is included
+# by mainly .c files and finally lead a flood of redefinition function
+# errors when linking objects together.
+#
+# So disable C99/ANSI detection to stick to tranditional gcc behavior
+#
+# by Kevin Tian <kevin.tian@intel.com>, 2010-08-13
+#
+# (this patch is licensed under GPLv2+)
+
+diff --git a/configure.in b/configure.in
+index 450cc92..aab0b59 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1869,9 +1869,7 @@ AC_SUBST(DEFN_LONG_LONG_LIMB)
+
+ # The C compiler and preprocessor, put into ANSI mode if possible.
+ AC_PROG_CC
+-AC_PROG_CC_STDC
+ AC_PROG_CPP
+-GMP_H_ANSI
+
+
+ # The C compiler on the build system, and associated tests.

package/webos-gmp/0002-gmp_fix_for_automake-1.12.patch

@@ -0,0 +1,48 @@
+Upstream-Status: Pending
+
+automake 1.12 has depricated automatic de-ANSI-fication support
+
+this patch avoids these kinds of errors:
+
+| configure.in:2240: error: automatic de-ANSI-fication support has been removed
+| Makefile.am:28: error: automatic de-ANSI-fication support has been removed
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/05/02
+
+Index: gmp-4.2.1/configure.in
+===================================================================
+--- gmp-4.2.1.orig/configure.in
++++ gmp-4.2.1/configure.in
+@@ -67,7 +67,7 @@ dnl
+ dnl  Note that there's a copy of these options in the top-level Makefile.am,
+ dnl  so update there too if changing anything.
+ dnl
+-AM_INIT_AUTOMAKE([1.8 gnu no-dependencies $(top_builddir)/ansi2knr])
++AM_INIT_AUTOMAKE([1.8 gnu no-dependencies])
+ AM_CONFIG_HEADER(config.h:config.in)
+ AM_MAINTAINER_MODE
+
+@@ -2022,9 +2022,6 @@ fi
+ echo "      MPN_PATH=\"$path\""
+
+
+-# Automake ansi2knr support.
+-AM_C_PROTOTYPES
+-
+ GMP_PROG_AR
+ GMP_PROG_NM
+
+Index: gmp-4.2.1/Makefile.am
+===================================================================
+--- gmp-4.2.1.orig/Makefile.am
++++ gmp-4.2.1/Makefile.am
+@@ -27,7 +27,7 @@
+ # Makefiles in subdirectories, but here we must omit it so automake gives
+ # the actual ansi2knr build rule, not "cd $(top_builddir) && make ansi2knr".
+ #
+-AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies ansi2knr
++AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies
+
+
+ # Libtool -version-info for libgmp.la and libmp.la.  See "Versioning" in the