Re: [ptxdist] ncurses 6.3 compile error

2022-11-21 Thread Bruno Thomsen
Hi Christian,

Den man. 21. nov. 2022 kl. 17.09 skrev Christian Melki
:
>
> Hi Bruno,
>
> Did you solve your issue?

I got the configure step working by adding autogen.sh symbolic link to
patch directory.
But then I hit a compile error.

I saw that Fedora[1] carried some patches but did not yet test them in
ptxdist context.
At the moment I just use the old 6.2 version.

/Bruno

[1] https://src.fedoraproject.org/rpms/ncurses/tree/rawhide

>
> For whatever reason, I tripped on the same error.
> Now, I can't follow the reasoning, the behavior, the patches or actually
> anything in the ncurses development. To me it's just a black box of
> strangeness.
>
> Either way. I concluded that for unidentified reasons I needed:
> https://invisible-mirror.net/archives/ncurses/6.3/ncurses-6.3-20211026.patch.gz
> added to the patchset.
>
> Literally the first in the series for 6.3.
>
> Maybe someone more versed can make sense of the discussion here:
> https://lists.gnu.org/archive/html/bug-ncurses/2021-10/msg00040.html
>
> Regards,
> Christian
>
> On 10/30/22 20:47, Christian Melki wrote:
> > On 10/30/22 15:19, Christian Melki wrote:
> >> On 10/30/22 12:08, Bruno Thomsen wrote:
> >>> error: expected a pathname, not ""
> >>
> >> Hmm. That home made horror show of configuration expects
> >> --enable-pc-files if I'm not mistaken. Can that be a clue to something?
> >> But it makes me wonder how on earth this worked in the first place?
> >>
> >> /C
> >>
> >
> >
> > My bad. Ignore that. Somehow missed that the configure line already
> > contained it.
> >
> > /C
> >
>



[ptxdist] [PATCH] libconfuse: Version bump. 3.0 -> 3.3.

2022-11-21 Thread Christian Melki
Almost 6 years since last update.
Bunch of bugfixes, leaks and whatnots.
https://github.com/libconfuse/libconfuse/releases

* Change URL, stands on its own libconfuse github page.
* Change compression format, as we are given choices on the download.

Signed-off-by: Christian Melki 
---
 rules/libconfuse.make | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rules/libconfuse.make b/rules/libconfuse.make
index 93ca3c8f6..bcbf31704 100644
--- a/rules/libconfuse.make
+++ b/rules/libconfuse.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_LIBCONFUSE) += libconfuse
 #
 # Paths and names
 #
-LIBCONFUSE_VERSION := 3.0
-LIBCONFUSE_MD5 := bf03099ef213647451c70e54ad4b6e81
+LIBCONFUSE_VERSION := 3.3
+LIBCONFUSE_MD5 := a183cef2cecdd3783436ff8de500d274
 LIBCONFUSE := confuse-$(LIBCONFUSE_VERSION)
-LIBCONFUSE_SUFFIX  := tar.gz
-LIBCONFUSE_URL := 
https://github.com/martinh/libconfuse/releases/download/v$(LIBCONFUSE_VERSION)/$(LIBCONFUSE).$(LIBCONFUSE_SUFFIX)
+LIBCONFUSE_SUFFIX  := tar.xz
+LIBCONFUSE_URL := 
https://github.com/libconfuse/libconfuse/releases/download/v$(LIBCONFUSE_VERSION)/$(LIBCONFUSE).$(LIBCONFUSE_SUFFIX)
 LIBCONFUSE_SOURCE  := $(SRCDIR)/$(LIBCONFUSE).$(LIBCONFUSE_SUFFIX)
 LIBCONFUSE_DIR := $(BUILDDIR)/$(LIBCONFUSE)
 LIBCONFUSE_LICENSE := ISC
-- 
2.34.1




[ptxdist] [PATCH] host-ninja: Version bump. 1.10.2.g51db2.kitware.jobserver-1 -> 1.11.1.g95dee.kitware.jobserver-1

