diff options
| author |   Koen Kooi <koen@openembedded.org> | 2007-09-06 08:19:29 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-09-06 08:19:29 +0000 |
| commit | ef795cace24b1dadce6d5be42985920cd5e47f22 (patch) | |
| tree | e98eb43e38e57b50857c15e61519798c9170bf16 | |
| parent | 69be25f5d1e83ee279cc286e67ace024a2a30665 (diff) | |
| parent | 642473871f304eda91209da4bfa9ed6ce7dd72a1 (diff) | |
| download | openembedded-ef795cace24b1dadce6d5be42985920cd5e47f22.tar.gz | |
merge of '92277d433e8689dae991647461e4b7cbf7f3b2ab'
and 'ce91420f334d73451c6d91e2805ea5844eb6b4ae'
| -rw-r--r-- | conf/machine/i586-generic.conf | 2 | ||||
| -rw-r--r-- | conf/machine/i686-generic.conf | 2 | ||||
| -rw-r--r-- | conf/machine/include/tune-pentium.inc (renamed from conf/machine/include/tune-pentium.conf) | 0 | ||||
| -rw-r--r-- | conf/machine/include/tune-pentiumpro.inc (renamed from conf/machine/include/tune-pentiumpro.conf) | 0 | ||||
| -rw-r--r-- | packages/pango/pango.inc | 2 | ||||
| -rw-r--r-- | site/ix86-common | 3 |
6 files changed, 6 insertions, 3 deletions
diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf index 37d2945301..0ef522441b 100644 --- a/conf/machine/i586-generic.conf +++ b/conf/machine/i586-generic.conf @@ -25,5 +25,5 @@ MACHINE_TASK_PROVIDER = "task-base" #tune for pentium cpu -require conf/machine/include/tune-pentium.conf +require conf/machine/include/tune-pentium.inc diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf index 3defb29fa5..8ff87553ba 100644 --- a/conf/machine/i686-generic.conf +++ b/conf/machine/i686-generic.conf @@ -23,5 +23,5 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" MACHINE_TASK_PROVIDER = "task-base" #tune for pentium pro cpu -require conf/machine/include/tune-pentiumpro.conf +require conf/machine/include/tune-pentiumpro.inc diff --git a/conf/machine/include/tune-pentium.conf b/conf/machine/include/tune-pentium.inc index 7b1a517895..7b1a517895 100644 --- a/conf/machine/include/tune-pentium.conf +++ b/conf/machine/include/tune-pentium.inc diff --git a/conf/machine/include/tune-pentiumpro.conf b/conf/machine/include/tune-pentiumpro.inc index aa9a8dfa1d..aa9a8dfa1d 100644 --- a/conf/machine/include/tune-pentiumpro.conf +++ b/conf/machine/include/tune-pentiumpro.inc diff --git a/packages/pango/pango.inc b/packages/pango/pango.inc index e73fecbfb2..5189d950c1 100644 --- a/packages/pango/pango.inc +++ b/packages/pango/pango.inc @@ -8,7 +8,7 @@ EXTRA_AUTORECONF = "" SECTION = "x11/libs" -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc cairo" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv virtual/libx11 libxft gtk-doc cairo" PACKAGES_DYNAMIC = "pango-module-*" diff --git a/site/ix86-common b/site/ix86-common index 00c544f382..226e2e0f79 100644 --- a/site/ix86-common +++ b/site/ix86-common @@ -166,6 +166,9 @@ libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll} ac_cv_lbl_unaligned_fail=${ac_cv_lbl_unaligned_fail=no} ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes} +# libpcap +ac_cv_linux_vers=${ac_cv_linux_vers=2} + # libxfce4util with_broken_putenv=${with_broken_putenv=no} |