pkgconf: bump to 1.5.3, change upstream
PATCH 1/1 pkgconf: bump to 1.5.3, change upstream
The pkgconf project now has a website at pkgconf.org, and hosts its tarballs at https://distfiles.dereferenced.org/pkgconf/, so this commit updates the upstream location, and uses the xz-compressed tarball as well.
pkgconf is bumped to 1.5.3. What prompted this update is the fact that GStreamer uses the --define-prefix option when calling pkg-config, and this option didn't exist in pkgconf 0.9.2.
The patch 0001-Fix-all-variables-sysroot-prefix-problem.patch is dropped, because pkgconf now behaves properly, by prefixing all paths with the sysroot. This has been verified by testing libdir and includedir in zlib.pc, and adding some dummy pkgdatadir, mapdir and sdkdir variables:
$ cat staging/usr/lib/pkgconfig/zlib.pc
prefix=/usr
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
sharedlibdir=${libdir}
includedir=${prefix}/include
pkgdatadir=${prefix}/pouet
mapdir=${prefix}/this/is/map/dir
sdkdir=${prefix}/this/is/sdk/dir
[...]$ ./host/bin/pkg-config --variable=libdir zlib ./host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib $ ./host/bin/pkg-config --variable=includedir zlib ./host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include $ ./host/bin/pkg-config --variable=mapdir zlib ./host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/this/is/map/dir $ ./host/bin/pkg-config --variable=sdkdir zlib ./host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/this/is/sdk/dir $ ./host/bin/pkg-config --variable=pkgdatadir zlib ./host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/pouet
So, the 0001-Fix-all-variables-sysroot-prefix-problem patch is no longer necessary.
---
Of course, updating pkgconf has the potential of breaking lots of things, that's why I would suggest to update early in the development cycle, to leave us enough time to resolve issues.
--- ...-Fix-all-variables-sysroot-prefix-problem.patch | 64 ---------------------- package/pkgconf/Config.in | 2 +- package/pkgconf/pkgconf.hash | 2 +- package/pkgconf/pkgconf.mk | 6 +- 4 files changed, 5 insertions(+), 69 deletions(-) delete mode 100644 package/pkgconf/0001-Fix-all-variables-sysroot-prefix-problem.patch
package/pkgconf/0001-Fix-all-variables-sysroot-prefix-problem.patch deleted +0 -64
@@ -1,64 +0,0 @@ -From aa6bbc09e68426592faf722630fe92b6ede75bc8 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias <[email protected]> -Date: Mon, 2 Nov 2015 18:38:00 -0300 -Subject: [PATCH] Fix all-variables sysroot prefix problem - -According to the pkg-config specifications (or rather documentation) -only the -L/-I directory entries should be sysroot-prefixed. - -We also need to prefix the mapdir/sdkdir variables since they're used by -xorg and expected that way. - -Also allow prefixing for includedir and libdir since in some silly cases -the directories may be requested barebones via pkg-config ---variable=includedir libfool for example. - -Signed-off-by: Gustavo Zacarias <[email protected]> - -Added pkgdatadir to the list of to-be-prefixed variables. - -Signed-off-by: Bernd Kuhls <[email protected]> ---- - main.c | 19 ++++++++++++++----- - 1 file changed, 14 insertions(+), 5 deletions(-) - -diff --git a/main.c b/main.c -index 6947126..ce5e18f 100644 ---- a/main.c -+++ b/main.c -@@ -313,9 +313,13 @@ print_variable(pkg_t *pkg, void *data, unsigned int flags) - memset(req->buf, 0, sizeof(req->buf)); - - if (*var == '/' && (flags & PKGF_MUNGE_SYSROOT_PREFIX) && -- (sysroot_dir != NULL && strncmp(var, sysroot_dir, strlen(sysroot_dir)))) -- strlcat(req->buf, sysroot_dir, sizeof(req->buf)); -- -+ (sysroot_dir != NULL && strncmp(var, sysroot_dir, strlen(sysroot_dir))) && -+ (!strcmp(req->variable, "includedir") || \ -+ !strcmp(req->variable, "libdir") || \ -+ !strcmp(req->variable, "mapdir") || \ -+ !strcmp(req->variable, "pkgdatadir") || \ -+ !strcmp(req->variable, "sdkdir"))) -+ strlcat(req->buf, sysroot_dir, sizeof(req->buf)); - strlcat(req->buf, var, sizeof(req->buf)); - return; - } -@@ -323,8 +327,13 @@ print_variable(pkg_t *pkg, void *data, unsigned int flags) - strlcat(req->buf, " ", sizeof(req->buf)); - - if (*var == '/' && (flags & PKGF_MUNGE_SYSROOT_PREFIX) && -- (sysroot_dir != NULL && strncmp(var, sysroot_dir, strlen(sysroot_dir)))) -- strlcat(req->buf, sysroot_dir, sizeof(req->buf)); -+ (sysroot_dir != NULL && strncmp(var, sysroot_dir, strlen(sysroot_dir))) && -+ (!strcmp(req->variable, "includedir") || \ -+ !strcmp(req->variable, "libdir") || \ -+ !strcmp(req->variable, "mapdir") || \ -+ !strcmp(req->variable, "pkgdatadir") || \ -+ !strcmp(req->variable, "sdkdir"))) -+ strlcat(req->buf, sysroot_dir, sizeof(req->buf)); - - strlcat(req->buf, var, sizeof(req->buf)); - } --- -2.4.10 -
package/pkgconf/Config.in +1 -1
@@ -7,4 +7,4 @@ config BR2_PACKAGE_PKGCONF 2011 to replace pkg-config, which now needs itself to build itself - https://github.com/pkgconf/pkgconf + http://pkgconf.org/
package/pkgconf/pkgconf.hash +1 -1
@@ -1,2 +1,2 @@ # Locally calculated -sha256 7ec8b516e655e247f4ba976837cee808134785819ab8f538f652fe919cc6c09f pkgconf-0.9.12.tar.bz2 +sha256 d3468308553c94389dadfd10c4d1067269052b5364276a9d24a643c88485f715 pkgconf-1.5.3.tar.xz
package/pkgconf/pkgconf.mk +3 -3
@@ -4,9 +4,9 @@ # ################################################################################ -PKGCONF_VERSION = 0.9.12 -PKGCONF_SITE = https://github.com/pkgconf/pkgconf/releases/download/pkgconf-$(PKGCONF_VERSION) -PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.bz2 +PKGCONF_VERSION = 1.5.3 +PKGCONF_SITE = https://distfiles.dereferenced.org/pkgconf/ +PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.xz PKGCONF_LICENSE = pkgconf license PKGCONF_LICENSE_FILES = COPYING
Signature · 1 line
2.14.4
PATCH 1/1 pkgconf: bump to 1.5.3, change upstream
On 2018-09-08 22:05 +0200, Thomas Petazzoni spake thusly:
Quoted 1 line
pkgconf is bumped to 1.5.3.
[--SNIP--]
[--SNIP--]
Quoted 5 lines
Signed-off-by Thomas Petazzoni <[email protected]>---
Of course, updating pkgconf has the potential of breaking lots of things, that's why I would suggest to update early in the development cycle, to leave us enough time to resolve issues.
What's more, it does fix all the build failures seen with the (short-lived) bump of libglib2.
I've done a pre tty big build with a random set of packages (15%), plus I explicitly enabled qt5 and a few qt5 packages, plus libglib2 and a few glib-based packages (those that were failign on the autobuilders: atk, dbus-glib...) and the build was succesful, so:
Regards,
Yann E. MORIN.
Signature · 255 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' -------------- next part -------------- BR2_arm=y BR2_cortex_a7=y BR2_TOOLCHAIN_EXTERNAL=y BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y BR2_PACKAGE_DVDAUTHOR=y BR2_PACKAGE_ESPEAK=y BR2_PACKAGE_MOTION=y BR2_PACKAGE_MULTICAT=y BR2_PACKAGE_UPMPDCLI=y BR2_PACKAGE_LZOP=y BR2_PACKAGE_P7ZIP=y BR2_PACKAGE_LSOF=y BR2_PACKAGE_LTP_TESTSUITE=y BR2_PACKAGE_NMON=y BR2_PACKAGE_RAMSPEED=y BR2_PACKAGE_BINUTILS=y BR2_PACKAGE_DOS2UNIX=y BR2_PACKAGE_GIT=y BR2_PACKAGE_LIBTOOL=y # BR2_PACKAGE_E2FSPROGS_FSCK is not set BR2_PACKAGE_E2FSPROGS_FUSE2FS=y BR2_PACKAGE_E2TOOLS=y BR2_PACKAGE_GENROMFS=y BR2_PACKAGE_IMX_USB_LOADER=y BR2_PACKAGE_NTFS_3G=y BR2_PACKAGE_BITSTREAM_VERA=y BR2_PACKAGE_INCONSOLATA=y BR2_PACKAGE_FB_TEST_APP=y BR2_PACKAGE_FBV=y # BR2_PACKAGE_FBV_PNG is not set # BR2_PACKAGE_FBV_JPEG is not set # BR2_PACKAGE_FBV_GIF is not set BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_OCRAD=y BR2_PACKAGE_PSPLASH=y BR2_PACKAGE_SDL=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5BASE_OPENGL_LIB=y BR2_PACKAGE_QT5BASE_FONTCONFIG=y BR2_PACKAGE_QT5BASE_HARFBUZZ=y BR2_PACKAGE_QT5BASE_GIF=y BR2_PACKAGE_QT5BASE_JPEG=y BR2_PACKAGE_QT5BASE_PNG=y BR2_PACKAGE_QT5CONNECTIVITY=y BR2_PACKAGE_QT5DECLARATIVE=y BR2_PACKAGE_QT5DECLARATIVE_QUICK=y BR2_PACKAGE_WILC1000_FIRMWARE=y BR2_PACKAGE_ZD1211_FIRMWARE=y BR2_PACKAGE_AER_INJECT=y BR2_PACKAGE_DBUS_GLIB=y BR2_PACKAGE_DEVMEM2=y BR2_PACKAGE_DVB_APPS=y BR2_PACKAGE_FXLOAD=y BR2_PACKAGE_GPTFDISK=y BR2_PACKAGE_IPMITOOL=y BR2_PACKAGE_IPMITOOL_USB=y BR2_PACKAGE_KBD=y BR2_PACKAGE_LIRC_TOOLS=y BR2_PACKAGE_LUKSMETA=y # BR2_PACKAGE_LVM2_STANDARD_INSTALL is not set BR2_PACKAGE_MEMTOOL=y BR2_PACKAGE_POWERTOP=y BR2_PACKAGE_SIGROK_CLI=y BR2_PACKAGE_SYSSTAT=y BR2_PACKAGE_W_SCAN=y BR2_PACKAGE_GAUCHE=y BR2_PACKAGE_TCL=y # BR2_PACKAGE_TCL_DEL_ENCODINGS is not set BR2_PACKAGE_TCLLIB=y # BR2_PACKAGE_ALSA_LIB_ALOAD is not set # BR2_PACKAGE_ALSA_LIB_RAWMIDI is not set # BR2_PACKAGE_ALSA_LIB_HWDEP is not set # BR2_PACKAGE_ALSA_LIB_SEQ is not set # BR2_PACKAGE_ALSA_LIB_ALISP is not set # BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS is not set BR2_PACKAGE_AUBIO=y BR2_PACKAGE_LIBBROADVOICE=y BR2_PACKAGE_LIBSOXR=y BR2_PACKAGE_SPANDSP=y BR2_PACKAGE_VO_AACENC=y BR2_PACKAGE_LIBARCHIVE=y BR2_PACKAGE_LIBARCHIVE_BSDTAR=y BR2_PACKAGE_LIBSQUISH=y BR2_PACKAGE_BEECRYPT=y BR2_PACKAGE_LIBMHASH=y BR2_PACKAGE_TPM2_TSS=y BR2_PACKAGE_BERKELEYDB=y BR2_PACKAGE_KOMPEXSQLITE=y BR2_PACKAGE_LIBGIT2=y BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA=y BR2_PACKAGE_LIBNFS=y BR2_PACKAGE_ATK=y BR2_PACKAGE_CAIRO_TEE=y BR2_PACKAGE_CAIROMM=y BR2_PACKAGE_GDK_PIXBUF=y BR2_PACKAGE_LIBMEDIAART=y BR2_PACKAGE_LIBSVG=y BR2_PACKAGE_POPPLER=y # BR2_PACKAGE_TIFF_CCITT is not set # BR2_PACKAGE_TIFF_PACKBITS is not set # BR2_PACKAGE_TIFF_LZW is not set # BR2_PACKAGE_TIFF_NEXT is not set # BR2_PACKAGE_TIFF_LOGLUV is not set # BR2_PACKAGE_TIFF_MDI is not set # BR2_PACKAGE_TIFF_ZLIB is not set # BR2_PACKAGE_TIFF_PIXARLOG is not set # BR2_PACKAGE_TIFF_JPEG is not set # BR2_PACKAGE_TIFF_OLD_JPEG is not set # BR2_PACKAGE_TIFF_JBIG is not set BR2_PACKAGE_LIBCEC=y BR2_PACKAGE_LIBFREEFARE=y BR2_PACKAGE_LIBFTDI=y BR2_PACKAGE_LIBIIO=y # BR2_PACKAGE_LIBIIO_LOCAL_BACKEND is not set # BR2_PACKAGE_LIBIIO_NETWORK_BACKEND is not set # BR2_PACKAGE_LIBIIO_USB_BACKEND is not set # BR2_PACKAGE_LIBIIO_IIOD is not set BR2_PACKAGE_LIBIQRF=y BR2_PACKAGE_LIBLLCP=y BR2_PACKAGE_PCSC_LITE=y BR2_PACKAGE_JSON_JAVASCRIPT=y BR2_PACKAGE_JSON_FOR_MODERN_CPP=y BR2_PACKAGE_RAPIDJSON=y BR2_PACKAGE_TINYXML2=y BR2_PACKAGE_VALIJSON=y BR2_PACKAGE_YAML_CPP=y BR2_PACKAGE_LIBMATROSKA=y BR2_PACKAGE_LIBMMS=y BR2_PACKAGE_LIBMPEG2=y BR2_PACKAGE_LIBTHEORA=y BR2_PACKAGE_X264=y BR2_PACKAGE_X265=y BR2_PACKAGE_CPPZMQ=y BR2_PACKAGE_FILEMQ=y BR2_PACKAGE_LIBCGICC=y BR2_PACKAGE_LIBCOAP=y BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBDNET=y BR2_PACKAGE_LIBGSASL=y BR2_PACKAGE_LIBHTTPPARSER=y BR2_PACKAGE_LIBLDNS=y BR2_PACKAGE_LIBNET=y BR2_PACKAGE_LIBNETFILTER_ACCT=y BR2_PACKAGE_LIBNETFILTER_QUEUE=y BR2_PACKAGE_LIBNFTNL=y BR2_PACKAGE_LIBSHAIRPLAY=y BR2_PACKAGE_MONGOOSE=y BR2_PACKAGE_NSS_MYHOSTNAME=y BR2_PACKAGE_PAHO_MQTT_C=y BR2_PACKAGE_BDWGC=y BR2_PACKAGE_BOOST_EXCEPTION=y BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y BR2_PACKAGE_BOOST_STACKTRACE=y BR2_PACKAGE_BOOST_TEST=y BR2_PACKAGE_CLAPACK=y BR2_PACKAGE_CMOCKA=y BR2_PACKAGE_CPPCMS=y BR2_PACKAGE_ELL=y BR2_PACKAGE_FFTW=y BR2_PACKAGE_FFTW_FAST=y BR2_PACKAGE_GTEST=y BR2_PACKAGE_LIBPLIST=y BR2_PACKAGE_LIBURCU=y BR2_PACKAGE_LIQUID_DSP=y BR2_PACKAGE_MPIR=y BR2_PACKAGE_ORC=y BR2_PACKAGE_PROTOBUF=y BR2_PACKAGE_SAFECLIB=y BR2_PACKAGE_ENCHANT=y BR2_PACKAGE_LIBUNISTRING=y BR2_PACKAGE_NEWT=y BR2_PACKAGE_READLINE=y BR2_PACKAGE_DOVECOT=y BR2_PACKAGE_DOVECOT_SQLITE=y BR2_PACKAGE_FETCHMAIL=y BR2_PACKAGE_AESPIPE=y BR2_PACKAGE_XUTIL_UTIL_MACROS=y BR2_PACKAGE_ASTERISK=y # BR2_PACKAGE_AVAHI_AUTOIPD is not set BR2_PACKAGE_BCUSDK=y BR2_PACKAGE_BLUEZ_UTILS=y BR2_PACKAGE_BLUEZ_UTILS_COMPAT=y BR2_PACKAGE_BOINC=y BR2_PACKAGE_CAN_UTILS=y BR2_PACKAGE_CIVETWEB=y BR2_PACKAGE_CORKSCREW=y BR2_PACKAGE_IFENSLAVE=y BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IW=y BR2_PACKAGE_MACCHANGER=y BR2_PACKAGE_MINISSDPD=y BR2_PACKAGE_NETSTAT_NAT=y BR2_PACKAGE_PIMD=y # BR2_PACKAGE_PPPD_OVERWRITE_RESOLV_CONF is not set BR2_PACKAGE_PPTP_LINUX=y BR2_PACKAGE_PRIVOXY=y BR2_PACKAGE_PURE_FTPD=y BR2_PACKAGE_PURE_FTPD_QUOTAS=y BR2_PACKAGE_RP_PPPOE=y BR2_PACKAGE_S6_DNS=y BR2_PACKAGE_SER2NET=y BR2_PACKAGE_SHAIRPORT_SYNC=y BR2_PACKAGE_SMCROUTE=y BR2_PACKAGE_SPAWN_FCGI=y BR2_PACKAGE_SPICE_PROTOCOL=y BR2_PACKAGE_TCPDUMP=y BR2_PACKAGE_TCPDUMP_SMB=y BR2_PACKAGE_TINYHTTPD=y BR2_PACKAGE_VSFTPD=y BR2_PACKAGE_WAVEMON=y BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WPA_SUPPLICANT=y # BR2_PACKAGE_WPA_SUPPLICANT_NL80211 is not set BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD=y BR2_PACKAGE_WPAN_TOOLS=y BR2_PACKAGE_REFPOLICY=y BR2_PACKAGE_CCRYPT=y BR2_PACKAGE_GNUPG_GPGSPLIT=y BR2_PACKAGE_ACL=y BR2_PACKAGE_DOCKER_PROXY=y BR2_PACKAGE_IPRUTILS=y BR2_PACKAGE_LIBOSTREE=y BR2_PACKAGE_PROCRANK_LINUX=y BR2_PACKAGE_QUOTATOOL=y BR2_PACKAGE_RUNC=y BR2_PACKAGE_SCRUB=y BR2_PACKAGE_START_STOP_DAEMON=y BR2_PACKAGE_TAR=y BR2_PACKAGE_UTIL_LINUX_IPCRM=y BR2_PACKAGE_UTIL_LINUX_LOSETUP=y BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT=y BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y BR2_PACKAGE_UTIL_LINUX_NSENTER=y BR2_PACKAGE_UTIL_LINUX_SETTERM=y BR2_PACKAGE_UTIL_LINUX_SU=y BR2_PACKAGE_UTIL_LINUX_WDCTL=y BR2_PACKAGE_ED=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_FWUP=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_JQ=y BR2_PACKAGE_HOST_MXSLDR=y BR2_PACKAGE_HOST_OPKG_UTILS=y BR2_PACKAGE_HOST_SUNXI_TOOLS=y BR2_PACKAGE_HOST_TI_CGT_PRU=y
Thomas Petazzoni
AppliedPATCH 1/1 pkgconf: bump to 1.5.3, change upstream
In reply to Thomas PetazzoniHello,
Quoted 45 lines · Thomas Petazzoni
The pkgconf project now has a website at pkgconf.org, and hosts its tarballs at https://distfiles.dereferenced.org/pkgconf/, so this commit updates the upstream location, and uses the xz-compressed tarball as well.
pkgconf is bumped to 1.5.3. What prompted this update is the fact that GStreamer uses the --define-prefix option when calling pkg-config, and this option didn't exist in pkgconf 0.9.2.
The patch 0001-Fix-all-variables-sysroot-prefix-problem.patch is dropped, because pkgconf now behaves properly, by prefixing all paths with the sysroot. This has been verified by testing libdir and includedir in zlib.pc, and adding some dummy pkgdatadir, mapdir and sdkdir variables:
$ cat staging/usr/lib/pkgconfig/zlib.pc prefix=/usr exec_prefix=${prefix} libdir=${exec_prefix}/lib sharedlibdir=${libdir} includedir=${prefix}/include pkgdatadir=${prefix}/pouet mapdir=${prefix}/this/is/map/dir sdkdir=${prefix}/this/is/sdk/dir [...]$ ./host/bin/pkg-config --variable=libdir zlib ./host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib $ ./host/bin/pkg-config --variable=includedir zlib ./host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include $ ./host/bin/pkg-config --variable=mapdir zlib ./host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/this/is/map/dir $ ./host/bin/pkg-config --variable=sdkdir zlib ./host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/this/is/sdk/dir $ ./host/bin/pkg-config --variable=pkgdatadir zlib ./host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/pouetSo, the 0001-Fix-all-variables-sysroot-prefix-problem patch is no longer necessary.
Signed-off-by Thomas Petazzoni <[email protected]>---
Of course, updating pkgconf has the potential of breaking lots of things, that's why I would suggest to update early in the development cycle, to leave us enough time to resolve issues.
Quoted 7 lines
--- ...-Fix-all-variables-sysroot-prefix-problem.patch | 64 ---------------------- package/pkgconf/Config.in | 2 +- package/pkgconf/pkgconf.hash | 2 +- package/pkgconf/pkgconf.mk | 6 +- 4 files changed, 5 insertions(+), 69 deletions(-) delete mode 100644 package/pkgconf/0001-Fix-all-variables-sysroot-prefix-problem.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 pkgconf: bump to 1.5.3, change upstream
In reply to Thomas PetazzoniAm Sat, 08 Sep 2018 22:05:07 +0200 schrieb Thomas Petazzoni:
Quoted 3 lines
Of course, updating pkgconf has the potential of breaking lots of things, that's why I would suggest to update early in the development cycle, to leave us enough time to resolve issues.
Hi,
libxcb got broken due to this bump:
http://autobuild.buildroot.net/?reason=libxcb-1.13
Libxcb configure checks for the variable xcbincludedir of the xcb-proto package during configure:
https://cgit.freedesktop.org/xcb/libxcb/tree/configure.ac#n75
This results in
$ /home/bernd/buildroot/br8_ffmpeg3_kodi17_github/output/host/bin/pkg- config --variable=xcbincludedir xcb-proto
/home/bernd/buildroot/br8_ffmpeg3_kodi17_github/output/host/x86_64- buildroot-linux-uclibc/sysroot/home/bernd/buildroot/ br8_ffmpeg3_kodi17_github/output/host/bin/../x86_64-buildroot-linux- uclibc/sysroot/usr/share/xcb
Please note that "/home/bernd/buildroot/..." is present twice in the pkgconfig result.
There seems to be an attempt to fix the problem
https://patchwork.freedesktop.org/patch/179233/
but it makes things even worse:
checking XCBPROTO_XCBINCLUDEDIR... /home/bernd/buildroot/ br8_ffmpeg3_kodi17_github/output/host/x86_64-buildroot-linux-uclibc/ sysroot/home/bernd/buildroot/br8_ffmpeg3_kodi17_github/output/host/bin/../ x86_64-buildroot-linux-uclibc/sysroot/home/bernd/buildroot/ br8_ffmpeg3_kodi17_github/output/host/bin/../x86_64-buildroot-linux- uclibc/sysroot/usr/share/xcb
checking XCBPROTO_XCBPYTHONDIR... /home/bernd/buildroot/ br8_ffmpeg3_kodi17_github/output/host/x86_64-buildroot-linux-uclibc/ sysroot/home/bernd/buildroot/br8_ffmpeg3_kodi17_github/output/host/bin/../ x86_64-buildroot-linux-uclibc/sysroot/home/bernd/buildroot/ br8_ffmpeg3_kodi17_github/output/host/bin/../x86_64-buildroot-linux- uclibc/sysroot/usr/lib/python2.7/site-packages
Now "/home/bernd/buildroot/..." is present three times...
Regards, Bernd
PATCH 1/1 pkgconf: bump to 1.5.3, change upstream
Bernd, All,
On 2018-12-09 19:31 +0100, Bernd Kuhls spake thusly:
Quoted 20 lines
Am Sat, 08 Sep 2018 22:05:07 +0200 schrieb Thomas Petazzoni:
Quoted 3 lines
Of course, updating pkgconf has the potential of breaking lots of things, that's why I would suggest to update early in the development cycle, to leave us enough time to resolve issues.
Hi,
libxcb got broken due to this bump:
http://autobuild.buildroot.net/?reason=libxcb-1.13Libxcb configure checks for the variable xcbincludedir of the xcb-proto package during configure:
https://cgit.freedesktop.org/xcb/libxcb/tree/configure.ac#n75This results in
$ /home/bernd/buildroot/br8_ffmpeg3_kodi17_github/output/host/bin/pkg- config --variable=xcbincludedir xcb-proto
Quoted 7 lines
/home/bernd/buildroot/br8_ffmpeg3_kodi17_github/output/host/x86_64-buildroot-linux-uclibc/sysroot/home/bernd/buildroot/ br8_ffmpeg3_kodi17_github/output/host/bin/../x86_64-buildroot-linux- uclibc/sysroot/usr/share/xcbPlease note that "
/home/bernd/buildroot/..." is present twice in the pkgconfig result.
Have you noticed that it is us that are adding the sysroot to the xcb-proto.pc file:
https://git.buildroot.org/buildroot/tree/package/x11r7/xcb-proto/xcb-proto.mk#n18
and thus maybe we need to dfrop this tweak now that pkgconf does it for us?
Regards,
Yann E. MORIN.
Quoted 25 lines
There seems to be an attempt to fix the problem
https://patchwork.freedesktop.org/patch/179233/
but it makes things even worse:checking
XCBPROTO_XCBINCLUDEDIR.../home/bernd/buildroot/br8_ffmpeg3_kodi17_github/output/host/x86_64-buildroot-linux-uclibc/ sysroot/home/bernd/buildroot/br8_ffmpeg3_kodi17_github/output/host/bin/../ x86_64-buildroot-linux-uclibc/sysroot/home/bernd/buildroot/ br8_ffmpeg3_kodi17_github/output/host/bin/../x86_64-buildroot-linux- uclibc/sysroot/usr/share/xcb
checkingXCBPROTO_XCBPYTHONDIR.../home/bernd/buildroot/br8_ffmpeg3_kodi17_github/output/host/x86_64-buildroot-linux-uclibc/ sysroot/home/bernd/buildroot/br8_ffmpeg3_kodi17_github/output/host/bin/../ x86_64-buildroot-linux-uclibc/sysroot/home/bernd/buildroot/ br8_ffmpeg3_kodi17_github/output/host/bin/../x86_64-buildroot-linux- uclibc/sysroot/usr/lib/python2.7/site-packagesNow "
/home/bernd/buildroot/..." is present three times...Regards, Bernd
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 pkgconf: bump to 1.5.3, change upstream
Bernd, All,
(Damn, I was not finished typing my mail, I was to quick at sending it... Sorry for the noise...)
On 2018-12-09 20:59 +0100, Yann E. MORIN spake thusly:
Quoted 25 lines
On 2018-12-09 19:31 +0100, Bernd Kuhls spake thusly:
Quoted 16 lines
Am Sat, 08 Sep 2018 22:05:07 +0200 schrieb Thomas Petazzoni:
Quoted 3 lines
Of course, updating pkgconf has the potential of breaking lots of things, that's why I would suggest to update early in the development cycle, to leave us enough time to resolve issues.
libxcb got broken due to this bump:
http://autobuild.buildroot.net/?reason=libxcb-1.13Libxcb configure checks for the variable xcbincludedir of the xcb-proto package during configure:
https://cgit.freedesktop.org/xcb/libxcb/tree/configure.ac#n75This results in
$ /home/bernd/buildroot/br8_ffmpeg3_kodi17_github/output/host/bin/pkg- config --variable=xcbincludedir xcb-protoQuoted 7 lines
/home/bernd/buildroot/br8_ffmpeg3_kodi17_github/output/host/x86_64-buildroot-linux-uclibc/sysroot/home/bernd/buildroot/ br8_ffmpeg3_kodi17_github/output/host/bin/../x86_64-buildroot-linux- uclibc/sysroot/usr/share/xcbPlease note that "
/home/bernd/buildroot/..." is present twice in the pkgconfig result.
Quoted 6 lines
Have you noticed that it is us that are adding the sysroot to the xcb-proto.pc file:
https://git.buildroot.org/buildroot/tree/package/x11r7/xcb-proto/xcb-proto.mk#n18
and thus maybe we need to dfrop this tweak now that pkgconf does it for
s/dfrop/drop/
Quoted 1 line
us?
BTW, that tweak was done by someone called Bernd Kuhls, in commit 862e1221d1c (xorg: Bump xcb-proto & libxcb version to 1.10). Granted, that was back then in January 2014, now almost 5 years ago, so you're forgiven for forgiving that! ;-)
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 pkgconf: bump to 1.5.3, change upstream
Am Sun, 09 Dec 2018 21:03:37 +0100 schrieb Yann E. MORIN:
Quoted 4 lines
BTW, that tweak was done by someone called Bernd Kuhls, in commit
862e1221d1c(xorg: Bump xcb-proto & libxcb version to 1.10). Granted, that was back then in January 2014, now almost 5 years ago, so you're forgiven for forgiving that! ;-)
Hi,
thanks for the reminder, sent http://patchwork.ozlabs.org/patch/1010160/
Regards, Bernd