2022-11-21 Thread Christian Melki
Move along the kitware ninjas. Fork of regular ninja but with jobserver support.
Regular ninja release: 
https://groups.google.com/g/ninja-build/c/R2oCyDctDf8/m/-U94Y5I8AgAJ
https://github.com/ninja-build/ninja/milestone/3?closed=1

* Reapplied patch set to make it apply cleanly.

Signed-off-by: Christian Melki 
---
 .../0001-don-t-close-open-fds.patch   | 4 ++--
 .../series| 0
 rules/host-ninja.make | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename patches/{ninja-1.10.2.g51db2.kitware.jobserver-1 => 
ninja-1.11.1.g95dee.kitware.jobserver-1}/0001-don-t-close-open-fds.patch (91%)
 rename patches/{ninja-1.10.2.g51db2.kitware.jobserver-1 => 
ninja-1.11.1.g95dee.kitware.jobserver-1}/series (100%)

diff --git 
a/patches/ninja-1.10.2.g51db2.kitware.jobserver-1/0001-don-t-close-open-fds.patch
 
b/patches/ninja-1.11.1.g95dee.kitware.jobserver-1/0001-don-t-close-open-fds.patch
similarity index 91%
rename from 
patches/ninja-1.10.2.g51db2.kitware.jobserver-1/0001-don-t-close-open-fds.patch
rename to 
patches/ninja-1.11.1.g95dee.kitware.jobserver-1/0001-don-t-close-open-fds.patch
index a2dfc5b8e..0155a62bb 100644
--- 
a/patches/ninja-1.10.2.g51db2.kitware.jobserver-1/0001-don-t-close-open-fds.patch
+++ 
b/patches/ninja-1.11.1.g95dee.kitware.jobserver-1/0001-don-t-close-open-fds.patch
@@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich 
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure.py b/configure.py
-index 57e1ca3ab369..e49802f4c75b 100755
+index a239b90eef44..1f287c116d66 100755
 --- a/configure.py
 +++ b/configure.py
 @@ -191,7 +191,7 @@ class Bootstrap:
@@ -22,7 +22,7 @@ index 57e1ca3ab369..e49802f4c75b 100755
  except subprocess.CalledProcessError:
  print('when running: ', cmdline)
  raise
-@@ -716,4 +716,4 @@ if options.bootstrap:
+@@ -722,4 +722,4 @@ if options.bootstrap:
  if options.verbose:
  rebuild_args.append('-v')
  
diff --git a/patches/ninja-1.10.2.g51db2.kitware.jobserver-1/series 
b/patches/ninja-1.11.1.g95dee.kitware.jobserver-1/series
similarity index 100%
rename from patches/ninja-1.10.2.g51db2.kitware.jobserver-1/series
rename to patches/ninja-1.11.1.g95dee.kitware.jobserver-1/series
diff --git a/rules/host-ninja.make b/rules/host-ninja.make
index fab8fd2d3..f64230312 100644
--- a/rules/host-ninja.make
+++ b/rules/host-ninja.make
@@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_NINJA) += host-ninja
 #
 # Paths and names
 #
-HOST_NINJA_VERSION := 1.10.2.g51db2.kitware.jobserver-1
-HOST_NINJA_MD5 := 0bdd69f1013deb74465fe5d03e8fa2ea
+HOST_NINJA_VERSION := 1.11.1.g95dee.kitware.jobserver-1
+HOST_NINJA_MD5 := 22de7254869309dc2c750933928b3500
 HOST_NINJA := ninja-$(HOST_NINJA_VERSION)
 HOST_NINJA_SUFFIX  := tar.gz
 HOST_NINJA_URL := 
https://github.com/Kitware/ninja/archive/refs/tags/v$(HOST_NINJA_VERSION).$(HOST_NINJA_SUFFIX)
-- 
2.34.1




