Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12971 from neheb/glb2

Browse source 
glib2: add back gettext dependencies
This commit is contained in:
Rosen Penev 2020-07-30 21:07:41 -07:00 committed by GitHub
commit b1a530c67f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libs/glib2/Makefile
View file

@ -22,8 +22,8 @@ PKG_CPE_ID:=cpe:/a:gnome:glib
PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION)
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/glib-$(PKG_VERSION) HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/glib-$(PKG_VERSION)
PKG_BUILD_DEPENDS:=meson/host libiconv/host PKG_BUILD_DEPENDS:=meson/host
HOST_BUILD_DEPENDS:=meson/host libiconv/host libffi/host HOST_BUILD_DEPENDS:=meson/host gettext-full/host libiconv/host libffi/host
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
@ -34,7 +34,7 @@ include ../../devel/meson/meson.mk
define Package/glib2 define Package/glib2
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
DEPENDS:=$(ICONV_DEPENDS) +zlib +libpthread +libffi +libattr DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS) +zlib +libpthread +libffi +libattr
TITLE:=glib 2.0 TITLE:=glib 2.0
URL:=http://www.gtk.org/ URL:=http://www.gtk.org/
endef endef
@ -43,11 +43,12 @@ define Package/glib2/description
The GLib library of C routines The GLib library of C routines
endef endef
HOST_LDFLAGS += -liconv -Wl,-rpath=$(STAGING_DIR_HOSTPKG)/lib HOST_LDFLAGS += -Wl,-rpath=$(STAGING_DIR_HOSTPKG)/lib
TARGET_CFLAGS += -ffunction-sections -fdata-sections TARGET_CFLAGS += -ffunction-sections -fdata-sections
TARGET_LDFLAGS += -Wl,--gc-sections -liconv TARGET_LDFLAGS += -Wl,--gc-sections
COMP_ARGS= \ COMP_ARGS= \
-Diconv=external \
-Dselinux=disabled \ -Dselinux=disabled \
-Dlibmount=disabled \ -Dlibmount=disabled \
-Dinternal_pcre=true \ -Dinternal_pcre=true \
@ -59,8 +60,10 @@ COMP_ARGS= \
-Dforce_posix_threads=true \ -Dforce_posix_threads=true \
-Dfam=false \ -Dfam=false \
-Dinstalled_tests=false \ -Dinstalled_tests=false \
-Dnls=disabled \ -Dnls=$(if $(CONFIG_BUILD_NLS),en,dis)abled \
-Doss_fuzz=disabled -Doss_fuzz=disabled \
-Dglib_assert=false \
-Dglib_checks=false
MESON_HOST_ARGS += $(COMP_ARGS) -Dxattr=false MESON_HOST_ARGS += $(COMP_ARGS) -Dxattr=false
MESON_ARGS += $(COMP_ARGS) -Dxattr=true -Db_lto=true MESON_ARGS += $(COMP_ARGS) -Dxattr=true -Db_lto=true

2
libs/glib2/patches/001-no-libelf.patch
View file

@ -1,6 +1,6 @@
--- a/gio/meson.build --- a/gio/meson.build
+++ b/gio/meson.build +++ b/gio/meson.build
@@ -870,20 +870,6 @@ endif @@ -881,20 +881,6 @@ endif
# Dependencies used by executables below # Dependencies used by executables below
have_libelf = false have_libelf = false

2
libs/glib2/patches/002-no-tests.patch
View file

@ -1,6 +1,6 @@
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -84,7 +84,7 @@ installed_tests_template = files('template.test.in') @@ -94,7 +94,7 @@ installed_tests_template = files('template.test.in')
installed_tests_template_tap = files('template-tap.test.in') installed_tests_template_tap = files('template-tap.test.in')
# Don’t build the tests unless we can run them (either natively, in an exe wrapper, or by installing them for later use) # Don’t build the tests unless we can run them (either natively, in an exe wrapper, or by installing them for later use)

2
libs/glib2/patches/003-valgrind.h-mips16-fix.patch
View file

@ -1,6 +1,6 @@
--- a/glib/valgrind.h 2019-12-12 14:53:26.000200499 +0100 --- a/glib/valgrind.h 2019-12-12 14:53:26.000200499 +0100
+++ b/glib/valgrind.h 2019-12-12 14:49:45.056163300 +0100 +++ b/glib/valgrind.h 2019-12-12 14:49:45.056163300 +0100
@@ -157,7 +157,7 @@ @@ -158,7 +158,7 @@
# define PLAT_s390x_linux 1 # define PLAT_s390x_linux 1
#elif defined(__linux__) && defined(__mips__) && (__mips==64) #elif defined(__linux__) && defined(__mips__) && (__mips==64)
# define PLAT_mips64_linux 1 # define PLAT_mips64_linux 1

11
libs/glib2/patches/005-intl-fix.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/meson.build
+++ b/meson.build
@@ -1955,7 +1955,7 @@ endif
# FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
# implementations. This could be extended if issues are found in some platforms.
libintl_deps = []
-if cc.has_function('ngettext')
+if false
have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
else
# First just find the bare library.