75 files changed, 41 insertions, 7 deletions

diff --git a/data/libnghttp2/_metadata/conflicts b/data/_nghttp2/_metadata/conflicts
index b67b7d0b5..b67b7d0b5 100644
--- a/data/libnghttp2/_metadata/conflicts
+++ b/data/_nghttp2/_metadata/conflicts
diff --git a/data/libnghttp2/_metadata/description b/data/_nghttp2/_metadata/description
index 18ad98d17..18ad98d17 100644
--- a/data/libnghttp2/_metadata/description
+++ b/data/_nghttp2/_metadata/description
diff --git a/data/libnghttp2/_metadata/homepage b/data/_nghttp2/_metadata/homepage
index f8840b4b2..f8840b4b2 100644
--- a/data/libnghttp2/_metadata/homepage
+++ b/data/_nghttp2/_metadata/homepage
diff --git a/data/libnghttp2/_metadata/in.1443.00 b/data/_nghttp2/_metadata/in.1443.00
index e69de29bb..e69de29bb 100644
--- a/data/libnghttp2/_metadata/in.1443.00
+++ b/data/_nghttp2/_metadata/in.1443.00
diff --git a/data/libnghttp2/_metadata/in.550.58 b/data/_nghttp2/_metadata/in.550.58
index e69de29bb..e69de29bb 100644
--- a/data/libnghttp2/_metadata/in.550.58
+++ b/data/_nghttp2/_metadata/in.550.58
diff --git a/data/libnghttp2/_metadata/libevent.dep b/data/_nghttp2/_metadata/libevent.dep
index c79b2082c..c79b2082c 120000
--- a/data/libnghttp2/_metadata/libevent.dep
+++ b/data/_nghttp2/_metadata/libevent.dep
diff --git a/data/libnghttp2/_metadata/libssl1.0.dep b/data/_nghttp2/_metadata/libssl1.0.dep
index a501d00a8..a501d00a8 120000
--- a/data/libnghttp2/_metadata/libssl1.0.dep
+++ b/data/_nghttp2/_metadata/libssl1.0.dep
diff --git a/data/libnghttp2/_metadata/license b/data/_nghttp2/_metadata/license
index 80201792e..80201792e 100644
--- a/data/libnghttp2/_metadata/license
+++ b/data/_nghttp2/_metadata/license
diff --git a/data/_nghttp2/_metadata/maintainer b/data/_nghttp2/_metadata/maintainer
new file mode 120000
index 000000000..573d7ebef
--- /dev/null
+++ b/data/_nghttp2/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/sbingner
\ No newline at end of file
diff --git a/data/libnghttp2/_metadata/priority b/data/_nghttp2/_metadata/priority
index a6a7b9cd7..a6a7b9cd7 100644
--- a/data/libnghttp2/_metadata/priority
+++ b/data/_nghttp2/_metadata/priority
diff --git a/data/libnghttp2/_metadata/provides b/data/_nghttp2/_metadata/provides
index b67b7d0b5..b67b7d0b5 100644
--- a/data/libnghttp2/_metadata/provides
+++ b/data/_nghttp2/_metadata/provides
diff --git a/data/libnghttp2/_metadata/replaces b/data/_nghttp2/_metadata/replaces
index b67b7d0b5..b67b7d0b5 100644
--- a/data/libnghttp2/_metadata/replaces
+++ b/data/_nghttp2/_metadata/replaces
diff --git a/data/libnghttp2/_metadata/role b/data/_nghttp2/_metadata/role
index 8d0320866..8d0320866 100644
--- a/data/libnghttp2/_metadata/role
+++ b/data/_nghttp2/_metadata/role
diff --git a/data/libnghttp2/_metadata/section b/data/_nghttp2/_metadata/section
index e0eb96881..e0eb96881 100644
--- a/data/libnghttp2/_metadata/section
+++ b/data/_nghttp2/_metadata/section
diff --git a/data/libnghttp2/_metadata/tags b/data/_nghttp2/_metadata/tags
index a8928cec8..a8928cec8 100644
--- a/data/libnghttp2/_metadata/tags
+++ b/data/_nghttp2/_metadata/tags
diff --git a/data/_nghttp2/_metadata/version b/data/_nghttp2/_metadata/version
new file mode 100644
index 000000000..ebeef2f2d
--- /dev/null
+++ b/data/_nghttp2/_metadata/version
@@ -0,0 +1 @@
+1.38.0
diff --git a/data/libnghttp2/make.sh b/data/_nghttp2/make.sh
index 8780dfc63..8780dfc63 100644
--- a/data/libnghttp2/make.sh
+++ b/data/_nghttp2/make.sh
diff --git a/data/_nghttp2/nghttp2-1.38.0.tar.xz b/data/_nghttp2/nghttp2-1.38.0.tar.xz
new file mode 100644
index 000000000..ba0eea9d4
--- /dev/null
+++ b/data/_nghttp2/nghttp2-1.38.0.tar.xz
diff --git a/data/libnghttp2-14/_metadata/_nghttp2.dep b/data/libnghttp2-14/_metadata/_nghttp2.dep
new file mode 120000
index 000000000..05394e6e2
--- /dev/null
+++ b/data/libnghttp2-14/_metadata/_nghttp2.dep
@@ -0,0 +1 @@
+../../_nghttp2
\ No newline at end of file
diff --git a/data/libnghttp2-14/_metadata/conflicts b/data/libnghttp2-14/_metadata/conflicts
new file mode 100644
index 000000000..b67b7d0b5
--- /dev/null
+++ b/data/libnghttp2-14/_metadata/conflicts
@@ -0,0 +1 @@
+nghttp2
diff --git a/data/libnghttp2-14/_metadata/description b/data/libnghttp2-14/_metadata/description
new file mode 100644
index 000000000..49d97c861
--- /dev/null
+++ b/data/libnghttp2-14/_metadata/description
@@ -0,0 +1 @@
+library implementing HTTP/2 protocol (shared library)
diff --git a/data/libnghttp2-14/_metadata/homepage b/data/libnghttp2-14/_metadata/homepage
new file mode 120000
index 000000000..7c356c311
--- /dev/null
+++ b/data/libnghttp2-14/_metadata/homepage
@@ -0,0 +1 @@
+../../_nghttp2/_metadata/homepage
\ No newline at end of file
diff --git a/data/node/_metadata/in.1443.00 b/data/libnghttp2-14/_metadata/in.1443.00
index e69de29bb..e69de29bb 100644
--- a/data/node/_metadata/in.1443.00
+++ b/data/libnghttp2-14/_metadata/in.1443.00
diff --git a/data/libnghttp2-14/_metadata/in.550.58 b/data/libnghttp2-14/_metadata/in.550.58
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/libnghttp2-14/_metadata/in.550.58
diff --git a/data/libnghttp2-14/_metadata/license b/data/libnghttp2-14/_metadata/license
new file mode 120000
index 000000000..7c54fc4d7
--- /dev/null
+++ b/data/libnghttp2-14/_metadata/license
@@ -0,0 +1 @@
+../../_nghttp2/_metadata/license
\ No newline at end of file
diff --git a/data/libnghttp2-14/_metadata/maintainer b/data/libnghttp2-14/_metadata/maintainer
new file mode 120000
index 000000000..151e227c5
--- /dev/null
+++ b/data/libnghttp2-14/_metadata/maintainer
@@ -0,0 +1 @@
+../../_nghttp2/_metadata/maintainer
\ No newline at end of file
diff --git a/data/libnghttp2-14/_metadata/priority b/data/libnghttp2-14/_metadata/priority
new file mode 100644
index 000000000..a6a7b9cd7
--- /dev/null
+++ b/data/libnghttp2-14/_metadata/priority
@@ -0,0 +1 @@
+standard
diff --git a/data/libnghttp2-14/_metadata/provides b/data/libnghttp2-14/_metadata/provides
new file mode 100644
index 000000000..b67b7d0b5
--- /dev/null
+++ b/data/libnghttp2-14/_metadata/provides
@@ -0,0 +1 @@
+nghttp2
diff --git a/data/libnghttp2-14/_metadata/replaces b/data/libnghttp2-14/_metadata/replaces
new file mode 100644
index 000000000..b67b7d0b5
--- /dev/null
+++ b/data/libnghttp2-14/_metadata/replaces
@@ -0,0 +1 @@
+nghttp2
diff --git a/data/libnghttp2-14/_metadata/role b/data/libnghttp2-14/_metadata/role
new file mode 100644
index 000000000..8d0320866
--- /dev/null
+++ b/data/libnghttp2-14/_metadata/role
@@ -0,0 +1 @@
+developer
diff --git a/data/libnghttp2-14/_metadata/section b/data/libnghttp2-14/_metadata/section
new file mode 100644
index 000000000..e0eb96881
--- /dev/null
+++ b/data/libnghttp2-14/_metadata/section
@@ -0,0 +1 @@
+Development
diff --git a/data/libnghttp2-14/_metadata/tags b/data/libnghttp2-14/_metadata/tags
new file mode 100644
index 000000000..a8928cec8
--- /dev/null
+++ b/data/libnghttp2-14/_metadata/tags
@@ -0,0 +1 @@
+purpose::library
diff --git a/data/libnghttp2-14/_metadata/version b/data/libnghttp2-14/_metadata/version
new file mode 120000
index 000000000..200a9df2c
--- /dev/null
+++ b/data/libnghttp2-14/_metadata/version
@@ -0,0 +1 @@
+../../_nghttp2/_metadata/version
\ No newline at end of file
diff --git a/data/libnghttp2-14/make.sh b/data/libnghttp2-14/make.sh
new file mode 100644
index 000000000..d35eab11a
--- /dev/null
+++ b/data/libnghttp2-14/make.sh
@@ -0,0 +1,2 @@
+pkg: mkdir -p /usr/lib
+cp -a "$(PKG_DEST_ _nghttp2)"/usr/lib/lib*.14.dylib "${PKG_DEST}"/usr/lib/
diff --git a/data/libnghttp2-dev/_metadata/_nghttp2.dep b/data/libnghttp2-dev/_metadata/_nghttp2.dep
new file mode 120000
index 000000000..05394e6e2
--- /dev/null
+++ b/data/libnghttp2-dev/_metadata/_nghttp2.dep
@@ -0,0 +1 @@
+../../_nghttp2
\ No newline at end of file
diff --git a/data/libnghttp2-dev/_metadata/conflicts b/data/libnghttp2-dev/_metadata/conflicts
new file mode 100644
index 000000000..b67b7d0b5
--- /dev/null
+++ b/data/libnghttp2-dev/_metadata/conflicts
@@ -0,0 +1 @@
+nghttp2
diff --git a/data/libnghttp2-dev/_metadata/description b/data/libnghttp2-dev/_metadata/description
new file mode 100644
index 000000000..71e2d4e2a
--- /dev/null
+++ b/data/libnghttp2-dev/_metadata/description
@@ -0,0 +1 @@
+library implementing HTTP/2 protocol (development files)
diff --git a/data/libnghttp2-dev/_metadata/homepage b/data/libnghttp2-dev/_metadata/homepage
new file mode 120000
index 000000000..7c356c311
--- /dev/null
+++ b/data/libnghttp2-dev/_metadata/homepage
@@ -0,0 +1 @@
+../../_nghttp2/_metadata/homepage
\ No newline at end of file
diff --git a/data/libnghttp2-dev/_metadata/in.1443.00 b/data/libnghttp2-dev/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/libnghttp2-dev/_metadata/in.1443.00
diff --git a/data/libnghttp2-dev/_metadata/in.550.58 b/data/libnghttp2-dev/_metadata/in.550.58
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/libnghttp2-dev/_metadata/in.550.58
diff --git a/data/libnghttp2-dev/_metadata/license b/data/libnghttp2-dev/_metadata/license
new file mode 120000
index 000000000..7c54fc4d7
--- /dev/null
+++ b/data/libnghttp2-dev/_metadata/license
@@ -0,0 +1 @@
+../../_nghttp2/_metadata/license
\ No newline at end of file
diff --git a/data/libnghttp2-dev/_metadata/maintainer b/data/libnghttp2-dev/_metadata/maintainer
new file mode 120000
index 000000000..151e227c5
--- /dev/null
+++ b/data/libnghttp2-dev/_metadata/maintainer
@@ -0,0 +1 @@
+../../_nghttp2/_metadata/maintainer
\ No newline at end of file
diff --git a/data/libnghttp2-dev/_metadata/priority b/data/libnghttp2-dev/_metadata/priority
new file mode 100644
index 000000000..a6a7b9cd7
--- /dev/null
+++ b/data/libnghttp2-dev/_metadata/priority
@@ -0,0 +1 @@
+standard
diff --git a/data/libnghttp2-dev/_metadata/provides b/data/libnghttp2-dev/_metadata/provides
new file mode 100644
index 000000000..b67b7d0b5
--- /dev/null
+++ b/data/libnghttp2-dev/_metadata/provides
@@ -0,0 +1 @@
+nghttp2
diff --git a/data/libnghttp2-dev/_metadata/replaces b/data/libnghttp2-dev/_metadata/replaces
new file mode 100644
index 000000000..b67b7d0b5
--- /dev/null
+++ b/data/libnghttp2-dev/_metadata/replaces
@@ -0,0 +1 @@
+nghttp2
diff --git a/data/libnghttp2-dev/_metadata/role b/data/libnghttp2-dev/_metadata/role
new file mode 100644
index 000000000..8d0320866
--- /dev/null
+++ b/data/libnghttp2-dev/_metadata/role
@@ -0,0 +1 @@
+developer
diff --git a/data/libnghttp2-dev/_metadata/section b/data/libnghttp2-dev/_metadata/section
new file mode 100644
index 000000000..e0eb96881
--- /dev/null
+++ b/data/libnghttp2-dev/_metadata/section
@@ -0,0 +1 @@
+Development
diff --git a/data/libnghttp2-dev/_metadata/tags b/data/libnghttp2-dev/_metadata/tags
new file mode 100644
index 000000000..a8928cec8
--- /dev/null
+++ b/data/libnghttp2-dev/_metadata/tags
@@ -0,0 +1 @@
+purpose::library
diff --git a/data/libnghttp2-dev/_metadata/version b/data/libnghttp2-dev/_metadata/version
new file mode 120000
index 000000000..200a9df2c
--- /dev/null
+++ b/data/libnghttp2-dev/_metadata/version
@@ -0,0 +1 @@
+../../_nghttp2/_metadata/version
\ No newline at end of file
diff --git a/data/libnghttp2-dev/make.sh b/data/libnghttp2-dev/make.sh
new file mode 100644
index 000000000..30474245a
--- /dev/null
+++ b/data/libnghttp2-dev/make.sh
@@ -0,0 +1,3 @@
+pkg: mkdir -p /usr/lib /usr/include
+cp -a "$(PKG_DEST_ _nghttp2)"/usr/lib/pkgconfig "${PKG_DEST}"/usr/lib/
+cp -a "$(PKG_DEST_ _nghttp2)"/usr/include "${PKG_DEST}"/usr/
diff --git a/data/libnghttp2/_metadata/maintainer b/data/libnghttp2/_metadata/maintainer
deleted file mode 120000
index febca4610..000000000
--- a/data/libnghttp2/_metadata/maintainer
+++ /dev/null
@@ -1 +0,0 @@
-../../_libxml2/_metadata/maintainer
\ No newline at end of file
diff --git a/data/libnghttp2/_metadata/version b/data/libnghttp2/_metadata/version
deleted file mode 100644
index 359c41089..000000000
--- a/data/libnghttp2/_metadata/version
+++ /dev/null
@@ -1 +0,0 @@
-1.32.0
diff --git a/data/libnghttp2/nghttp2-1.32.0.tar.xz b/data/libnghttp2/nghttp2-1.32.0.tar.xz
deleted file mode 100644
index 255ce79e2..000000000
--- a/data/libnghttp2/nghttp2-1.32.0.tar.xz
+++ /dev/null
diff --git a/data/node/_metadata/cares.dep b/data/node/_metadata/cares.dep
deleted file mode 120000
index 4e3a4f848..000000000
--- a/data/node/_metadata/cares.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../cares
\ No newline at end of file
diff --git a/data/node/README b/data/nodejs/README
index 38aae846f..38aae846f 100644
--- a/data/node/README
+++ b/data/nodejs/README
diff --git a/data/node/_metadata/description b/data/nodejs/_metadata/description
index f1d8dad9d..f1d8dad9d 100644
--- a/data/node/_metadata/description
+++ b/data/nodejs/_metadata/description
diff --git a/data/nodejs/_metadata/in.1443.00 b/data/nodejs/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/nodejs/_metadata/in.1443.00
diff --git a/data/nodejs/_metadata/libcares2.dep b/data/nodejs/_metadata/libcares2.dep
new file mode 120000
index 000000000..ac393be22
--- /dev/null
+++ b/data/nodejs/_metadata/libcares2.dep
@@ -0,0 +1 @@
+../../libcares2
\ No newline at end of file
diff --git a/data/nodejs/_metadata/libnghttp2-14.dep b/data/nodejs/_metadata/libnghttp2-14.dep
new file mode 120000
index 000000000..418fa69d7
--- /dev/null
+++ b/data/nodejs/_metadata/libnghttp2-14.dep
@@ -0,0 +1 @@
+../../libnghttp2-14
\ No newline at end of file
diff --git a/data/node/_metadata/libssl1.1.dep b/data/nodejs/_metadata/libssl1.1.dep
index 71bfa9edd..71bfa9edd 120000
--- a/data/node/_metadata/libssl1.1.dep
+++ b/data/nodejs/_metadata/libssl1.1.dep
diff --git a/data/node/_metadata/maintainer b/data/nodejs/_metadata/maintainer
index 0c538aadb..0c538aadb 120000
--- a/data/node/_metadata/maintainer
+++ b/data/nodejs/_metadata/maintainer
diff --git a/data/node/_metadata/name b/data/nodejs/_metadata/name
index 2b6218596..2b6218596 100644
--- a/data/node/_metadata/name
+++ b/data/nodejs/_metadata/name
diff --git a/data/node/_metadata/priority b/data/nodejs/_metadata/priority
index 134d9bc32..134d9bc32 100644
--- a/data/node/_metadata/priority
+++ b/data/nodejs/_metadata/priority
diff --git a/data/node/_metadata/role b/data/nodejs/_metadata/role
index 52b4d7301..52b4d7301 100644
--- a/data/node/_metadata/role
+++ b/data/nodejs/_metadata/role
diff --git a/data/node/_metadata/section b/data/nodejs/_metadata/section
index ddc7f1fd8..ddc7f1fd8 100644
--- a/data/node/_metadata/section
+++ b/data/nodejs/_metadata/section
diff --git a/data/node/_metadata/tags b/data/nodejs/_metadata/tags
index ad5d50831..ad5d50831 100644
--- a/data/node/_metadata/tags
+++ b/data/nodejs/_metadata/tags
diff --git a/data/node/_metadata/version b/data/nodejs/_metadata/version
index 9c028e25d..9c028e25d 100644
--- a/data/node/_metadata/version
+++ b/data/nodejs/_metadata/version
diff --git a/data/node/configure-ios.diff b/data/nodejs/configure-ios.diff
index 053234802..053234802 100644
--- a/data/node/configure-ios.diff
+++ b/data/nodejs/configure-ios.diff
diff --git a/data/node/gyp.diff b/data/nodejs/gyp.diff
index bf41b1113..bf41b1113 100644
--- a/data/node/gyp.diff
+++ b/data/nodejs/gyp.diff
diff --git a/data/node/install.diff.disabled b/data/nodejs/install.diff.disabled
index be725d702..be725d702 100644
--- a/data/node/install.diff.disabled
+++ b/data/nodejs/install.diff.disabled
diff --git a/data/node/jitless.diff b/data/nodejs/jitless.diff
index f5cb3f95b..f5cb3f95b 100644
--- a/data/node/jitless.diff
+++ b/data/nodejs/jitless.diff
diff --git a/data/node/make.sh b/data/nodejs/make.sh
index a7c375eaf..d98e7ef95 100644
--- a/data/node/make.sh
+++ b/data/nodejs/make.sh
@@ -1,7 +1,7 @@
 pkg:setup
 
 export CC="${PKG_TARG}-gcc"