[ptxdist] [PATCH] pcre2: Default to atleast an 8-bit library.

2022-11-21 Thread Christian Melki
If nobody selects anything pcre2 refuses to build.
Seems a bit unfriendly. A sane utf-8 would be the minimum,
since unicode is enabled per default in the build.

Set default to 8-bit. Atleast make it build.

Signed-off-by: Christian Melki 
---
 rules/pcre2.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/pcre2.in b/rules/pcre2.in
index f6afe587f..eee635e31 100644
--- a/rules/pcre2.in
+++ b/rules/pcre2.in
@@ -11,6 +11,7 @@ if PCRE2
 config PCRE2_8
bool
prompt "8 bit library"
+   default y
 
 config PCRE2_16
bool
-- 
2.34.1




[ptxdist] [PATCH] mesalib: Version bump 22.2.3 -> 22.2.4.

2022-11-21 Thread Christian Melki
Bugfix release. Minor changes.
https://docs.mesa3d.org/relnotes/22.2.4.html

Signed-off-by: Christian Melki 
---
 rules/mesalib.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/mesalib.make b/rules/mesalib.make
index 933212479..6f845fa34 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
 #
 # Paths and names
 #
-MESALIB_VERSION:= 22.2.3
-MESALIB_MD5:= 06c329323a60f6eb6d4adc0d3971b0f4
+MESALIB_VERSION:= 22.2.4
+MESALIB_MD5:= a258a3d590d76bc1ff89a204f063e3b8
 MESALIB:= mesa-$(MESALIB_VERSION)
 MESALIB_SUFFIX := tar.xz
 MESALIB_URL:= \
-- 
2.34.1




[ptxdist] [PATCH] wayland-protocols: Version bump. 1.28 -> 1.30.

2022-11-21 Thread Christian Melki
Not much happening between releases.
The notable addition is a tearing control protocol.

Signed-off-by: Christian Melki 
---
 rules/wayland-protocols.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/wayland-protocols.make b/rules/wayland-protocols.make
index 2e166bc2c..bef3f9495 100644
--- a/rules/wayland-protocols.make
+++ b/rules/wayland-protocols.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WAYLAND_PROTOCOLS) += wayland-protocols
 #
 # Paths and names
 #
-WAYLAND_PROTOCOLS_VERSION  := 1.28
-WAYLAND_PROTOCOLS_MD5  := 391ac1ac30e96d2f5559e2cc40a4d924
+WAYLAND_PROTOCOLS_VERSION  := 1.30
+WAYLAND_PROTOCOLS_MD5  := 000b0113e7fe73eb2da6dbaf54f8eca3
 WAYLAND_PROTOCOLS  := 
wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION)
 WAYLAND_PROTOCOLS_SUFFIX   := tar.xz
 WAYLAND_PROTOCOLS_URL  := 
https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/$(WAYLAND_PROTOCOLS_VERSION)/downloads/$(WAYLAND_PROTOCOLS).$(WAYLAND_PROTOCOLS_SUFFIX)
-- 
2.34.1




Re: [ptxdist] ncurses 6.3 compile error

2022-11-21 Thread Christian Melki
Hi Bruno,

Did you solve your issue?

For whatever reason, I tripped on the same error.
Now, I can't follow the reasoning, the behavior, the patches or actually
anything in the ncurses development. To me it's just a black box of
strangeness.

Either way. I concluded that for unidentified reasons I needed:
https://invisible-mirror.net/archives/ncurses/6.3/ncurses-6.3-20211026.patch.gz
added to the patchset.

Literally the first in the series for 6.3.

Maybe someone more versed can make sense of the discussion here:
https://lists.gnu.org/archive/html/bug-ncurses/2021-10/msg00040.html

Regards,
Christian

