* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
@ 2007-01-14 23:26 andersen at uclibc.org
0 siblings, 0 replies; 37+ messages in thread
From: andersen at uclibc.org @ 2007-01-14 23:26 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2007-01-14 15:26:15 -0800 (Sun, 14 Jan 2007)
New Revision: 17309
Log:
fix build and ensure we install needed runtime components
Added:
trunk/buildroot/package/libgtk2/000_gtk+-2.0.6-exportsymbols.patch
trunk/buildroot/package/libgtk2/000_gtk+-2.2.0-buildfix-immodule.patch
trunk/buildroot/package/libgtk2/002_xpmico.patch
trunk/buildroot/package/libgtk2/007_password_char.patch
trunk/buildroot/package/libgtk2/0815_ia32-hack.patch
trunk/buildroot/package/libgtk2/gdk-pixbuf.loaders
trunk/buildroot/package/libgtk2/gtk.immodules
trunk/buildroot/package/libgtk2/gtklabel-resize.patch
trunk/buildroot/package/libgtk2/odd-include-problem.patch
Removed:
trunk/buildroot/package/libgtk2/gtklabel-resize-patch
trunk/buildroot/package/libgtk2/pangoxft2.10.6.diff
Modified:
trunk/buildroot/package/libgtk2/libgtk2.mk
trunk/buildroot/package/libgtk2/run-iconcache.patch
Changeset:
Sorry, the patch is too large to include (3155 lines).
Please use ViewCVS to see it!
http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=17309
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
@ 2007-01-14 23:27 andersen at uclibc.org
0 siblings, 0 replies; 37+ messages in thread
From: andersen at uclibc.org @ 2007-01-14 23:27 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2007-01-14 15:27:26 -0800 (Sun, 14 Jan 2007)
New Revision: 17310
Log:
oops, embed $(STAGING_DIR) rather than hard coding my home dir...
Modified:
trunk/buildroot/package/libgtk2/libgtk2.mk
Changeset:
Modified: trunk/buildroot/package/libgtk2/libgtk2.mk
===================================================================
--- trunk/buildroot/package/libgtk2/libgtk2.mk 2007-01-14 23:26:15 UTC (rev 17309)
+++ trunk/buildroot/package/libgtk2/libgtk2.mk 2007-01-14 23:27:26 UTC (rev 17310)
@@ -88,7 +88,7 @@
# I dont yet understand why configure is not doing this right
# TODO: also remove 'odd-include-problem.patch' when this is fixed
$(SED) "s,^GDK_DEP_CFLAGS=.*,GDK_DEP_CFLAGS=\'-pthread -I$(STAGING_DIR)/include/glib-2.0 -I$(STAGING_DIR)/lib/glib-2.0/include -I$(STAGING_DIR)/include/pango-1.0 -I$(STAGING_DIR)/include/cairo\',g" $(LIBGTK2_DIR)/configure
- $(SED) "s,^GDK_DEP_LIBS=.*,GDK_DEP_LIBS=\'-L/home/andersen/SVN/buildroot/build_i686/staging_dir/lib -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lfontconfig -lXext -lXrender -lX11 -lXinerama -lXrandr -lXcursor -lXfixes -lXft -lm\',g" $(LIBGTK2_DIR)/configure
+ $(SED) "s,^GDK_DEP_LIBS=.*,GDK_DEP_LIBS=\'-L$(STAGING_DIR)/lib -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lfontconfig -lXext -lXrender -lX11 -lXinerama -lXrandr -lXcursor -lXfixes -lXft -lm\',g" $(LIBGTK2_DIR)/configure
(cd $(LIBGTK2_DIR); rm -rf config.cache; \
$(LIBGTK2_BUILD_ENV) \
./configure \
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
@ 2007-01-17 0:04 andersen at uclibc.org
0 siblings, 0 replies; 37+ messages in thread
From: andersen at uclibc.org @ 2007-01-17 0:04 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2007-01-16 16:04:21 -0800 (Tue, 16 Jan 2007)
New Revision: 17331
Log:
select XORG rather than depend on it.
Modified:
trunk/buildroot/package/libgtk2/Config.in
Changeset:
Modified: trunk/buildroot/package/libgtk2/Config.in
===================================================================
--- trunk/buildroot/package/libgtk2/Config.in 2007-01-16 21:00:54 UTC (rev 17330)
+++ trunk/buildroot/package/libgtk2/Config.in 2007-01-17 00:04:21 UTC (rev 17331)
@@ -7,7 +7,7 @@
select BR2_PACKAGE_JPEG
select BR2_PACKAGE_TIFF
select BR2_PACKAGE_PNG
- depends BR2_PACKAGE_XORG
+ select BR2_PACKAGE_XORG
help
The GTK+ version 2 graphical user interface library
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
@ 2007-01-17 11:27 jacmet at uclibc.org
0 siblings, 0 replies; 37+ messages in thread
From: jacmet at uclibc.org @ 2007-01-17 11:27 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-01-17 03:27:14 -0800 (Wed, 17 Jan 2007)
New Revision: 17334
Log:
PNG package is called BR2_PACKAGE_LIBPNG
Modified:
trunk/buildroot/package/libgtk2/Config.in
Changeset:
Modified: trunk/buildroot/package/libgtk2/Config.in
===================================================================
--- trunk/buildroot/package/libgtk2/Config.in 2007-01-17 10:07:01 UTC (rev 17333)
+++ trunk/buildroot/package/libgtk2/Config.in 2007-01-17 11:27:14 UTC (rev 17334)
@@ -6,7 +6,7 @@
select BR2_PACKAGE_CAIRO
select BR2_PACKAGE_JPEG
select BR2_PACKAGE_TIFF
- select BR2_PACKAGE_PNG
+ select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_XORG
help
The GTK+ version 2 graphical user interface library
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
@ 2007-02-01 19:20 andersen at uclibc.org
0 siblings, 0 replies; 37+ messages in thread
From: andersen at uclibc.org @ 2007-02-01 19:20 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2007-02-01 11:19:59 -0800 (Thu, 01 Feb 2007)
New Revision: 17698
Log:
bump version
Modified:
trunk/buildroot/package/libgtk2/libgtk2.mk
Changeset:
Modified: trunk/buildroot/package/libgtk2/libgtk2.mk
===================================================================
--- trunk/buildroot/package/libgtk2/libgtk2.mk 2007-02-01 12:30:34 UTC (rev 17697)
+++ trunk/buildroot/package/libgtk2/libgtk2.mk 2007-02-01 19:19:59 UTC (rev 17698)
@@ -3,7 +3,7 @@
# libgtk2.0
#
#############################################################
-LIBGTK2_VERSION:=2.10.7
+LIBGTK2_VERSION:=2.10.9
LIBGTK2_SOURCE:=gtk+-$(LIBGTK2_VERSION).tar.bz2
LIBGTK2_SITE:=ftp://ftp.gtk.org/pub/gtk/v2.10
LIBGTK2_CAT:=$(BZCAT)
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
@ 2008-07-06 6:25 ulf at uclibc.org
0 siblings, 0 replies; 37+ messages in thread
From: ulf at uclibc.org @ 2008-07-06 6:25 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2008-07-05 23:25:06 -0700 (Sat, 05 Jul 2008)
New Revision: 22660
Log:
Improve readability of libgtk2 configuration
Modified:
trunk/buildroot/package/libgtk2/libgtk2.mk
Changeset:
Modified: trunk/buildroot/package/libgtk2/libgtk2.mk
===================================================================
--- trunk/buildroot/package/libgtk2/libgtk2.mk 2008-07-06 06:23:21 UTC (rev 22659)
+++ trunk/buildroot/package/libgtk2/libgtk2.mk 2008-07-06 06:25:06 UTC (rev 22660)
@@ -13,50 +13,89 @@
LIBGTK2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
LIBGTK2_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 \
+ 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=$(HOST_GLIB)/bin/glib-genmarshal \
ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_GLIB)/bin/gtk-update-icon-cache \
ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_GLIB)/bin/gdk-pixbuf-csource \
- ac_cv_prog_F77=no ac_cv_prog_CXX=no ac_cv_path_CUPS_CONFIG=no
+ ac_cv_prog_F77=no \
+ ac_cv_prog_CXX=no \
+ ac_cv_path_CUPS_CONFIG=no
LIBGTK2_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(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 \
+ --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 \
- --disable-glibtest --enable-explicit-deps=no \
+ --disable-glibtest \
+ --enable-explicit-deps=no \
--disable-debug \
- $(LIBGTK2_CONF_OPT_X) $(LIBGTK2_CONF_OPT_DFB)
+ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
+ PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
+ $(LIBGTK2_CONF_OPT_X) \
+ $(LIBGTK2_CONF_OPT_DFB)
ifeq ($(BR2_PACKAGE_DIRECTFB),y)
@@ -65,7 +104,8 @@
endif
ifneq ($(BR2_PACKAGE_XSERVER_none),y)
- LIBGTK2_CONF_OPT += --with-x \
+ LIBGTK2_CONF_OPT += \
+ --with-x \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
--with-gdktarget=x11
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
@ 2008-07-07 11:09 ulf at uclibc.org
0 siblings, 0 replies; 37+ messages in thread
From: ulf at uclibc.org @ 2008-07-07 11:09 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2008-07-07 04:09:20 -0700 (Mon, 07 Jul 2008)
New Revision: 22671
Log:
Remove duplicated select LIBPNG and use alphabetical order for selects
Modified:
trunk/buildroot/package/libgtk2/Config.in
Changeset:
Modified: trunk/buildroot/package/libgtk2/Config.in
===================================================================
--- trunk/buildroot/package/libgtk2/Config.in 2008-07-07 05:30:22 UTC (rev 22670)
+++ trunk/buildroot/package/libgtk2/Config.in 2008-07-07 11:09:20 UTC (rev 22671)
@@ -1,16 +1,15 @@
config BR2_PACKAGE_LIBGTK2
bool "libgtk2"
default n
- select BR2_PACKAGE_PKGCONFIG
select BR2_PACKAGE_ATK
- select BR2_PACKAGE_PANGO
select BR2_PACKAGE_CAIRO
- select BR2_PACKAGE_JPEG
- select BR2_PACKAGE_TIFF
- select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_CUPS
- select BR2_PACKAGE_LIBPNG
+ select BR2_PACKAGE_JPEG
select BR2_PACKAGE_LIBGLIB2
+ select BR2_PACKAGE_LIBPNG
+ select BR2_PACKAGE_PANGO
+ select BR2_PACKAGE_PKGCONFIG
+ select BR2_PACKAGE_TIFF
depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX
help
The GTK+ version 2 graphical user interface library
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
@ 2008-07-08 10:09 ulf at uclibc.org
0 siblings, 0 replies; 37+ messages in thread
From: ulf at uclibc.org @ 2008-07-08 10:09 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2008-07-08 03:09:28 -0700 (Tue, 08 Jul 2008)
New Revision: 22686
Log:
Support ARCH-unknown-linux-gnu, Use target library paths instead of the host library paths.
Added:
trunk/buildroot/package/libgtk2/libgtk2-2.12.6-configure.patch
Changeset:
Added: trunk/buildroot/package/libgtk2/libgtk2-2.12.6-configure.patch
===================================================================
--- trunk/buildroot/package/libgtk2/libgtk2-2.12.6-configure.patch (rev 0)
+++ trunk/buildroot/package/libgtk2/libgtk2-2.12.6-configure.patch 2008-07-08 10:09:28 UTC (rev 22686)
@@ -0,0 +1,256 @@
+diff -urN libgtk2-2.12.6-0rig/configure libgtk2-2.12.6/configure
+--- libgtk2-2.12.6-0rig/configure 2008-01-29 04:38:14.000000000 +0100
++++ libgtk2-2.12.6/configure 2008-07-08 10:54:39.000000000 +0200
+@@ -5094,7 +5094,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++*-linux-gnu | linux* | k*bsd*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -6973,7 +6973,7 @@
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
+ ;;
+-linux* | k*bsd*-gnu)
++*-linux-gnu | linux* | k*bsd*-gnu)
+ if test "$host_cpu" = ia64; then
+ symcode='[ABCDGIRSTW]'
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+@@ -7943,7 +7943,7 @@
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ *-linux-gnu | linux* | k*bsd*-gnu)
+ case $cc_basename in
+ icc* | ecc*)
+ lt_prog_compiler_wl='-Wl,'
+@@ -8402,7 +8402,7 @@
+ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+- gnu* | linux* | k*bsd*-gnu)
++ *-linux-gnu | gnu* | linux* | k*bsd*-gnu)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
+ case $cc_basename,$host_cpu in
+@@ -9336,6 +9336,7 @@
+ if (lt_freq[lt_foo] == 1) { print lt_foo; }
+ }'`
+ sys_lib_search_path_spec=`echo $lt_search_path_spec`
++
+ else
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi
+@@ -9667,8 +9668,9 @@
+ dynamic_linker=no
+ ;;
+
++
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++*-linux-gnu | linux* | k*bsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -9681,8 +9683,22 @@
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++ # sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++ # Buildroot: New sys_lib_search_path_spec taken from atk!
++if test "$GCC" = yes; then
++ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++ # if the path contains ";" then we assume it to be the separator
++ # otherwise default to the standard path separator (i.e. ":") - it is
++ # assumed that no part of a normal pathname contains ";" but that should
++ # okay in the real world where ";" in dirpaths is itself problematic.
++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
++else
++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+@@ -10780,6 +10796,7 @@
+ # Now quote all the things that may contain metacharacters while being
+ # careful not to overquote the AC_SUBSTed values. We take copies of the
+ # variables and quote the copies for generation of the libtool script.
++
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+ SED SHELL STRIP \
+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+@@ -12109,7 +12126,7 @@
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator_CXX=:
+ ;;
+- linux* | k*bsd*-gnu)
++ *-linux-gnu | linux* | k*bsd*-gnu)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+@@ -12680,7 +12697,7 @@
+ postdeps_CXX=
+ ;;
+
+-linux*)
++*-linux-gnu | linux*)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C++ 5.9
+@@ -12884,7 +12901,7 @@
+ ;;
+ esac
+ ;;
+- linux* | k*bsd*-gnu)
++ *-linux-gnu | linux* | k*bsd*-gnu)
+ case $cc_basename in
+ KCC*)
+ # KAI C++ Compiler
+@@ -13636,7 +13653,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++*-linux-gnu | linux* | k*bsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -13649,7 +13666,24 @@
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++
++ # sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ # Buildroot: New sys_lib_search_path_spec taken from atk!
++if test "$GCC" = yes; then
++ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++ # if the path contains ";" then we assume it to be the separator
++ # otherwise default to the standard path separator (i.e. ":") - it is
++ # assumed that no part of a normal pathname contains ";" but that should
++ # okay in the real world where ";" in dirpaths is itself problematic.
++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
++else
++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
++
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+@@ -14586,7 +14620,7 @@
+ lt_prog_compiler_static_F77='-Bstatic'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ *-linux-gnu | linux* | k*bsd*-gnu)
+ case $cc_basename in
+ icc* | ecc*)
+ lt_prog_compiler_wl_F77='-Wl,'
+@@ -15045,7 +15079,7 @@
+ archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+- gnu* | linux* | k*bsd*-gnu)
++ gnu* | *-linux-gnu | linux* | k*bsd*-gnu)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
+ case $cc_basename,$host_cpu in
+@@ -16239,7 +16273,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++*-linux-gnu | linux* | k*bsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -16252,7 +16286,23 @@
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ # sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ # Buildroot: New sys_lib_search_path_spec taken from atk!
++if test "$GCC" = yes; then
++ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++ # if the path contains ";" then we assume it to be the separator
++ # otherwise default to the standard path separator (i.e. ":") - it is
++ # assumed that no part of a normal pathname contains ";" but that should
++ # okay in the real world where ";" in dirpaths is itself problematic.
++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
++else
++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
++
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+@@ -17169,7 +17219,7 @@
+ lt_prog_compiler_static_GCJ='-Bstatic'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ *-linux-gnu | linux* | k*bsd*-gnu)
+ case $cc_basename in
+ icc* | ecc*)
+ lt_prog_compiler_wl_GCJ='-Wl,'
+@@ -17628,7 +17678,7 @@
+ archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+- gnu* | linux* | k*bsd*-gnu)
++ gnu* | *-linux-gnu | linux* | k*bsd*-gnu)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
+ case $cc_basename,$host_cpu in
+@@ -18842,7 +18892,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++*-linux-gnu | linux* | k*bsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -18855,7 +18905,22 @@
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ #sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ # Buildroot: New sys_lib_search_path_spec taken from atk!
++if test "$GCC" = yes; then
++ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++ # if the path contains ";" then we assume it to be the separator
++ # otherwise default to the standard path separator (i.e. ":") - it is
++ # assumed that no part of a normal pathname contains ";" but that should
++ # okay in the real world where ";" in dirpaths is itself problematic.
++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
++else
++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
@ 2008-08-26 12:19 laird at uclibc.org
2008-08-26 13:15 ` Peter Korsgaard
2008-08-26 13:42 ` Ormund Williams
0 siblings, 2 replies; 37+ messages in thread
From: laird at uclibc.org @ 2008-08-26 12:19 UTC (permalink / raw)
To: buildroot
Author: laird
Date: 2008-08-26 05:19:29 -0700 (Tue, 26 Aug 2008)
New Revision: 23204
Log:
The changes below add better support for DirectFB and libgtk2.
Should be no different for X builds.
Config.in | 3 +--
libgtk2.mk | 7 +++----
2 files changed, 4 insertions(+), 6 deletions(-)
Signed-off-by: daniel.j.laird at nxp.com
package/libgtk2/Config.in
Allow DirectFB to turn on LIBGTK2 support without X being enabled.
Disable autoselection of cups. May not be wanted (Can cause crosscompilation issues).
package/libgtk2/libgtk2.mk
Remove unnessary redefine of PKG_CONFIG_*
Pass $(DISABLE_LARGEFILE) to configure (supports large file or not)
Move 'cups' to X extra dependencies instead of general.
Modified:
trunk/buildroot/package/libgtk2/Config.in
trunk/buildroot/package/libgtk2/libgtk2.mk
Changeset:
Modified: trunk/buildroot/package/libgtk2/Config.in
===================================================================
--- trunk/buildroot/package/libgtk2/Config.in 2008-08-26 01:32:33 UTC (rev 23203)
+++ trunk/buildroot/package/libgtk2/Config.in 2008-08-26 12:19:29 UTC (rev 23204)
@@ -2,14 +2,13 @@
bool "libgtk2"
select BR2_PACKAGE_ATK
select BR2_PACKAGE_CAIRO
- select BR2_PACKAGE_CUPS
select BR2_PACKAGE_JPEG
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_PANGO
select BR2_PACKAGE_PKGCONFIG
select BR2_PACKAGE_TIFF
- depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX
+ depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX||BR2_PACKAGE_DIRECTFB
help
The GTK+ version 2 graphical user interface library
Modified: trunk/buildroot/package/libgtk2/libgtk2.mk
===================================================================
--- trunk/buildroot/package/libgtk2/libgtk2.mk 2008-08-26 01:32:33 UTC (rev 23203)
+++ trunk/buildroot/package/libgtk2/libgtk2.mk 2008-08-26 12:19:29 UTC (rev 23204)
@@ -92,8 +92,7 @@
--disable-glibtest \
--enable-explicit-deps=no \
--disable-debug \
- PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
- PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
+ $(DISABLE_LARGEFILE) \
$(LIBGTK2_CONF_OPT_X) \
$(LIBGTK2_CONF_OPT_DFB)
@@ -109,11 +108,11 @@
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
--with-gdktarget=x11
- LIBGTK2_DEPENDENCIES_EXTRA = xlib_libXcomposite $(XSERVER)
+ LIBGTK2_DEPENDENCIES_EXTRA = xlib_libXcomposite $(XSERVER) cups
else
LIBGTK2_CONF_OPT += --without-x
endif
-LIBGTK2_DEPENDENCIES = uclibc pkgconfig png jpeg tiff $(LIBGTK2_DEPENDENCIES_EXTRA) libglib2 cups cairo pango atk
+LIBGTK2_DEPENDENCIES = uclibc pkgconfig png jpeg tiff $(LIBGTK2_DEPENDENCIES_EXTRA) libglib2 cairo pango atk
$(eval $(call AUTOTARGETS,package,libgtk2))
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
2008-08-26 12:19 laird at uclibc.org
@ 2008-08-26 13:15 ` Peter Korsgaard
2008-08-26 13:32 ` Daniel Laird
2008-08-26 13:48 ` Bernhard Reutner-Fischer
2008-08-26 13:42 ` Ormund Williams
1 sibling, 2 replies; 37+ messages in thread
From: Peter Korsgaard @ 2008-08-26 13:15 UTC (permalink / raw)
To: buildroot
>>>>> "laird" == laird <laird@uclibc.org> writes:
laird> Author: laird
laird> Date: 2008-08-26 05:19:29 -0700 (Tue, 26 Aug 2008)
laird> New Revision: 23204
Welcome!
laird> Log:
laird> The changes below add better support for DirectFB and libgtk2.
laird> Should be no different for X builds.
Could you please check these things in seperately?
laird> Changeset:
laird> Modified: trunk/buildroot/package/libgtk2/Config.in
laird> ===================================================================
laird> --- trunk/buildroot/package/libgtk2/Config.in 2008-08-26 01:32:33 UTC (rev 23203)
laird> +++ trunk/buildroot/package/libgtk2/Config.in 2008-08-26 12:19:29 UTC (rev 23204)
laird> @@ -2,14 +2,13 @@
laird> bool "libgtk2"
laird> select BR2_PACKAGE_ATK
laird> select BR2_PACKAGE_CAIRO
laird> - select BR2_PACKAGE_CUPS
Shouldn't that instead be something like:
select BR2_PACKAGE_CUPS if BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
2008-08-26 13:15 ` Peter Korsgaard
@ 2008-08-26 13:32 ` Daniel Laird
2008-08-26 13:38 ` Peter Korsgaard
2008-08-26 14:07 ` Bernhard Reutner-Fischer
2008-08-26 13:48 ` Bernhard Reutner-Fischer
1 sibling, 2 replies; 37+ messages in thread
From: Daniel Laird @ 2008-08-26 13:32 UTC (permalink / raw)
To: buildroot
I will amend the Config.in to do as suggested:
Config.in
select CUPS if ......
and
libgtk2.mk
ifeq ($(BR2_PACKAGE_CUPS),y)
LIBGTK2_DEPENDENCIES_EXTRA = cups
endif
However this does raise the wider issue of what should be auto selected and
what should be chosen
IMHO I feel CUPS is not a necessary thing for GTK??
Therefore why is it being autoselected for X builds.
If someone wants cups then they should select it in their configuration
file.
Packages that compile differently due to the selection of another package
could use something like:
ifeq ($(BR2_PACKAGE_CUPS),y)
........ (--enable-cups) or whatever
endif
This I think is far better than someone building X and GTK and finding their
build fails because of cups. If they want it they should enable it.
Dan laird
--
View this message in context: http://www.nabble.com/svn-commit%3A-trunk-buildroot-package-libgtk2-tp19160871p19162136.html
Sent from the BuildRoot mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
2008-08-26 13:32 ` Daniel Laird
@ 2008-08-26 13:38 ` Peter Korsgaard
2008-08-26 14:04 ` Bernhard Reutner-Fischer
2008-08-26 14:07 ` Bernhard Reutner-Fischer
1 sibling, 1 reply; 37+ messages in thread
From: Peter Korsgaard @ 2008-08-26 13:38 UTC (permalink / raw)
To: buildroot
>>>>> "Daniel" == Daniel Laird <daniel.j.laird@nxp.com> writes:
Daniel> I will amend the Config.in to do as suggested:
Daniel> Config.in
Daniel> select CUPS if ......
Thanks.
Daniel> However this does raise the wider issue of what should be
Daniel> auto selected and what should be chosen IMHO I feel CUPS is
Daniel> not a necessary thing for GTK?? Therefore why is it being
Daniel> autoselected for X builds. If someone wants cups then they
Daniel> should select it in their configuration file. Packages that
Daniel> compile differently due to the selection of another package
Daniel> could use something like:
Sorry, I have no idea why gtk wants to select cups. Ninevoltz added it
in r21206.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
2008-08-26 12:19 laird at uclibc.org
2008-08-26 13:15 ` Peter Korsgaard
@ 2008-08-26 13:42 ` Ormund Williams
2008-08-26 13:49 ` Daniel Laird
1 sibling, 1 reply; 37+ messages in thread
From: Ormund Williams @ 2008-08-26 13:42 UTC (permalink / raw)
To: buildroot
On Tue, 2008-08-26 at 05:19 -0700, laird at uclibc.org wrote:
> Author: laird
> Date: 2008-08-26 05:19:29 -0700 (Tue, 26 Aug 2008)
> New Revision: 23204
>
> Log:
> The changes below add better support for DirectFB and libgtk2.
> Should be no different for X builds.
>
> Config.in | 3 +--
> libgtk2.mk | 7 +++----
> 2 files changed, 4 insertions(+), 6 deletions(-)
>
> Signed-off-by: daniel.j.laird at nxp.com
>
> package/libgtk2/Config.in
> Allow DirectFB to turn on LIBGTK2 support without X being enabled.
> Disable autoselection of cups. May not be wanted (Can cause crosscompilation issues).
>
> package/libgtk2/libgtk2.mk
> Remove unnessary redefine of PKG_CONFIG_*
> Pass $(DISABLE_LARGEFILE) to configure (supports large file or not)
> Move 'cups' to X extra dependencies instead of general.
>
>
>
>
>
>
> Modified:
> trunk/buildroot/package/libgtk2/Config.in
> trunk/buildroot/package/libgtk2/libgtk2.mk
>
>
> Changeset:
> Modified: trunk/buildroot/package/libgtk2/Config.in
> ===================================================================
> --- trunk/buildroot/package/libgtk2/Config.in 2008-08-26 01:32:33 UTC (rev 23203)
> +++ trunk/buildroot/package/libgtk2/Config.in 2008-08-26 12:19:29 UTC (rev 23204)
> @@ -2,14 +2,13 @@
> bool "libgtk2"
> select BR2_PACKAGE_ATK
> select BR2_PACKAGE_CAIRO
> - select BR2_PACKAGE_CUPS
> select BR2_PACKAGE_JPEG
> select BR2_PACKAGE_LIBGLIB2
> select BR2_PACKAGE_LIBPNG
> select BR2_PACKAGE_PANGO
> select BR2_PACKAGE_PKGCONFIG
> select BR2_PACKAGE_TIFF
> - depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX
> + depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX||BR2_PACKAGE_DIRECTFB
> help
> The GTK+ version 2 graphical user interface library
>
>
> Modified: trunk/buildroot/package/libgtk2/libgtk2.mk
> ===================================================================
> --- trunk/buildroot/package/libgtk2/libgtk2.mk 2008-08-26 01:32:33 UTC (rev 23203)
> +++ trunk/buildroot/package/libgtk2/libgtk2.mk 2008-08-26 12:19:29 UTC (rev 23204)
> @@ -92,8 +92,7 @@
> --disable-glibtest \
> --enable-explicit-deps=no \
> --disable-debug \
> - PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
> - PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
> + $(DISABLE_LARGEFILE) \
> $(LIBGTK2_CONF_OPT_X) \
> $(LIBGTK2_CONF_OPT_DFB)
>
> @@ -109,11 +108,11 @@
> --x-includes=$(STAGING_DIR)/usr/include/X11 \
> --x-libraries=$(STAGING_DIR)/usr/lib \
> --with-gdktarget=x11
> - LIBGTK2_DEPENDENCIES_EXTRA = xlib_libXcomposite $(XSERVER)
> + LIBGTK2_DEPENDENCIES_EXTRA = xlib_libXcomposite $(XSERVER) cups
> else
> LIBGTK2_CONF_OPT += --without-x
> endif
>
> -LIBGTK2_DEPENDENCIES = uclibc pkgconfig png jpeg tiff $(LIBGTK2_DEPENDENCIES_EXTRA) libglib2 cups cairo pango atk
> +LIBGTK2_DEPENDENCIES = uclibc pkgconfig png jpeg tiff $(LIBGTK2_DEPENDENCIES_EXTRA) libglib2 cairo pango atk
>
> $(eval $(call AUTOTARGETS,package,libgtk2))
>
I also had to up the version to 2.12.11 to get a correct build.
__
Ormund
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
@ 2008-08-26 13:45 laird at uclibc.org
0 siblings, 0 replies; 37+ messages in thread
From: laird at uclibc.org @ 2008-08-26 13:45 UTC (permalink / raw)
To: buildroot
Author: laird
Date: 2008-08-26 06:45:39 -0700 (Tue, 26 Aug 2008)
New Revision: 23206
Log:
select CUPS if XORG/XORG7/TINYX.
This makes the behaviour the same as before for X users.
Although is CUPS a necessary dependancy?
Daniel Laird
Modified:
trunk/buildroot/package/libgtk2/Config.in
Changeset:
Modified: trunk/buildroot/package/libgtk2/Config.in
===================================================================
--- trunk/buildroot/package/libgtk2/Config.in 2008-08-26 13:03:05 UTC (rev 23205)
+++ trunk/buildroot/package/libgtk2/Config.in 2008-08-26 13:45:39 UTC (rev 23206)
@@ -2,6 +2,7 @@
bool "libgtk2"
select BR2_PACKAGE_ATK
select BR2_PACKAGE_CAIRO
+ select BR2_PACKAGE_CUPS if BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX
select BR2_PACKAGE_JPEG
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBPNG
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
2008-08-26 13:15 ` Peter Korsgaard
2008-08-26 13:32 ` Daniel Laird
@ 2008-08-26 13:48 ` Bernhard Reutner-Fischer
2008-08-26 14:07 ` Peter Korsgaard
1 sibling, 1 reply; 37+ messages in thread
From: Bernhard Reutner-Fischer @ 2008-08-26 13:48 UTC (permalink / raw)
To: buildroot
On Tue, Aug 26, 2008 at 03:15:49PM +0200, Peter Korsgaard wrote:
>>>>>> "laird" == laird <laird@uclibc.org> writes:
>
> laird> Author: laird
> laird> Date: 2008-08-26 05:19:29 -0700 (Tue, 26 Aug 2008)
> laird> New Revision: 23204
>
>Welcome!
>
> laird> Log:
> laird> The changes below add better support for DirectFB and libgtk2.
> laird> Should be no different for X builds.
>
>Could you please check these things in seperately?
>
> laird> Changeset:
> laird> Modified: trunk/buildroot/package/libgtk2/Config.in
> laird> ===================================================================
> laird> --- trunk/buildroot/package/libgtk2/Config.in 2008-08-26 01:32:33 UTC (rev 23203)
> laird> +++ trunk/buildroot/package/libgtk2/Config.in 2008-08-26 12:19:29 UTC (rev 23204)
> laird> @@ -2,14 +2,13 @@
> laird> bool "libgtk2"
> laird> select BR2_PACKAGE_ATK
> laird> select BR2_PACKAGE_CAIRO
> laird> - select BR2_PACKAGE_CUPS
>
>Shouldn't that instead be something like:
>
>select BR2_PACKAGE_CUPS if BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX
This was recently changed (for the bad, imho).
Previously, we had a "choice" for either of
XSERVER_none
XSERVER_xorg7
XSERVER_tinyx
XSERVER_xggi
With this scheme, you could quickly distinguish if and if yes then which
xserver was selected:
depends on !BR2_XSERVER_none
to depend on any xserver etc.
Peter, was it you who changed this xserver choice? What was
the rationale?
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
2008-08-26 13:42 ` Ormund Williams
@ 2008-08-26 13:49 ` Daniel Laird
0 siblings, 0 replies; 37+ messages in thread
From: Daniel Laird @ 2008-08-26 13:49 UTC (permalink / raw)
To: buildroot
Ormund Williams wrote:
>
> I also had to up the version to 2.12.11 to get a correct build.
> __
> Ormund
>
The version bump was coming later.
I currently use 2.12.9 and it all works well with DirectFB.
The problem is I never run X so version bumping something as big as GTK is a
bit scary. (I Imagine lots of very cross buildroot users if I break it!)
So I opted for first getting GTK to appear as an option when DirectFB was
selected!
--
View this message in context: http://www.nabble.com/svn-commit%3A-trunk-buildroot-package-libgtk2-tp19160871p19162440.html
Sent from the BuildRoot mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
2008-08-26 13:38 ` Peter Korsgaard
@ 2008-08-26 14:04 ` Bernhard Reutner-Fischer
0 siblings, 0 replies; 37+ messages in thread
From: Bernhard Reutner-Fischer @ 2008-08-26 14:04 UTC (permalink / raw)
To: buildroot
On Tue, Aug 26, 2008 at 03:38:46PM +0200, Peter Korsgaard wrote:
>Sorry, I have no idea why gtk wants to select cups. Ninevoltz added it
>in r21206.
doesn't make sense to me, fwiw.
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
2008-08-26 13:32 ` Daniel Laird
2008-08-26 13:38 ` Peter Korsgaard
@ 2008-08-26 14:07 ` Bernhard Reutner-Fischer
2008-08-26 14:54 ` Peter Korsgaard
1 sibling, 1 reply; 37+ messages in thread
From: Bernhard Reutner-Fischer @ 2008-08-26 14:07 UTC (permalink / raw)
To: buildroot
On Tue, Aug 26, 2008 at 06:32:13AM -0700, Daniel Laird wrote:
>
>I will amend the Config.in to do as suggested:
>Config.in
>select CUPS if ......
>
>and
>
>libgtk2.mk
>ifeq ($(BR2_PACKAGE_CUPS),y)
> LIBGTK2_DEPENDENCIES_EXTRA = cups
>endif
LIBGTK2_DEPENDENCIES_EXTRA += $(if $(BR2_PACKAGE_CUPS),cups)
>
>However this does raise the wider issue of what should be auto selected and
>what should be chosen
>IMHO I feel CUPS is not a necessary thing for GTK??
>Therefore why is it being autoselected for X builds.
>If someone wants cups then they should select it in their configuration
>file.
>Packages that compile differently due to the selection of another package
>could use something like:
>
>ifeq ($(BR2_PACKAGE_CUPS),y)
> ........ (--enable-cups) or whatever
>endif
>
>This I think is far better than someone building X and GTK and finding their
>build fails because of cups. If they want it they should enable it.
Exactly. selecting cruft behind the scenes is almost always the wrong
thing to do.
We did not do this until recently, when e.g. Ulf started to add
gazillions of (imho unwarranted) select's.
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
2008-08-26 13:48 ` Bernhard Reutner-Fischer
@ 2008-08-26 14:07 ` Peter Korsgaard
2008-08-26 14:11 ` Bernhard Reutner-Fischer
2008-08-26 14:13 ` Daniel Laird
0 siblings, 2 replies; 37+ messages in thread
From: Peter Korsgaard @ 2008-08-26 14:07 UTC (permalink / raw)
To: buildroot
>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:
Hi,
Bernhard> This was recently changed (for the bad, imho).
Bernhard> Previously, we had a "choice" for either of
Bernhard> XSERVER_none
Bernhard> XSERVER_xorg7
Bernhard> XSERVER_tinyx
Bernhard> XSERVER_xggi
The xggi selecton should btw probably go as it doesn't exist.
Bernhard> With this scheme, you could quickly distinguish if and if yes then which
Bernhard> xserver was selected:
Bernhard> depends on !BR2_XSERVER_none
Bernhard> to depend on any xserver etc.
Bernhard> Peter, was it you who changed this xserver choice? What was
Bernhard> the rationale?
Well, kinda:
r22565:
Author: jacmet <jacmet@69ca8d6d-28ef-0310-b511-8ec308f3f277>
Date: Mon Jun 30 12:55:29 2008 +0000
packages: fix xorg to compile modular and tiny versions
Based on googlecode r558 by John Voltz.
I have no problems reverting that hunk. I simply kept it as it was in
googlecode to make it easier to sync later.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
2008-08-26 14:07 ` Peter Korsgaard
@ 2008-08-26 14:11 ` Bernhard Reutner-Fischer
2008-08-26 14:13 ` Daniel Laird
1 sibling, 0 replies; 37+ messages in thread
From: Bernhard Reutner-Fischer @ 2008-08-26 14:11 UTC (permalink / raw)
To: buildroot
On Tue, Aug 26, 2008 at 04:07:46PM +0200, Peter Korsgaard wrote:
>>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:
>
>Hi,
>
> Bernhard> This was recently changed (for the bad, imho).
> Bernhard> Previously, we had a "choice" for either of
>
> Bernhard> XSERVER_none
> Bernhard> XSERVER_xorg7
> Bernhard> XSERVER_tinyx
> Bernhard> XSERVER_xggi
>
>The xggi selecton should btw probably go as it doesn't exist.
Looks like i never applied libgg, libgii, libggi and xggi packages. My
bad. So yes, the last can be removed for now.
>
> Bernhard> With this scheme, you could quickly distinguish if and if yes then which
> Bernhard> xserver was selected:
>
> Bernhard> depends on !BR2_XSERVER_none
> Bernhard> to depend on any xserver etc.
>
> Bernhard> Peter, was it you who changed this xserver choice? What was
> Bernhard> the rationale?
>
>Well, kinda:
>
>r22565:
>Author: jacmet <jacmet@69ca8d6d-28ef-0310-b511-8ec308f3f277>
>Date: Mon Jun 30 12:55:29 2008 +0000
>
> packages: fix xorg to compile modular and tiny versions
>
> Based on googlecode r558 by John Voltz.
>
>I have no problems reverting that hunk. I simply kept it as it was in
>googlecode to make it easier to sync later.
Of course i don't care, just wanted to give you a hint on why there was
such a choice.
If there is a superiour clean way to express this choice, then fine. I'm
not convinced that the method that is currently in svn actually _is_
superiour, though (since i don't know what it tried to fix).
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
2008-08-26 14:07 ` Peter Korsgaard
2008-08-26 14:11 ` Bernhard Reutner-Fischer
@ 2008-08-26 14:13 ` Daniel Laird
1 sibling, 0 replies; 37+ messages in thread
From: Daniel Laird @ 2008-08-26 14:13 UTC (permalink / raw)
To: buildroot
I am more than happy to remove cups from the dependencies and the select in
Config.in
However I will wait to see if 'ninevoltz' has any thoughts.
If I hear nothing (give a few days) then I will tidy this up as I 100% agree
that we should have as few dependencies and selects as possible and only add
dependencies if packages have been chosen by users and the configure args
would change as a result.
Dan
--
View this message in context: http://www.nabble.com/svn-commit%3A-trunk-buildroot-package-libgtk2-tp19160871p19162907.html
Sent from the BuildRoot mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
2008-08-26 14:07 ` Bernhard Reutner-Fischer
@ 2008-08-26 14:54 ` Peter Korsgaard
0 siblings, 0 replies; 37+ messages in thread
From: Peter Korsgaard @ 2008-08-26 14:54 UTC (permalink / raw)
To: buildroot
>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:
Hi,
Bernhard> Exactly. selecting cruft behind the scenes is almost always the wrong
Bernhard> thing to do.
Bernhard> We did not do this until recently, when e.g. Ulf started to add
Bernhard> gazillions of (imho unwarranted) select's.
Well, selects are imho good for real dependencies instead of those
comments we used to have (foo depends on bar) - But it shoudl ofcause
only be used for required dependencies.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
@ 2008-10-18 7:00 jacmet at uclibc.org
0 siblings, 0 replies; 37+ messages in thread
From: jacmet at uclibc.org @ 2008-10-18 7:00 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-10-18 00:00:35 -0700 (Sat, 18 Oct 2008)
New Revision: 23707
Log:
Bump up libgtk2 version
Bump up libgtk2 version
The version of libgtk2 currently used doesn't build when built against
DirectFB. The issue has been fixed in a later version of the 2.12.x
series, so let's upgrade to this version.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Modified:
trunk/buildroot/package/libgtk2/libgtk2.mk
Changeset:
Modified: trunk/buildroot/package/libgtk2/libgtk2.mk
===================================================================
--- trunk/buildroot/package/libgtk2/libgtk2.mk 2008-10-17 14:11:04 UTC (rev 23706)
+++ trunk/buildroot/package/libgtk2/libgtk2.mk 2008-10-18 07:00:35 UTC (rev 23707)
@@ -3,7 +3,7 @@
# libgtk2.0
#
#############################################################
-LIBGTK2_VERSION = 2.12.6
+LIBGTK2_VERSION = 2.12.12
LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.bz2
LIBGTK2_SITE = ftp://ftp.gtk.org/pub/gtk/2.12
LIBGTK2_AUTORECONF = NO
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
@ 2008-10-27 9:45 jacmet at uclibc.org
0 siblings, 0 replies; 37+ messages in thread
From: jacmet at uclibc.org @ 2008-10-27 9:45 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-10-27 02:45:41 -0700 (Mon, 27 Oct 2008)
New Revision: 23811
Log:
Strip libgtk2 in the target
Rely on the sane default values of Makefile.autotools.in for the
staging and target installs. The immediate benefit is that the target
install will use install-strip instead of install, leading to a quite
nice size reduction in the libraries.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Modified:
trunk/buildroot/package/libgtk2/libgtk2.mk
Changeset:
Modified: trunk/buildroot/package/libgtk2/libgtk2.mk
===================================================================
--- trunk/buildroot/package/libgtk2/libgtk2.mk 2008-10-27 09:45:38 UTC (rev 23810)
+++ trunk/buildroot/package/libgtk2/libgtk2.mk 2008-10-27 09:45:41 UTC (rev 23811)
@@ -9,8 +9,6 @@
LIBGTK2_AUTORECONF = NO
LIBGTK2_INSTALL_STAGING = YES
LIBGTK2_INSTALL_TARGET = YES
-LIBGTK2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install
-LIBGTK2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
LIBGTK2_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
glib_cv_uscore=no \
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
@ 2008-12-26 15:36 jacmet at uclibc.org
0 siblings, 0 replies; 37+ messages in thread
From: jacmet at uclibc.org @ 2008-12-26 15:36 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-12-26 15:36:09 +0000 (Fri, 26 Dec 2008)
New Revision: 24552
Log:
libgtk2: remove unneeded configure opts
This stuff is all handled by Makefile.autotools.in
Modified:
trunk/buildroot/package/libgtk2/libgtk2.mk
Changeset:
Modified: trunk/buildroot/package/libgtk2/libgtk2.mk
===================================================================
--- trunk/buildroot/package/libgtk2/libgtk2.mk 2008-12-26 15:36:03 UTC (rev 24551)
+++ trunk/buildroot/package/libgtk2/libgtk2.mk 2008-12-26 15:36:09 UTC (rev 24552)
@@ -70,21 +70,7 @@
ac_cv_prog_F77=no \
ac_cv_path_CUPS_CONFIG=no
-LIBGTK2_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(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 \
+LIBGTK2_CONF_OPT = --enable-shared \
--enable-static \
--disable-glibtest \
--enable-explicit-deps=no \
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
@ 2008-12-26 15:36 jacmet at uclibc.org
0 siblings, 0 replies; 37+ messages in thread
From: jacmet at uclibc.org @ 2008-12-26 15:36 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-12-26 15:36:12 +0000 (Fri, 26 Dec 2008)
New Revision: 24553
Log:
libgtk: don't list cups/png/jpeg/tiff as hard dependencies
GTK can be compiled without the above, so don't list them as hard
dependencies, and simply adjust the build depending on what the user
has enabled.
Modified:
trunk/buildroot/package/libgtk2/Config.in
trunk/buildroot/package/libgtk2/libgtk2.mk
Changeset:
Modified: trunk/buildroot/package/libgtk2/Config.in
===================================================================
--- trunk/buildroot/package/libgtk2/Config.in 2008-12-26 15:36:09 UTC (rev 24552)
+++ trunk/buildroot/package/libgtk2/Config.in 2008-12-26 15:36:12 UTC (rev 24553)
@@ -2,13 +2,9 @@
bool "libgtk2"
select BR2_PACKAGE_ATK
select BR2_PACKAGE_CAIRO
- select BR2_PACKAGE_CUPS if BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX
- select BR2_PACKAGE_JPEG
select BR2_PACKAGE_LIBGLIB2
- select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_PANGO
select BR2_PACKAGE_PKGCONFIG
- select BR2_PACKAGE_TIFF
depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX||BR2_PACKAGE_DIRECTFB
help
The GTK+ version 2 graphical user interface library
Modified: trunk/buildroot/package/libgtk2/libgtk2.mk
===================================================================
--- trunk/buildroot/package/libgtk2/libgtk2.mk 2008-12-26 15:36:09 UTC (rev 24552)
+++ trunk/buildroot/package/libgtk2/libgtk2.mk 2008-12-26 15:36:12 UTC (rev 24553)
@@ -79,10 +79,11 @@
$(LIBGTK2_CONF_OPT_X) \
$(LIBGTK2_CONF_OPT_DFB)
+LIBGTK2_DEPENDENCIES = pkgconfig libglib2 cairo pango atk
ifeq ($(BR2_PACKAGE_DIRECTFB),y)
LIBGTK2_CONF_OPT += --with-gdktarget=directfb
- LIBGTK2_DEPENDENCIES_EXTRA = directfb
+ LIBGTK2_DEPENDENCIES += directfb
endif
ifneq ($(BR2_PACKAGE_XSERVER_none),y)
@@ -91,11 +92,34 @@
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
--with-gdktarget=x11
- LIBGTK2_DEPENDENCIES_EXTRA = xlib_libXcomposite $(XSERVER) cups
+ LIBGTK2_DEPENDENCIES += xlib_libXcomposite $(XSERVER)
else
LIBGTK2_CONF_OPT += --without-x
endif
-LIBGTK2_DEPENDENCIES = uclibc pkgconfig libpng jpeg tiff $(LIBGTK2_DEPENDENCIES_EXTRA) libglib2 cairo pango atk
+ifeq ($(BR2_PACKAGE_LIBPNG),y)
+LIBGTK2_DEPENDENCIES += libpng
+else
+LIBGTK2_CONF_OPT += --without-libpng
+endif
+
+ifeq ($(BR2_PACKAGE_JPEG),y)
+LIBGTK2_DEPENDENCIES += jpeg
+else
+LIBGTK2_CONF_OPT += --without-libjpeg
+endif
+
+ifeq ($(BR2_PACKAGE_TIFF),y)
+LIBGTK2_DEPENDENCIES += tiff
+else
+LIBGTK2_CONF_OPT += --without-libtiff
+endif
+
+ifeq ($(BR2_PACKAGE_CUPS),y)
+LIBGTK2_DEPENDENCIES += cups
+else
+LIBGTK2_CONF_OPT += --disable-cups
+endif
+
$(eval $(call AUTOTARGETS,package,libgtk2))
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
@ 2008-12-31 9:35 jacmet at uclibc.org
0 siblings, 0 replies; 37+ messages in thread
From: jacmet at uclibc.org @ 2008-12-31 9:35 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-12-31 09:35:15 +0000 (Wed, 31 Dec 2008)
New Revision: 24625
Log:
libgtk2: add init script to create /etc/gtk-2.0/gdk-pixbuf.loaders
It would be nicer to do this at compile time, but then we would need to
compile libgtk2 for the host as well.
Added:
trunk/buildroot/package/libgtk2/S26libgtk2
Modified:
trunk/buildroot/package/libgtk2/libgtk2.mk
Changeset:
Added: trunk/buildroot/package/libgtk2/S26libgtk2
===================================================================
--- trunk/buildroot/package/libgtk2/S26libgtk2 (rev 0)
+++ trunk/buildroot/package/libgtk2/S26libgtk2 2008-12-31 09:35:15 UTC (rev 24625)
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# run pgdk-pixbuf-query-loaders if needed
+
+FILE=/etc/gtk-2.0/gdk-pixbuf.loaders
+
+case "$1" in
+ start|"")
+ if [ ! -f "$FILE" ] ; then
+ /usr/bin/gdk-pixbuf-query-loaders > "$FILE"
+ fi
+ ;;
+ stop)
+ ;;
+ *)
+ echo "Usage: $0 {start|stop}" >&2
+ exit 1
+ ;;
+esac
Modified: trunk/buildroot/package/libgtk2/libgtk2.mk
===================================================================
--- trunk/buildroot/package/libgtk2/libgtk2.mk 2008-12-31 09:35:11 UTC (rev 24624)
+++ trunk/buildroot/package/libgtk2/libgtk2.mk 2008-12-31 09:35:15 UTC (rev 24625)
@@ -123,3 +123,7 @@
endif
$(eval $(call AUTOTARGETS,package,libgtk2))
+
+$(LIBGTK2_HOOK_POST_INSTALL):
+ $(INSTALL) -m 755 package/libgtk2/S26libgtk2 $(TARGET_DIR)/etc/init.d/
+ touch $@
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
@ 2009-01-14 22:11 ulf at uclibc.org
2009-01-15 8:36 ` Thomas Lundquist
0 siblings, 1 reply; 37+ messages in thread
From: ulf at uclibc.org @ 2009-01-14 22:11 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-14 22:11:13 +0000 (Wed, 14 Jan 2009)
New Revision: 24845
Log:
Force use of HOST_GLIB instead of /usr/bin for libgtk2
Modified:
trunk/buildroot/package/libgtk2/libgtk2.mk
Changeset:
Modified: trunk/buildroot/package/libgtk2/libgtk2.mk
===================================================================
--- trunk/buildroot/package/libgtk2/libgtk2.mk 2009-01-14 22:08:36 UTC (rev 24844)
+++ trunk/buildroot/package/libgtk2/libgtk2.mk 2009-01-14 22:11:13 UTC (rev 24845)
@@ -122,6 +122,8 @@
LIBGTK2_CONF_OPT += --disable-cups
endif
+LIBGTK2_MAKE_OPT = GLIB_GENMARSHAL=$(HOST_GLIB)/bin/glib-genmarshal GLIB_MKENUMS=$(HOST_GLIB)/bin/glib-mkenums
+
$(eval $(call AUTOTARGETS,package,libgtk2))
$(LIBGTK2_HOOK_POST_INSTALL):
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
2009-01-14 22:11 ulf at uclibc.org
@ 2009-01-15 8:36 ` Thomas Lundquist
2009-01-15 20:18 ` Ulf Samuelsson
0 siblings, 1 reply; 37+ messages in thread
From: Thomas Lundquist @ 2009-01-15 8:36 UTC (permalink / raw)
To: buildroot
On Wed, Jan 14, 2009 at 10:11:14PM +0000, ulf at uclibc.org wrote:
>
> Log:
> Force use of HOST_GLIB instead of /usr/bin for libgtk2
>
> Modified:
> trunk/buildroot/package/libgtk2/libgtk2.mk
I'll repeat myself, please answer.
Any reason we do this instead of using good old PATH?
Using PATH and having STAGING_DIR/BIN first in it will give the user an option
to choose wether he wants to use the host provided or his own.
So what is wrong with PATH and makes this hack a necessity?
Thomas.
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
2009-01-15 8:36 ` Thomas Lundquist
@ 2009-01-15 20:18 ` Ulf Samuelsson
2009-01-15 20:26 ` Peter Korsgaard
0 siblings, 1 reply; 37+ messages in thread
From: Ulf Samuelsson @ 2009-01-15 20:18 UTC (permalink / raw)
To: buildroot
tor 2009-01-15 klockan 09:36 +0100 skrev Thomas Lundquist:
> On Wed, Jan 14, 2009 at 10:11:14PM +0000, ulf at uclibc.org wrote:
> >
> > Log:
> > Force use of HOST_GLIB instead of /usr/bin for libgtk2
> >
> > Modified:
> > trunk/buildroot/package/libgtk2/libgtk2.mk
>
> I'll repeat myself, please answer.
>
> Any reason we do this instead of using good old PATH?
> Using PATH and having STAGING_DIR/BIN first in it will give the user an option
> to choose wether he wants to use the host provided or his own.
>
> So what is wrong with PATH and makes this hack a necessity?
It looks like the configure script for gtk is totally screwed up.
I have HOST_GLIB = /opt/gnome/bin on OpenSuSE in the path,
but configure does not look at the path, and decides
/usr/bin is where glib-genmarshal is.
There is also an ac_cv_path variable set in
the buildroot script, which is ignored.
BR
Ulf Samuelsson
>
>
> Thomas.
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
2009-01-15 20:18 ` Ulf Samuelsson
@ 2009-01-15 20:26 ` Peter Korsgaard
2009-01-15 20:37 ` Ulf Samuelsson
0 siblings, 1 reply; 37+ messages in thread
From: Peter Korsgaard @ 2009-01-15 20:26 UTC (permalink / raw)
To: buildroot
>>>>> "Ulf" == Ulf Samuelsson <ulf.samuelsson@atmel.com> writes:
>> So what is wrong with PATH and makes this hack a necessity?
Ulf> It looks like the configure script for gtk is totally screwed up.
Ulf> I have HOST_GLIB = /opt/gnome/bin on OpenSuSE in the path,
Ulf> but configure does not look at the path, and decides
Ulf> /usr/bin is where glib-genmarshal is.
Ulf> There is also an ac_cv_path variable set in
Ulf> the buildroot script, which is ignored.
So with other words your commit doesn't fix anything and should be
reverted?
Haven't we been through this glib-genmarshal stuff before?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
2009-01-15 20:26 ` Peter Korsgaard
@ 2009-01-15 20:37 ` Ulf Samuelsson
0 siblings, 0 replies; 37+ messages in thread
From: Ulf Samuelsson @ 2009-01-15 20:37 UTC (permalink / raw)
To: buildroot
tor 2009-01-15 klockan 21:26 +0100 skrev Peter Korsgaard:
> >>>>> "Ulf" == Ulf Samuelsson <ulf.samuelsson@atmel.com> writes:
>
> >> So what is wrong with PATH and makes this hack a necessity?
>
> Ulf> It looks like the configure script for gtk is totally screwed up.
> Ulf> I have HOST_GLIB = /opt/gnome/bin on OpenSuSE in the path,
> Ulf> but configure does not look at the path, and decides
> Ulf> /usr/bin is where glib-genmarshal is.
> Ulf> There is also an ac_cv_path variable set in
> Ulf> the buildroot script, which is ignored.
>
> So with other words your commit doesn't fix anything and should be
> reverted?
>
No, I am overriding the Makefile in this case.
It still does not build, but at least it finds glib-genmarshal.
> Haven't we been through this glib-genmarshal stuff before?
>
Yes, there are a number of packages where the location of
glib-genmarshal is set using ac_cv_path_...
It is done in libgtk2 as well - but ignored.
I have tried to check for spelling errors, but I can't find any.
--
Ulf Samuelsson
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
@ 2009-01-18 10:57 ulf at uclibc.org
2009-01-18 11:05 ` Peter Korsgaard
0 siblings, 1 reply; 37+ messages in thread
From: ulf at uclibc.org @ 2009-01-18 10:57 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-18 10:57:23 +0000 (Sun, 18 Jan 2009)
New Revision: 24900
Log:
Cleanup libgtk2, and prepare for 2.15
Modified:
trunk/buildroot/package/libgtk2/libgtk2.mk
Changeset:
Modified: trunk/buildroot/package/libgtk2/libgtk2.mk
===================================================================
--- trunk/buildroot/package/libgtk2/libgtk2.mk 2009-01-18 10:53:06 UTC (rev 24899)
+++ trunk/buildroot/package/libgtk2/libgtk2.mk 2009-01-18 10:57:23 UTC (rev 24900)
@@ -3,9 +3,13 @@
# libgtk2.0
#
#############################################################
-LIBGTK2_VERSION = 2.12.12
+#LIBGTK2_VERSION = 2.15.0
+LIBGTK2_VERSION_MAJOR:=2.12
+LIBGTK2_VERSION_MINOR:=12
+LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).$(LIBGTK2_VERSION_MINOR)
+
LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.bz2
-LIBGTK2_SITE = ftp://ftp.gtk.org/pub/gtk/2.12
+LIBGTK2_SITE = ftp://ftp.gtk.org/pub/gtk/$(LIBGTK2_VERSION_MAJOR)
LIBGTK2_AUTORECONF = NO
LIBGTK2_INSTALL_STAGING = YES
LIBGTK2_INSTALL_TARGET = YES
@@ -96,6 +100,10 @@
LIBGTK2_CONF_OPT += --without-x
endif
+# Buildroot does not support JPEG2000 library
+ifeq ($(LIBGTK2_VERSION_MAJOR),2.15)
+LIBGTK2_CONF_OPT += --without-libjasper
+endif
ifeq ($(BR2_PACKAGE_LIBPNG),y)
LIBGTK2_DEPENDENCIES += libpng
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
2009-01-18 10:57 ulf at uclibc.org
@ 2009-01-18 11:05 ` Peter Korsgaard
2009-01-18 13:11 ` Sven Neumann
0 siblings, 1 reply; 37+ messages in thread
From: Peter Korsgaard @ 2009-01-18 11:05 UTC (permalink / raw)
To: buildroot
>>>>> "ulf" == ulf <ulf@uclibc.org> writes:
ulf> Author: ulf
ulf> Date: 2009-01-18 10:57:23 +0000 (Sun, 18 Jan 2009)
ulf> New Revision: 24900
ulf> Log:
ulf> Cleanup libgtk2, and prepare for 2.15
ulf> Changeset:
ulf> Modified: trunk/buildroot/package/libgtk2/libgtk2.mk
ulf> ===================================================================
ulf> --- trunk/buildroot/package/libgtk2/libgtk2.mk 2009-01-18 10:53:06 UTC (rev 24899)
ulf> +++ trunk/buildroot/package/libgtk2/libgtk2.mk 2009-01-18 10:57:23 UTC (rev 24900)
ulf> +# Buildroot does not support JPEG2000 library
ulf> +ifeq ($(LIBGTK2_VERSION_MAJOR),2.15)
ulf> +LIBGTK2_CONF_OPT += --without-libjasper
ulf> +endif
I would prefer to leave that hunk out for now - It makes the history
easier to read if all 2.15 stuff is in the same commit.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
2009-01-18 11:05 ` Peter Korsgaard
@ 2009-01-18 13:11 ` Sven Neumann
2009-01-18 13:43 ` Daniel Laird
2009-01-18 13:48 ` Peter Korsgaard
0 siblings, 2 replies; 37+ messages in thread
From: Sven Neumann @ 2009-01-18 13:11 UTC (permalink / raw)
To: buildroot
Hi,
On Sun, 2009-01-18 at 12:05 +0100, Peter Korsgaard wrote:
> I would prefer to leave that hunk out for now - It makes the history
> easier to read if all 2.15 stuff is in the same commit.
Please do not include an unstable development build of GTK+ in
buildroot. No one would benefit from that. The latest stable release is
2.14.7. The 2.15.x releases are development snapshots. They may contain
API that is not yet final and they certainly have bugs.
Same holds true for GLib. Please use glib 2.18.4 and not a 2.19.x
development release.
Sven
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
2009-01-18 13:11 ` Sven Neumann
@ 2009-01-18 13:43 ` Daniel Laird
2009-01-18 13:48 ` Peter Korsgaard
1 sibling, 0 replies; 37+ messages in thread
From: Daniel Laird @ 2009-01-18 13:43 UTC (permalink / raw)
To: buildroot
Also as i mentioned the other day, directfb GTK support is not very good at the moment in 2.14.x so if we are going to bounce versions we need to have Config.in support for specifying MAJOR,MINOR to allow us to stick with 2.12 series until 2.14 series is fixed and then in 2.16 etc.....Daniel Lairddanieljlaird at hotmail.com> From: s.neumann at phase-zero.de> To: jacmet at uclibc.org> Date: Sun, 18 Jan 2009 14:11:52 +0100> CC: buildroot at uclibc.org> Subject: Re: [Buildroot] svn commit: trunk/buildroot/package/libgtk2> > Hi,> > On Sun, 2009-01-18 at 12:05 +0100, Peter Korsgaard wrote:> > > I would prefer to leave that hunk out for now - It makes the history> > easier to read if all 2.15 stuff is in the same commit.> > Please do not include an unstable development build of GTK+ in> buildroot. No one would benefit from that. The latest stable release is> 2.14.7. The 2.15.x releases are development snapshots. They may contain> API that is not yet final and they certainly have bugs.> > Same holds true for GLib. Please use glib 2.18.4 and not a 2.19.x> development release.> > > Sven> > > _______________________________________________> buildroot mailing list> buildroot at busybox.net> http://lists.busybox.net/mailman/listinfo/buildroot
_________________________________________________________________
Are you a PC?? Upload your PC story and show the world
http://clk.atdmt.com/UKM/go/122465942/direct/01/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.busybox.net/pipermail/buildroot/attachments/20090118/a4a9ae41/attachment.htm
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libgtk2
2009-01-18 13:11 ` Sven Neumann
2009-01-18 13:43 ` Daniel Laird
@ 2009-01-18 13:48 ` Peter Korsgaard
1 sibling, 0 replies; 37+ messages in thread
From: Peter Korsgaard @ 2009-01-18 13:48 UTC (permalink / raw)
To: buildroot
>>>>> "Sven" == Sven Neumann <s.neumann@phase-zero.de> writes:
Sven> Hi,
Sven> On Sun, 2009-01-18 at 12:05 +0100, Peter Korsgaard wrote:
>> I would prefer to leave that hunk out for now - It makes the history
>> easier to read if all 2.15 stuff is in the same commit.
Sven> Please do not include an unstable development build of GTK+ in
Sven> buildroot. No one would benefit from that. The latest stable release is
Sven> 2.14.7. The 2.15.x releases are development snapshots. They may contain
Sven> API that is not yet final and they certainly have bugs.
Sven> Same holds true for GLib. Please use glib 2.18.4 and not a 2.19.x
Sven> development release.
Agreed - Like I said in an earlier mail as well.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 37+ messages in thread
end of thread, other threads:[~2009-01-18 13:48 UTC | newest]
Thread overview: 37+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-06 6:25 [Buildroot] svn commit: trunk/buildroot/package/libgtk2 ulf at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2009-01-18 10:57 ulf at uclibc.org
2009-01-18 11:05 ` Peter Korsgaard
2009-01-18 13:11 ` Sven Neumann
2009-01-18 13:43 ` Daniel Laird
2009-01-18 13:48 ` Peter Korsgaard
2009-01-14 22:11 ulf at uclibc.org
2009-01-15 8:36 ` Thomas Lundquist
2009-01-15 20:18 ` Ulf Samuelsson
2009-01-15 20:26 ` Peter Korsgaard
2009-01-15 20:37 ` Ulf Samuelsson
2008-12-31 9:35 jacmet at uclibc.org
2008-12-26 15:36 jacmet at uclibc.org
2008-12-26 15:36 jacmet at uclibc.org
2008-10-27 9:45 jacmet at uclibc.org
2008-10-18 7:00 jacmet at uclibc.org
2008-08-26 13:45 laird at uclibc.org
2008-08-26 12:19 laird at uclibc.org
2008-08-26 13:15 ` Peter Korsgaard
2008-08-26 13:32 ` Daniel Laird
2008-08-26 13:38 ` Peter Korsgaard
2008-08-26 14:04 ` Bernhard Reutner-Fischer
2008-08-26 14:07 ` Bernhard Reutner-Fischer
2008-08-26 14:54 ` Peter Korsgaard
2008-08-26 13:48 ` Bernhard Reutner-Fischer
2008-08-26 14:07 ` Peter Korsgaard
2008-08-26 14:11 ` Bernhard Reutner-Fischer
2008-08-26 14:13 ` Daniel Laird
2008-08-26 13:42 ` Ormund Williams
2008-08-26 13:49 ` Daniel Laird
2008-07-08 10:09 ulf at uclibc.org
2008-07-07 11:09 ulf at uclibc.org
2007-02-01 19:20 andersen at uclibc.org
2007-01-17 11:27 jacmet at uclibc.org
2007-01-17 0:04 andersen at uclibc.org
2007-01-14 23:27 andersen at uclibc.org
2007-01-14 23:26 andersen at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox