diff options
| author | Sebastian Kemper <sebastian_ml@gmx.net> | 2019-09-08 11:59:00 +0200 |
|---|---|---|
| committer | tripolar <tripolar@users.noreply.github.com> | 2019-09-09 09:39:35 +0200 |
| commit | b6212c8769d0ce92307f685bafb3620c5394d8ba (patch) | |
| tree | c6ccdad2e4a319a1d20ce14c87c4d7850e9f7d33 /libs/glib2 | |
| parent | bfb89d058b14d0547f3f178a8cbcf247d5e7ff77 (diff) | |
glib2: don't use libelf during host build
Since commit d3f86c9cc3e465fbca51aaadbb274856831ba56c tools/libelf
installs a pkgconfig file, which in turn is picked up during the glib2
host build. On the build bots the same occurs, although it so happens
that (sometimes?) libelf.h is not found and the host build fails. This
may be a timing issue specific to the build bots, as the header is in
fact installed by tools/libelf and I can't reproduce this here on my own
computer.
In any case, libelf (if detected) is only used by gresource. gresource
can be used without it. gresource is not used by OpenWrt's build system
(also not in openwrt/packages). So adding "--disable-libelf" to the host
configure args is not detrimental in any way and works around the issue
described above.
Resolves #9927
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
Diffstat (limited to 'libs/glib2')
| -rw-r--r-- | libs/glib2/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile index cc9d48939..508599328 100644 --- a/libs/glib2/Makefile +++ b/libs/glib2/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=glib2 PKG_VERSION:=2.58.3 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION) @@ -47,6 +47,7 @@ endef TARGET_CFLAGS += -Wno-error=implicit-function-declaration HOST_CONFIGURE_ARGS += \ + --disable-libelf \ --disable-selinux \ --with-libiconv=gnu \ --with-pcre=internal \ |