On 10/30/22 20:47, Christian Melki wrote:
> On 10/30/22 15:19, Christian Melki wrote:
>> On 10/30/22 12:08, Bruno Thomsen wrote:
>>> error: expected a pathname, not ""
>>
>> Hmm. That home made horror show of configuration expects
>> --enable-pc-files if I'm not mistaken. Can that be a clue to something?
>> But it makes me wonder how on earth this worked in the first place?
>>
>> /C
>>
> 
> 
> My bad. Ignore that. Somehow missed that the configure line already
> contained it.
> 
> /C
> 




Re: [ptxdist] [PATCH] monit: Add dependency to nsl

2022-11-21 Thread Alexander Dahl
Hello Michael,

Am Fri, Nov 18, 2022 at 12:32:25PM +0100 schrieb Michael Olbrich:
> On Mon, Oct 24, 2022 at 03:01:10PM +0200, Alexander Dahl wrote:
> > Am Montag, 24. Oktober 2022, 14:28:50 CEST schrieb Alexander Dahl:
> > > Am Montag, 24. Oktober 2022, 10:30:35 CEST schrieb Alexander Dahl:
> > > > Console log is flooded with this:
> > > > /usr/bin/monit: error while loading shared libraries: libnsl.so.1:
> > > > cannot open shared object file: No such file or directory
> > > > 
> > > > Output of readelf is this:
> > > > Dynamic section at offset 0xa5a50 contains 35 entries:
> > > >   TagType Name/Value
> > > >  
> > > >  0x0001 (NEEDED) Shared library: 
> > > > [librt.so.1]
> > > >  0x0001 (NEEDED) Shared library: [libm.so.6]
> > > > 
> > > >  0x0001 (NEEDED) Shared library:
> > > > [libpthread.so.0] 0x0001 (NEEDED) Shared 
> > > > library:
> > > > [libcrypt.so.1] 0x0001 (NEEDED) Shared library:
> > > > [libresolv.so.2] 0x0001 (NEEDED) Shared library:
> > > > [libnsl.so.1] 0x0001 (NEEDED) Shared library:
> > > > [libc.so.6] 0x0001 (NEEDED) Shared library:
> > > > [ld-linux-armhf.so.3]
> > > > 
> > > > Console log flooding is gone after setting the option.
> > > > 
> > > > Signed-off-by: Alexander Dahl 
> > > > ---
> > > > 
> > > >  rules/monit.in | 1 +
> > > >  1 file changed, 1 insertion(+)
> > > > 
> > > > diff --git a/rules/monit.in b/rules/monit.in
> > > > index 383433e78..9db337331 100644
> > > > --- a/rules/monit.in
> > > > +++ b/rules/monit.in
> > > > @@ -3,6 +3,7 @@
> > > > 
> > > >  menuconfig MONIT
> > > >  
> > > > tristate
> > > > prompt "monit "
> > > > 
> > > > +   select LIBC_NSL
> > > > 
> > > > select OPENSSL if MONIT_SSL
> > > > select ZLIB if MONIT_ZLIB
> > > > select BUSYBOX_START_STOP_DAEMON if MONIT_STARTSCRIPT
> > > 
> > > Well, this works with OSELAS.Toolchain-2018.02.0/arm-v7a-linux-gnueabihf
> > > which I used up to now in the BSP in question.  However on another BSP 
> > > with
> > > OSELAS.Toolchain-2020.08.0/arm-v7a-linux-gnueabihf I get the following
> > > error:
> > > 
> > >   [74/86] started : glibc.targetinstall
> > >   install_copy_toolchain_lib: libnsl.so not found
> > > 
> > > Both BSPs are still on ptxdist-2021.03.0 … what's the best way to quickly
> > > solve this?  Upgrade to recent ptxdist and toolchain might be possible, 
> > > but
> > > that takes quite some time, and I don't have much for that currently, so 
> > > an
> > > alternative approach would be appreciated. O:-)
> > 
> > Backported commit fd688d2239bc ("glibc: specify the major version number 
> > when 
> > installing most of the libraries") now and builds are successful again with 
> > both toolchains.  Runtime testing will follow, but I'm confident.
> 
> So, libnsl is not actually needed. It's just a broken configure script. If
> you enable PTXCONF_TARGET_LINKER_AS_NEEDED then it will be gone. 

Meanwhile I identified two more packages showing similar problems:
fcgi and log4cplus.  Both check for nsl in their prepare stages, fcgi
with autotools, and log4cplus with CMake.  However I could not tell
from their source or version control, why they do it.  Might be
related to usage of gethostbyname() but I'm not sure if that really
requires libnsl?

If built without PTXCONF_TARGET_LINKER_AS_NEEDED both show -lnsl in
compile stage and dependency to libnsl when inspecting with
`readelf -d`.  Those dependencies are gone when built with
PTXCONF_TARGET_LINKER_AS_NEEDED.  I read [1] and [2] to understand
that linker option and on quick glance it seems like a good idea.  Not
sure if it's safe to enable however or if that could cause unexpected
problems. (I will try, currently runtime testing builds with that
option set.)

> Or add ac_cv_lib_nsl_inet_addr=no to the _CONF_ENV. A patch with
> that should show up im master in the near future.

I backported this to monit in my BSP, and it worked.  Should we do
something similar with fcgi and log4cplus, or is it sufficient to
either enable PTXCONF_GLIBC_NSL or PTXCONF_TARGET_LINKER_AS_NEEDED?

Greets
Alex

[1] https://wiki.gentoo.org/wiki/Project:Quality_Assurance/As-needed
[2] https://www.man7.org/linux/man-pages/man1/ld.1.html



[ptxdist] [PATCH] libinput: version bump 1.21.0 -> 1.22.0

2022-11-21 Thread Philipp Zabel
Signed-off-by: Philipp Zabel 
---
 rules/libinput.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/libinput.make b/rules/libinput.make
index 19c71f3c9611..86071e493515 100644
--- a/rules/libinput.make
+++ b/rules/libinput.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBINPUT) += libinput
 #
 # Paths and names
 #