-export CXX="${PKG_TARG}-g++"
+export CXX="${PKG_TARG}-g++ -std=gnu++1y"
 export LD="${PKG_TARG}-ld"
 export AR="${PKG_TARG}-ar"
 export RANLIB="${PKG_TARG}-ranlib"
@@ -12,7 +12,7 @@ export SDKROOT="${PKG_ROOT}"
 export LDFLAGS="-undefined dynamic_lookup"  # libnode needs this- the binary will have the rest of the symbols.
 
 export CC_host="${HOSTCC:-clang}"
-export CXX_host="${HOSTCXX:-clang++}"
+export CXX_host="${HOSTCXX:-clang++} -std=gnu++1y"
 export LINK_host="${CXX_host}"
 export AR_host="${HOSTAR:-ar}"
 
@@ -24,10 +24,12 @@ export LDFLAGS_target="${LDFLAGS}"
 
 GYP_CROSSCOMPILE=1	\
 GYP_DEFINES="v8_enable_inspector=1 target_arch=arm64 v8_target_arch=arm64 host_os=$(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/') node_v8_options='--jitless'"	\
-./configure --prefix="${PKG_TAPF}" --without-snapshot --cross-compiling --dest-os=ios --dest-cpu=arm64 --without-intl --shared-zlib --shared-cares --shared-openssl --shared
+PKG_CONFIG="$(realpath "${PKG_BASE}/util/pkg-config.sh")" \
+./configure --prefix="${PKG_TAPF}" --without-snapshot --cross-compiling --dest-os=ios --dest-cpu=arm64 --without-intl --shared-zlib --shared-cares --shared-openssl --shared-nghttp2 --shared
 
 # Don't use pkg:make, CC_host gets overwritten
-make BUILDTYPE=Release DESTCPU=arm64 install DESTDIR="${PKG_DEST}"
+SDKROOT="" \
+make BUILDTYPE=Release DESTCPU=arm64 install DESTDIR="${PKG_DEST}" -j16
 
 #  TODO: Fix tool/install.py and the Makefile
 if [[ ! -x "${PKG_TAPF}"/bin/node ]]; then
diff --git a/data/node/node-v12.3.1.tar.gz b/data/nodejs/node-v12.3.1.tar.gz
index 7c8799095..7c8799095 100644
--- a/data/node/node-v12.3.1.tar.gz
+++ b/data/nodejs/node-v12.3.1.tar.gz
diff --git a/data/node/v8.diff b/data/nodejs/v8.diff
index aed571fa6..aed571fa6 100644
--- a/data/node/v8.diff
+++ b/data/nodejs/v8.diff
diff --git a/data/node/xcode_emulation.diff b/data/nodejs/xcode_emulation.diff
index 527523dc2..527523dc2 100644
--- a/data/node/xcode_emulation.diff
+++ b/data/nodejs/xcode_emulation.diff