From 09e169179597343b7e2752743872337634cf63e6 Mon Sep 17 00:00:00 2001 From: John Voltz Date: Thu, 6 Mar 2008 17:54:01 +0000 Subject: [PATCH] updated makefile for atk --- package/atk/Config.in | 1 + ...dir-la.patch => atk-1.9.1-libdir-la.patch} | 0 package/atk/atk.mk | 188 +++++------------- 3 files changed, 53 insertions(+), 136 deletions(-) rename package/atk/{libdir-la.patch => atk-1.9.1-libdir-la.patch} (100%) diff --git a/package/atk/Config.in b/package/atk/Config.in index a55011bc59..6fcaf1c433 100644 --- a/package/atk/Config.in +++ b/package/atk/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ATK bool "atk" + select BR2_PACKAGE_PKGCONFIG default n depends BR2_PACKAGE_LIBGLIB2 help diff --git a/package/atk/libdir-la.patch b/package/atk/atk-1.9.1-libdir-la.patch similarity index 100% rename from package/atk/libdir-la.patch rename to package/atk/atk-1.9.1-libdir-la.patch diff --git a/package/atk/atk.mk b/package/atk/atk.mk index d244d375b7..a069832a23 100644 --- a/package/atk/atk.mk +++ b/package/atk/atk.mk @@ -3,143 +3,59 @@ # atk # ############################################################# -ATK_VERSION:=1.9.1 -ATK_SOURCE:=atk-$(ATK_VERSION).tar.bz2 -ATK_SITE:=ftp://ftp.gtk.org/pub/gtk/v2.10/dependencies -ATK_CAT:=$(BZCAT) -ATK_DIR:=$(BUILD_DIR)/atk-$(ATK_VERSION) -ATK_BINARY:=libatk-1.0.a - -$(DL_DIR)/$(ATK_SOURCE): - $(WGET) -P $(DL_DIR) $(ATK_SITE)/$(ATK_SOURCE) - -atk-source: $(DL_DIR)/$(ATK_SOURCE) - -$(ATK_DIR)/.unpacked: $(DL_DIR)/$(ATK_SOURCE) - $(ATK_CAT) $(DL_DIR)/$(ATK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(ATK_DIR) package/atk/ \*.patch* - $(CONFIG_UPDATE) $(ATK_DIR) - touch $(ATK_DIR)/.unpacked - -$(ATK_DIR)/.configured: $(ATK_DIR)/.unpacked - (cd $(ATK_DIR); rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - 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 \ - ac_cv_func_memcmp_working=yes \ - ac_cv_have_decl_malloc=yes \ - gl_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_calloc_0_nonnull=yes \ - ac_cv_func_realloc_0_nonnull=yes \ - 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=/usr/bin/glib-genmarshal \ - ac_cv_prog_F77=no \ - ac_cv_prog_CXX=no \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(REAL_GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --libdir=/lib \ - --libexecdir=/usr/lib \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --localstatedir=/var \ - --includedir=/include \ - --mandir=/usr/man \ - --infodir=/usr/info \ - --enable-shared \ - --enable-static \ - --with-x \ +ATK_VERSION = 1.9.1 +ATK_SOURCE = atk-$(ATK_VERSION).tar.bz2 +ATK_SITE = ftp://ftp.gtk.org/pub/gtk/v2.10/dependencies +ATK_AUTORECONF = NO +ATK_INSTALL_STAGING = YES +ATK_INSTALL_TARGET = YES +ATK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install + +ATK_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 \ + ac_cv_func_memcmp_working=yes ac_cv_have_decl_malloc=yes \ + gl_cv_func_malloc_0_nonnull=yes ac_cv_func_malloc_0_nonnull=yes \ + ac_cv_func_calloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes \ + 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=/usr/bin/glib-genmarshal \ + ac_cv_prog_F77=no ac_cv_prog_CXX=no + +ATK_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(REAL_GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) --prefix=/usr \ + --exec-prefix=/usr --bindir=/usr/bin \ + --sbindir=/usr/sbin --libdir=/usr/lib \ + --libexecdir=/usr/lib --sysconfdir=/etc \ + --datadir=/usr/share --localstatedir=/var \ + --includedir=/usr/include --mandir=/usr/man \ + --infodir=/usr/info --enable-shared \ + --enable-static --with-x \ --x-includes=$(STAGING_DIR)/usr/include/X11 \ --x-libraries=$(STAGING_DIR)/usr/lib \ - --disable-glibtest \ - --enable-explicit-deps=no \ - --disable-debug \ - ) - touch $(ATK_DIR)/.configured - -$(ATK_DIR)/atk/.libs/$(ATK_BINARY): $(ATK_DIR)/.configured - $(MAKE) CC=$(TARGET_CC) -C $(ATK_DIR) - touch -c $(ATK_DIR)/atk/.libs/$(ATK_BINARY) - -$(STAGING_DIR)/lib/$(ATK_BINARY): $(ATK_DIR)/atk/.libs/$(ATK_BINARY) - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(ATK_DIR) install - $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libatk-1.0.la - touch -c $(STAGING_DIR)/lib/$(ATK_BINARY) - -$(TARGET_DIR)/lib/libatk-1.0.so.0: $(STAGING_DIR)/lib/$(ATK_BINARY) - cp -a $(STAGING_DIR)/lib/libatk-1.0.so $(TARGET_DIR)/lib/ - cp -a $(STAGING_DIR)/lib/libatk-1.0.so.0* $(TARGET_DIR)/lib/ - $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libatk-1.0.so.0.* - touch -c $(TARGET_DIR)/lib/libatk-1.0.so.0 + --disable-glibtest --enable-explicit-deps=no \ + --disable-debug -atk: libglib2 pkgconfig $(TARGET_DIR)/lib/libatk-1.0.so.0 +ATK_DEPENDENCIES = libglib2 pkgconfig -atk-clean: - rm -f $(TARGET_DIR)/lib/$(ATK_BINARY) - -$(MAKE) -C $(ATK_DIR) clean - -atk-dirclean: - rm -rf $(ATK_DIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(strip $(BR2_PACKAGE_ATK)),y) -TARGETS+=atk -endif +$(eval $(call AUTOTARGETS,package,atk)) -- 2.30.2