Re: [PATCH] lang/njs: update to 0.8.2
On Thu, Oct 26, 2023 at 04:38:01PM +0200, Landry Breuil wrote: [...] > > > that doesnt happen when building the nginx njs module which uses > > > '-I /usr/local/include/libxml2 -I /usr/local/include -Isrc -Ibuild -Injs' > > > > > > would be nice :) > > > > I attached a small patch from the lang/njs/patches directory, > > that works for me. So, REVISION for the lang/njs/Makefile needs > > to be bumped to `0'. > > yep, perfect - 0.8.2 now builds while 0.8.1 is installed.. also commited ! Thanks, Landry! I'm going to submit the patch to the upstream. -- Sergey A. Osokin
Re: [PATCH] lang/njs: update to 0.8.2
Le Thu, Oct 26, 2023 at 02:31:09PM +, Sergey A. Osokin a écrit : > On Thu, Oct 26, 2023 at 03:53:07PM +0200, Landry Breuil wrote: > [...] > > > > asking for the second or third time.. would it be possible to fix > > upstream so that it can build itself if the previous version is > > installed ? > > I'm working on that. > > > otherwise it still fails: > > > > src/njs_flathsh.c:166:1: error: no previous prototype for function > > 'njs_flathsh_destroy' [-Werror,-Wmissing-prototypes] > > njs_flathsh_destroy(njs_flathsh_t *fh, njs_flathsh_query_t *fhq) > > > > just because the order of includes is wrong.. '-I/usr/local/include -Isrc > > -Ibuild -I/usr/local/include/libxml2 -I/usr/local/include' > > > > that doesnt happen when building the nginx njs module which uses '-I > > /usr/local/include/libxml2 -I /usr/local/include -Isrc -Ibuild -Injs' > > > > would be nice :) > > I attached a small patch from the lang/njs/patches directory, > that works for me. So, REVISION for the lang/njs/Makefile needs > to be bumped to `0'. yep, perfect - 0.8.2 now builds while 0.8.1 is installed.. also commited !
Re: [PATCH] lang/njs: update to 0.8.2
On Thu, Oct 26, 2023 at 03:53:07PM +0200, Landry Breuil wrote: [...] > > asking for the second or third time.. would it be possible to fix > upstream so that it can build itself if the previous version is > installed ? I'm working on that. > otherwise it still fails: > > src/njs_flathsh.c:166:1: error: no previous prototype for function > 'njs_flathsh_destroy' [-Werror,-Wmissing-prototypes] > njs_flathsh_destroy(njs_flathsh_t *fh, njs_flathsh_query_t *fhq) > > just because the order of includes is wrong.. '-I/usr/local/include -Isrc > -Ibuild -I/usr/local/include/libxml2 -I/usr/local/include' > > that doesnt happen when building the nginx njs module which uses '-I > /usr/local/include/libxml2 -I /usr/local/include -Isrc -Ibuild -Injs' > > would be nice :) I attached a small patch from the lang/njs/patches directory, that works for me. So, REVISION for the lang/njs/Makefile needs to be bumped to `0'. > commited, thanks! Thank you! -- Sergey A. Osokin Index: auto/make --- auto/make.orig +++ auto/make @@ -85,8 +85,9 @@ do cat << END >> $NJS_MAKEFILE $NJS_BUILD_DIR/$njs_obj: $njs_src - \$(NJS_CC) -c \$(NJS_CFLAGS) $NJS_LIB_AUX_CFLAGS \\ + \$(NJS_CC) -c \$(NJS_CFLAGS) \\ \$(NJS_LIB_INCS) -Injs \\ + $NJS_LIB_AUX_CFLAGS \\ -o $NJS_BUILD_DIR/$njs_obj \\ $njs_dep_flags \\ $njs_src
Re: [PATCH] lang/njs: update to 0.8.2
Le Thu, Oct 26, 2023 at 01:38:14PM +, Sergey A. Osokin a écrit : > Hi Landry, > > On Thu, Oct 26, 2023 at 08:51:19AM +0200, Landry Breuil wrote: > > Le Wed, Oct 25, 2023 at 04:47:39PM +, Sergey A. Osokin a écrit : > > > Hi, > > > > > > here's the patch to update lang/njs to the recent version, 0.8.2. > > > Also, the patch provides an update for njs module for www/nginx. > > > > that patch only updates the version in nginx afaict.. > > here we go. asking for the second or third time.. would it be possible to fix upstream so that it can build itself if the previous version is installed ? otherwise it still fails: src/njs_flathsh.c:166:1: error: no previous prototype for function 'njs_flathsh_destroy' [-Werror,-Wmissing-prototypes] njs_flathsh_destroy(njs_flathsh_t *fh, njs_flathsh_query_t *fhq) just because the order of includes is wrong.. '-I/usr/local/include -Isrc -Ibuild -I/usr/local/include/libxml2 -I/usr/local/include' that doesnt happen when building the nginx njs module which uses '-I /usr/local/include/libxml2 -I /usr/local/include -Isrc -Ibuild -Injs' would be nice :) commited, thanks!
Re: [PATCH] lang/njs: update to 0.8.2
Hi Landry,
On Thu, Oct 26, 2023 at 08:51:19AM +0200, Landry Breuil wrote:
> Le Wed, Oct 25, 2023 at 04:47:39PM +, Sergey A. Osokin a écrit :
> > Hi,
> >
> > here's the patch to update lang/njs to the recent version, 0.8.2.
> > Also, the patch provides an update for njs module for www/nginx.
>
> that patch only updates the version in nginx afaict..
here we go.
--
Sergey A. Osokin
Index: lang/njs/Makefile
===
RCS file: /cvs/ports/lang/njs/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- lang/njs/Makefile 18 Sep 2023 13:08:53 - 1.5
+++ lang/njs/Makefile 26 Oct 2023 13:34:48 -
@@ -2,9 +2,7 @@ COMMENT= NGINX JavaScript command line u
GH_ACCOUNT= nginx
GH_PROJECT= njs
-GH_TAGNAME= 0.8.1
-
-REVISION= 0
+GH_TAGNAME= 0.8.2
CATEGORIES= lang www
Index: lang/njs/distinfo
===
RCS file: /cvs/ports/lang/njs/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- lang/njs/distinfo 17 Sep 2023 06:57:46 - 1.3
+++ lang/njs/distinfo 26 Oct 2023 13:34:48 -
@@ -1,2 +1,2 @@
-SHA256 (njs-0.8.1.tar.gz) = BFDZZS08/n3Z+ALW95CjYW4WEu70Rxlc09ql1Ds5WIE=
-SIZE (njs-0.8.1.tar.gz) = 729780
+SHA256 (njs-0.8.2.tar.gz) = bxc4fbjfkLbjOC0oBFWWL/hforGjLZHCzh/Rr1qFTXI=
+SIZE (njs-0.8.2.tar.gz) = 733916
Index: www/nginx/Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.174
diff -u -p -r1.174 Makefile
--- www/nginx/Makefile 5 Oct 2023 09:55:47 - 1.174
+++ www/nginx/Makefile 26 Oct 2023 13:34:56 -
@@ -22,7 +22,7 @@ VERSION= 1.24.0
DISTNAME= nginx-${VERSION}
CATEGORIES= www
-VERSION-njs= 0.8.1
+VERSION-njs= 0.8.2
VERSION-rtmp= 1.2.1
PKGNAME-main= ${DISTNAME}
@@ -43,7 +43,7 @@ PKGNAME-securelink= nginx-securelink-${V
REVISION-main= 0
REVISION-passenger= 1
-REVISION-njs= 0
+REVISION-njs= 1
REVISION-lua= 0
ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
Index: www/nginx/distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.82
diff -u -p -r1.82 distinfo
--- www/nginx/distinfo 17 Sep 2023 06:59:25 - 1.82
+++ www/nginx/distinfo 26 Oct 2023 13:34:56 -
@@ -8,7 +8,7 @@ SHA256 (nginx-rtmp-module-v1.2.1.tar.gz)
SHA256 (ngx_devel_kit-v0.3.0.tar.gz) = iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
SHA256 (ngx_http_geoip2_module-3.3.tar.gz) = QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBOrZzL/eKc=
SHA256 (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz) = ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
-SHA256 (njs-0.8.1.tar.gz) = BFDZZS08/n3Z+ALW95CjYW4WEu70Rxlc09ql1Ds5WIE=
+SHA256 (njs-0.8.2.tar.gz) = bxc4fbjfkLbjOC0oBFWWL/hforGjLZHCzh/Rr1qFTXI=
SIZE (headers-more-nginx-module-v0.34.tar.gz) = 28827
SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
SIZE (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) = 237272
@@ -19,4 +19,4 @@ SIZE (nginx-rtmp-module-v1.2.1.tar.gz) =
SIZE (ngx_devel_kit-v0.3.0.tar.gz) = 66455
SIZE (ngx_http_geoip2_module-3.3.tar.gz) = 8509
SIZE (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz) = 6159
-SIZE (njs-0.8.1.tar.gz) = 729780
+SIZE (njs-0.8.2.tar.gz) = 733916
Re: [PATCH] lang/njs: update to 0.8.2
Le Wed, Oct 25, 2023 at 04:47:39PM +, Sergey A. Osokin a écrit : > Hi, > > here's the patch to update lang/njs to the recent version, 0.8.2. > Also, the patch provides an update for njs module for www/nginx. that patch only updates the version in nginx afaict..