-LIBINPUT_VERSION   := 1.21.0
-LIBINPUT_MD5   := 3d8f0561b83fafc187bbc2d5bd0fe217
+LIBINPUT_VERSION   := 1.22.0
+LIBINPUT_MD5   := 9affca17377aab2057d91640e3dd635e
 LIBINPUT   := libinput-$(LIBINPUT_VERSION)
 LIBINPUT_SUFFIX:= tar.gz
 LIBINPUT_URL   := 
https://gitlab.freedesktop.org/libinput/libinput/-/archive/$(LIBINPUT_VERSION)/$(LIBINPUT).$(LIBINPUT_SUFFIX)
-- 
2.30.2




[ptxdist] [PATCH] timezone.make: Fix find whine.

2022-11-21 Thread Christian Melki
find: warning: unrecognized escape `\|'

Signed-off-by: Christian Melki 
---
 rules/timezone.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/timezone.make b/rules/timezone.make
index 794e0d61e..00fd3cff6 100644
--- a/rules/timezone.make
+++ b/rules/timezone.make
@@ -88,7 +88,7 @@ $(STATEDIR)/timezone.install:
$(call add_zoneinfo, $$target, $(TIMEZONE_PKGDIR)/usr/share, 
$(PTXDIST_SYSROOT_HOST)/usr); \
done
 # Fix entries in zonetab to match the selected PTXCONF_TIMEZONE_* options.
-   @grep "\($$(find $(TIMEZONE_PKGDIR)/usr/share/zoneinfo -type f -printf 
'%P\|')#\)" \
+   @grep "\($$(find $(TIMEZONE_PKGDIR)/usr/share/zoneinfo -type f -printf 
'%P\\|')#\)"  \
$(PTXDIST_SYSROOT_HOST)/usr/share/zoneinfo/zone1970.tab > \
$(TIMEZONE_PKGDIR)/usr/share/zoneinfo/zone1970.tab
 
-- 
2.34.1