mirror of
https://git.openwrt.org/feed/packages.git
synced 2024-06-14 11:23:57 +02:00
721838ddd4
glib2's meson.build runs check cc.has_function('ngettext', args :
osx_ldflags) and, if successful, it never looks for non-libc libintl.
For musl and glibc this test is always successful.
glib2 unconditionally sets ENABLE_NLS, so during compile <libintl.h>
gets included always. But then we have a disconnect when the OpenWrt pkg
is being built with BUILD_NLS=y, because the <libintl.h> will be from
libintl-full but glib2 will not link to libintl-full.
With BUILD_NLS=n there's no problem, because the <libintl.h> will be
from libc.
In lieu of proper libintl detection in glib2's meson build, removing the
SED call from the Makefile together with the added patch sorts this out.
The SED call can be removed because when we force libintl-full use, the
meson build will put the necessary linker flag into the pkg-config file
itself.
Alpine Linux does something similar (see [1]), but they always force
the use of the external libintl. I assume they always go for full NLS
support.
[1] https://git.alpinelinux.org/aports/tree/main/glib/musl-libintl.patch
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
125 lines
3.0 KiB
Makefile
125 lines
3.0 KiB
Makefile
#
|
|
# Copyright (C) 2007-2019 OpenWrt.org
|
|
#
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
# See /LICENSE for more information.
|
|
#
|
|
|
|
include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=glib2
|
|
PKG_VERSION:=2.70.5
|
|
PKG_RELEASE:=$(AUTORELEASE)
|
|
|
|
PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz
|
|
PKG_SOURCE_URL:=@GNOME/glib/2.70
|
|
PKG_HASH:=f70bf76ebcc84e0705722f038be8e2f9a58d17e1a700810c635fcc18b8974b7e
|
|
|
|
PKG_MAINTAINER:=Peter Wagner <tripolar@gmx.at>
|
|
PKG_LICENSE:=LGPL-2.1-or-later
|
|
PKG_LICENSE_FILES:=COPYING
|
|
PKG_CPE_ID:=cpe:/a:gnome:glib
|
|
|
|
PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION)
|
|
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/glib-$(PKG_VERSION)
|
|
PKG_BUILD_DEPENDS:=libiconv/host
|
|
HOST_BUILD_DEPENDS:=libiconv/host libffi/host pcre/host
|
|
PKG_CONFIG_DEPENDS:=CONFIG_BUILD_NLS
|
|
PKG_INSTALL:=1
|
|
|
|
include $(INCLUDE_DIR)/host-build.mk
|
|
include $(INCLUDE_DIR)/package.mk
|
|
include $(INCLUDE_DIR)/nls.mk
|
|
include $(INCLUDE_DIR)/meson.mk
|
|
|
|
define Package/glib2
|
|
SECTION:=libs
|
|
CATEGORY:=Libraries
|
|
DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS) +zlib +libpthread +libffi +libattr +libpcre
|
|
TITLE:=glib 2.0
|
|
URL:=http://www.gtk.org/
|
|
endef
|
|
|
|
define Package/glib2/description
|
|
The GLib library of C routines
|
|
endef
|
|
|
|
HOST_LDFLAGS += -Wl,-rpath,$(STAGING_DIR_HOSTPKG)/lib
|
|
TARGET_CFLAGS += -ffunction-sections -fdata-sections
|
|
TARGET_LDFLAGS += -Wl,--gc-sections $(if $(INTL_FULL),-lintl)
|
|
|
|
COMP_ARGS= \
|
|
-Diconv=external \
|
|
-Dselinux=disabled \
|
|
-Dlibmount=disabled \
|
|
-Dman=false \
|
|
-Ddtrace=false \
|
|
-Dsystemtap=false \
|
|
-Dsysprof=disabled \
|
|
-Dgtk_doc=false \
|
|
-Dbsymbolic_functions=true \
|
|
-Dforce_posix_threads=true \
|
|
-Dfam=false \
|
|
-Dtests=false \
|
|
-Dinstalled_tests=false \
|
|
-Doss_fuzz=disabled \
|
|
-Dglib_debug=disabled \
|
|
-Dglib_assert=false \
|
|
-Dglib_checks=true \
|
|
-Dlibelf=disabled
|
|
|
|
MESON_HOST_ARGS += $(COMP_ARGS) -Dxattr=false -Ddefault_library=static -Dnls=disabled
|
|
MESON_ARGS += $(COMP_ARGS) -Dxattr=true -Db_lto=true -Ddefault_library=both -Dnls=$(if $(CONFIG_BUILD_NLS),en,dis)abled
|
|
|
|
define Build/InstallDev
|
|
$(INSTALL_DIR) $(1)/usr/bin
|
|
$(CP) \
|
|
$(PKG_INSTALL_DIR)/usr/bin/* \
|
|
$(1)/usr/bin/
|
|
|
|
$(INSTALL_DIR) $(1)/usr/include
|
|
$(CP) \
|
|
$(PKG_INSTALL_DIR)/usr/include/glib-2.0 \
|
|
$(1)/usr/include/
|
|
$(CP) \
|
|
$(PKG_INSTALL_DIR)/usr/lib/glib-2.0/include/*.h \
|
|
$(1)/usr/include/glib-2.0/
|
|
$(CP) \
|
|
$(PKG_INSTALL_DIR)/usr/include/gio-unix-2.0 \
|
|
$(1)/usr/include/
|
|
|
|
$(INSTALL_DIR) $(1)/usr/lib
|
|
$(CP) \
|
|
$(PKG_INSTALL_DIR)/usr/lib/glib-2.0 \
|
|
$(1)/usr/lib/
|
|
|
|
$(CP) \
|
|
$(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} \
|
|
$(1)/usr/lib/
|
|
|
|
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
|
|
$(INSTALL_DATA) \
|
|
$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \
|
|
$(1)/usr/lib/pkgconfig
|
|
|
|
$(INSTALL_DIR) $(2)/share/aclocal/
|
|
$(INSTALL_DATA) \
|
|
$(PKG_INSTALL_DIR)/usr/share/aclocal/*.m4 \
|
|
$(2)/share/aclocal/
|
|
|
|
$(INSTALL_DIR) $(1)/usr/share/glib-2.0
|
|
$(CP) \
|
|
$(PKG_INSTALL_DIR)/usr/share/glib-2.0/codegen \
|
|
$(1)/usr/share/glib-2.0/
|
|
endef
|
|
|
|
define Package/glib2/install
|
|
$(INSTALL_DIR) $(1)/usr/lib
|
|
$(CP) \
|
|
$(PKG_INSTALL_DIR)/usr/lib/*.so* \
|
|
$(1)/usr/lib/
|
|
endef
|
|
|
|
$(eval $(call HostBuild))
|
|
$(eval $(call BuildPackage,glib2))
|