0ec4298153
The test for clock_gettime() in configure.in doesn't work properly when a previous package has loaded the shared configuration cache with informations about the availability of clock_gettime. A package such as ctorrent does so, which means that compiling ctorrent *then* libglib2 currently fails. According to people on the Autoconf mailing list, the libglib2 test is likely the one that needs to be fixed. The problem is that the AC_CHECK_FUNCS() test assumes that if it finds clock_gettime() it means that there's no need to add any -lrt flag to the build. Unfortunately, due to the shared configuration cache, this test is already done with -lrt, so the test succeeds, and libglib2 does not know that it needs to add -lrt to G_THREAD_LIBS and G_THREAD_LIBS_FOR_GTHREAD. So instead, we remplace the test with an AC_SEARCH_LIBS() test, followed by a test on the result of this AC_SEARCH_LIBS() test to add the necessary -lrt to G_THREAD_LIBS and G_THREAD_LIBS_FOR_GTHREAD. Therefore, even if the result for the AC_SEARCH_LIBS() test is cached due to the prior execution ctorrent ./configure script, libglib2 ./configure will properly add -lrt to the appropriate variables. Obviously, as this patch modifies the configure.in file, we enable the autoreconf step for the libglib2 package. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
95 lines
3.7 KiB
Makefile
95 lines
3.7 KiB
Makefile
#############################################################
|
|
#
|
|
# libglib2
|
|
#
|
|
#############################################################
|
|
LIBGLIB2_VERSION_MAJOR = 2.24
|
|
LIBGLIB2_VERSION_MINOR = 1
|
|
LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR)
|
|
LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2
|
|
LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
|
|
|
|
LIBGLIB2_AUTORECONF = YES
|
|
LIBGLIB2_LIBTOOL_PATCH = NO
|
|
LIBGLIB2_INSTALL_STAGING = YES
|
|
LIBGLIB2_INSTALL_TARGET = YES
|
|
LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
|
|
|
|
LIBGLIB2_CONF_ENV = \
|
|
ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
|
|
glib_cv_uscore=no ac_cv_func_strtod=yes \
|
|
ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \
|
|
ac_cv_func_closedir_void=no ac_cv_func_getloadavg=no \
|
|
ac_cv_lib_util_getloadavg=no ac_cv_lib_getloadavg_getloadavg=no \
|
|
ac_cv_func_getgroups=yes ac_cv_func_getgroups_works=yes \
|
|
ac_cv_func_chown_works=yes ac_cv_have_decl_euidaccess=no \
|
|
ac_cv_func_euidaccess=no ac_cv_have_decl_strnlen=yes \
|
|
ac_cv_func_strnlen_working=yes ac_cv_func_lstat_dereferences_slashed_symlink=yes \
|
|
ac_cv_func_lstat_empty_string_bug=no ac_cv_func_stat_empty_string_bug=no \
|
|
vb_cv_func_rename_trailing_slash_bug=no ac_cv_have_decl_nanosleep=yes \
|
|
jm_cv_func_nanosleep_works=yes gl_cv_func_working_utimes=yes \
|
|
ac_cv_func_utime_null=yes ac_cv_have_decl_strerror_r=yes \
|
|
ac_cv_func_strerror_r_char_p=no jm_cv_func_svid_putenv=yes \
|
|
ac_cv_func_getcwd_null=yes ac_cv_func_getdelim=yes \
|
|
ac_cv_func_mkstemp=yes utils_cv_func_mkstemp_limitations=no \
|
|
utils_cv_func_mkdir_trailing_slash_bug=no \
|
|
jm_cv_func_gettimeofday_clobber=no \
|
|
gl_cv_func_working_readdir=yes jm_ac_cv_func_link_follows_symlink=no \
|
|
utils_cv_localtime_cache=no ac_cv_struct_st_mtim_nsec=no \
|
|
gl_cv_func_tzset_clobber=no gl_cv_func_getcwd_null=yes \
|
|
gl_cv_func_getcwd_path_max=yes ac_cv_func_fnmatch_gnu=yes \
|
|
am_getline_needs_run_time_check=no am_cv_func_working_getline=yes \
|
|
gl_cv_func_mkdir_trailing_slash_bug=no gl_cv_func_mkstemp_limitations=no \
|
|
ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
|
|
ac_use_included_regex=no gl_cv_c_restrict=no \
|
|
ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal ac_cv_prog_F77=no \
|
|
ac_cv_func_posix_getgrgid_r=no \
|
|
gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)
|
|
|
|
LIBGLIB2_CONF_OPT = --enable-shared \
|
|
--enable-static
|
|
|
|
HOST_LIBGLIB2_CONF_OPT = \
|
|
--enable-shared \
|
|
--disable-static \
|
|
--disable-gtk-doc \
|
|
--enable-debug=no \
|
|
|
|
LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 zlib $(if $(BR2_NEEDS_GETTEXT),gettext libintl)
|
|
|
|
HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config host-zlib
|
|
|
|
ifneq ($(BR2_ENABLE_LOCALE),y)
|
|
LIBGLIB2_DEPENDENCIES+=libiconv
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBICONV),y)
|
|
LIBGLIB2_CONF_OPT += --with-libiconv=gnu
|
|
LIBGLIB2_DEPENDENCIES+=libiconv
|
|
endif
|
|
|
|
define LIBGLIB2_REMOVE_DEV_FILES
|
|
rm -rf $(TARGET_DIR)/usr/lib/glib-2.0
|
|
rm -rf $(TARGET_DIR)/usr/share/glib-2.0/gettext
|
|
rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share/glib-2.0
|
|
rm -f $(addprefix $(TARGET_DIR)/usr/bin/,glib-genmarshal glib-gettextize glib-mkenums gobject-query gtester gtester-report)
|
|
endef
|
|
|
|
ifneq ($(BR2_HAVE_DEVFILES),y)
|
|
LIBGLIB2_POST_INSTALL_TARGET_HOOKS += LIBGLIB2_REMOVE_DEV_FILES
|
|
endif
|
|
|
|
define LIBGLIB2_REMOVE_GDB_FILES
|
|
rm -rf $(TARGET_DIR)/usr/share/glib-2.0/gdb
|
|
rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share/glib-2.0
|
|
endef
|
|
|
|
ifneq ($(BR2_PACKAGE_GDB),y)
|
|
LIBGLIB2_POST_INSTALL_TARGET_HOOKS += LIBGLIB2_REMOVE_GDB_FILES
|
|
endif
|
|
|
|
$(eval $(call AUTOTARGETS,package,libglib2))
|
|
$(eval $(call AUTOTARGETS,package,libglib2,host))
|
|
|
|
LIBGLIB2_HOST_BINARY:=$(HOST_DIR)/usr/bin/glib-genmarshal
|