glib2: fix compilation in my fedora20 mock

see #72

Signed-off-by: Etienne CHAMPETIER <champetier.etienne@gmail.com>
This commit is contained in:
Etienne CHAMPETIER 2014-07-16 21:07:34 +02:00
parent a801f8edcd
commit 26e00eef1e
1 changed files with 19 additions and 18 deletions

View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=glib2 PKG_NAME:=glib2
PKG_VERSION:=2.41.1 PKG_VERSION:=2.41.1
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz
PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION)
@ -40,23 +40,24 @@ define Package/glib2/description
The GLib library of C routines The GLib library of C routines
endef endef
define Build/Configure HOST_CONFIGURE_ARGS += \
$(call Build/Configure/Default, \ --disable-selinux
--enable-shared \
--enable-static \ CONFIGURE_ARGS += \
--enable-debug=no \ --enable-shared \
--disable-selinux \ --enable-static \
--disable-fam \ --enable-debug=no \
$(if $(ICONV_FULL),--with-libiconv=gnu) \ --disable-selinux \
, \ --disable-fam \
glib_cv_stack_grows=no \ $(if $(ICONV_FULL),--with-libiconv=gnu)
glib_cv_uscore=no \
ac_cv_path_GLIB_GENMARSHAL=$(STAGING_DIR_HOST)/bin/glib-genmarshal \ CONFIGURE_VARS += \
ac_cv_func_mmap_fixed_mapped=yes \ glib_cv_stack_grows=no \
ac_cv_func_posix_getpwuid_r=yes \ glib_cv_uscore=no \
ac_cv_func_posix_getgrgid_r=yes \ ac_cv_path_GLIB_GENMARSHAL=$(STAGING_DIR_HOST)/bin/glib-genmarshal \
); ac_cv_func_mmap_fixed_mapped=yes \
endef ac_cv_func_posix_getpwuid_r=yes \
ac_cv_func_posix_getgrgid_r=yes
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(INSTALL_DIR) $(1)/usr/include