Le Tue, Sep 05, 2023 at 02:59:37PM +0000, Sergey A. Osokin a écrit : > On Tue, Sep 05, 2023 at 04:35:50PM +0200, Landry Breuil wrote: > [...] > > > i get that for you as a maintainer it might be better/consistent, but i > > have to disagree here. What do we gain from having them split ? users > > wanting just a binary without the header/library ? disk space ? the two > > ports would build from the same tarball/distfile anyway. > > > > In addition, a @pkgpath/@conflict would be needed to handle the upgrade > > path. > > > > Landry > > Alright, let's keep it as is and update the lang/njs to v0.8.0, the patch > is attached, thank you.
with the order of includes: -I/usr/local/include -Isrc -Ibuild -I/usr/local/include/libxml2 -I/usr/local/include -Injs that new version fails to build if 0.7.12 happens to be installed. Not a big deal but good to know, and usually should be fixed upstream. i guess patches/patch-external_njs_fs_module_c should be removed, doesnt apply anymore the previous comment in the patch > +++ patches/patch-auto_make 5 Sep 2023 14:57:24 -0000 > @@ -1,23 +1,13 @@ > -should no longer be needed after > -https://github.com/nginx/njs/commit/e9d814a0a8c1857f78fdc85ed1461cb9101ebf4e was a lie ? since we keep the patch and add a new one to patch njs.pc.in ? isnt there a way to make all that patching/subst'ing simpler ? in the end the build does this after auto/make is patched: sed -e "s#@PREFIX@#/usr/local#" -e "s#@VERSION@#0.8.0#" -e "s#@EXTRA_LIBS@#-lm -L/usr/local/lib -Wl,-R/usr/local/lib -lpcre2-8 -lcrypto -L/usr/local/lib -lxml2 -lz#" src/njs.pc.in > build/njs.pc the original unpatched sed was this: $NJS_BUILD_DIR/njs.pc: $NJS_BUILD_DIR/njs_auto_config.h sed -e "s#@PREFIX@#$(pwd)/$NJS_BUILD_DIR#" \\ -e "s#@LIBDIR@#$(pwd)/$NJS_BUILD_DIR#" \\ -e "s#@CFLAGS@#-I$(pwd)/$NJS_BUILD_DIR -I$(pwd)/src#" \\ -e "s#@VERSION@#\$(NJS_VER)#" \\ -e "s#@EXTRA_LIBS@#-lm $NJS_LIBS $NJS_LIB_AUX_LIBS#" \\ src/njs.pc.in > \$@ you remove @CFLAGS@ & @LIBDIR@ from njs.pc.in so at that point.. maybe we could/should remove patch-auto_make too and directly set what we want (${TRUEPREFIX} ?) in the njs.pc.in file ? all this seems.. convoluted to me. Landry
