Skip to content

Commit

Permalink
libinih: use the vendor-supplied package if available (part 2)
Browse files Browse the repository at this point in the history 
As foreshadowed in the earlier commit, small change needed for
the statsd PMDA.

Also package-lists changes for all the platforms where it
appears a vendor-supplied version of libinih.so and <ini.h>
are available.
  • Loading branch information
@kmcdonell
kmcdonell committed Dec 11, 2024
1 parent e398f28 commit df7f552
Show file tree
Hide file tree
Showing 25 changed files with 28 additions and 0 deletions.
1 change: 1 addition & 0 deletions qa/admin/package-lists/ArchLinux++x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ extra/git
core/grep
core/icu
core/iproute2
core/libinih
extra/libmad
core/libsasl
extra/libuv
Expand Down
1 change: 1 addition & 0 deletions qa/admin/package-lists/CentOS+Stream9+x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ git
git-core
grep
httpd
inih-devel
initscripts
iproute
java-latest-openjdk-headless
Expand Down
1 change: 1 addition & 0 deletions qa/admin/package-lists/Debian+10+i686
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ libgl1-mesa-dri
libibmad-dev
libibumad-dev
libicu63
libinih-dev
libjson-perl
liblist-moreutils-perl
liblzma-dev
Expand Down
1 change: 1 addition & 0 deletions qa/admin/package-lists/Debian+10+x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ libgl1-mesa-dri
libibmad-dev
libibumad-dev
libicu63
libinih-dev
libjson-perl
liblist-moreutils-perl
liblzma-dev
Expand Down
1 change: 1 addition & 0 deletions qa/admin/package-lists/Debian+11+i686
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ libgl1-mesa-dri
libibmad-dev
libibumad-dev
libicu67
libinih-dev
libjson-perl
liblist-moreutils-perl
liblzma-dev
Expand Down
1 change: 1 addition & 0 deletions qa/admin/package-lists/Debian+11+x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ libgl1-mesa-dri
libibmad-dev
libibumad-dev
libicu67
libinih-dev
libjson-perl
liblist-moreutils-perl
liblzma-dev
Expand Down
1 change: 1 addition & 0 deletions qa/admin/package-lists/Debian+12+i686
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ libgl1-mesa-dri
libibmad-dev
libibumad-dev
libicu72
libinih-dev
libjson-perl
liblist-moreutils-perl
liblzma-dev
Expand Down
1 change: 1 addition & 0 deletions qa/admin/package-lists/Fedora+39+x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ gfs2-utils
git
git-core
grep
inih-devel
iproute
httpd
initscripts
Expand Down
2 changes: 2 additions & 0 deletions qa/admin/package-lists/Fedora+40+x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ gfs2-utils
git
git-core
grep
inih-devel
iproute
httpd
initscripts
Expand Down Expand Up @@ -139,6 +140,7 @@ sqlite
sqlite-libs
sysstat
systemd-devel
systemtap-devel
systemtap-sdt-devel
time
valgrind
Expand Down
1 change: 1 addition & 0 deletions qa/admin/package-lists/Fedora+41+x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ gfs2-utils
git
git-core
grep
inih-devel
iproute
httpd
initscripts
Expand Down
1 change: 1 addition & 0 deletions qa/admin/package-lists/Fedora+42+x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ gfs2-utils
git
git-core
grep
inih-devel
iproute
httpd
initscripts
Expand Down
1 change: 1 addition & 0 deletions qa/admin/package-lists/FreeBSD+13+amd64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ git
gmake
gtar
icu
inih
jq
kubectl
libuv
Expand Down
1 change: 1 addition & 0 deletions qa/admin/package-lists/FreeBSD+14+i386
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ git
gmake
gtar
icu
inih
jq
kubectl
libuv
Expand Down
1 change: 1 addition & 0 deletions qa/admin/package-lists/MX+23.2+x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ libgl1-mesa-dri
libibmad-dev
libibumad-dev
libicu72
libinih-dev
libjson-perl
liblist-moreutils-perl
liblzma-dev
Expand Down
1 change: 1 addition & 0 deletions qa/admin/package-lists/MX+23.3+x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ libgl1-mesa-dri
libibmad-dev
libibumad-dev
libicu72
libinih-dev
libjson-perl
liblist-moreutils-perl
liblzma-dev
Expand Down
1 change: 1 addition & 0 deletions qa/admin/package-lists/MX+23.4+x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ libgl1-mesa-dri
libibmad-dev
libibumad-dev
libicu72
libinih-dev
libjson-perl
liblist-moreutils-perl
liblzma-dev
Expand Down
1 change: 1 addition & 0 deletions qa/admin/package-lists/RHEL+8+x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ gfs2-utils
git
git-core
grep
inih-devel
iproute
httpd
initscripts
Expand Down
1 change: 1 addition & 0 deletions qa/admin/package-lists/RHEL+9+x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ gfs2-utils
git
git-core
grep
inih-devel
iproute
httpd
initscripts
Expand Down
1 change: 1 addition & 0 deletions qa/admin/package-lists/Ubuntu+18.04+i686
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ libgl1-mesa-dri
libibmad-dev
libibumad-dev
libicu60
libinih-dev
libjson-perl
liblist-moreutils-perl
liblzma-dev
Expand Down
1 change: 1 addition & 0 deletions qa/admin/package-lists/Ubuntu+18.04+x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ libgl1-mesa-dri
libibmad-dev
libibumad-dev
libicu60
libinih-dev
libjson-perl
liblist-moreutils-perl
liblzma-dev
Expand Down
1 change: 1 addition & 0 deletions qa/admin/package-lists/Ubuntu+20.04+x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ libgl1-mesa-dri
libibmad-dev
libibumad-dev
libicu66
libinih-dev
libjson-perl
liblist-moreutils-perl
liblzma-dev
Expand Down
1 change: 1 addition & 0 deletions qa/admin/package-lists/Ubuntu+22.04+x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ libgl1-mesa-dri
libibmad-dev
libibumad-dev
libicu70
libinih-dev
libjson-perl
liblist-moreutils-perl
liblzma-dev
Expand Down
1 change: 1 addition & 0 deletions qa/admin/package-lists/openSUSE+15.5+x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ libavahi-devel
libbpf-devel
libcmocka-devel
libicu-devel
libinih-devel
libopenssl-devel
libpfm-devel
libqt5-qtbase-devel
Expand Down
1 change: 1 addition & 0 deletions qa/admin/package-lists/openSUSE+15.6+x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ libbpf-devel
libcmocka-devel
libdrm-devel
libicu-devel
libinih-devel
libopenssl-devel
libpfm-devel
libqt5-qtbase-devel
Expand Down
3 changes: 3 additions & 0 deletions src/pmdas/statsd/src/GNUmakefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ HFILES = $(shell echo *.h)
LLDLIBS = $(LIB_FOR_HDR_HISTOGRAM) $(LIB_FOR_CHAN)
LLDLIBS += $(LIB_FOR_PTHREADS) $(LIB_FOR_MATH)
LLDLIBS += $(PCP_WEBLIB)
ifeq "$(HAVE_LIBINIH)" "true"
LLDLIBS += $(LIB_FOR_INIH)
endif
LCFLAGS = $(INVISIBILITY)
#LCFLAGS += -Wextra -MMD -MP
LDIRT = domain.h *.log $(RFILES)
Expand Down

0 comments on commit df7f552

Please sign in to comment.