summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-01-20 03:25:50 +0000
committerChris Larson <clarson@kergoth.com>2004-01-20 03:25:50 +0000
commit04050ed8b34f2c19582e4061484541cd4bfd3d4f (patch)
treed7252be1f6aa4b3e83262d5b460c0cfb1eaeef8f
parent113f6ef209e4a7409cf70f7c72c362e18c7fd975 (diff)
Merge http://openembedded.bkbits.net/packages
into linux.local:/home/kergoth/code/packages 2004/01/19 22:25:12-05:00 local!kergoth BUGFIX: explicit configure opts for samba to fix the build being affected greatly by development distro. BKrev: 400c9fbeSPs-emG4765HN2q_P1rEew
-rw-r--r--samba/samba_3.0.0.oe6
-rw-r--r--samba/samba_3.0.1.oe17
2 files changed, 21 insertions, 2 deletions
diff --git a/samba/samba_3.0.0.oe b/samba/samba_3.0.0.oe
index 6a4dbdc124..98a4ffbfde 100644
--- a/samba/samba_3.0.0.oe
+++ b/samba/samba_3.0.0.oe
@@ -1,5 +1,5 @@
-DEPENDS = virtual/libc
-RDEPENDS = libc6
+DEPENDS = virtual/libc readline
+RDEPENDS = libc6 readline
SRC_URI := http://us2.samba.org/samba/ftp/old-versions/samba-${PV}.tar.bz2 \
file://${FILESDIR}/configure.patch;patch=1
@@ -7,6 +7,8 @@ S := ${WORKDIR}/${P}/source
inherit autotools
+EXTRA_OECONF='--disable-cups --with-readline=${STAGING_LIBDIR}/.. \
+ --without-ads --without-automount'
do_configure_prepend () {
./script/mkversion.sh
if [ ! -e acinclude.m4 ]; then
diff --git a/samba/samba_3.0.1.oe b/samba/samba_3.0.1.oe
index e69de29bb2..8591fe514f 100644
--- a/samba/samba_3.0.1.oe
+++ b/samba/samba_3.0.1.oe
@@ -0,0 +1,17 @@
+DEPENDS = virtual/libc readline
+RDEPENDS = libc6 readline
+
+SRC_URI := http://us2.samba.org/samba/ftp/samba-${PV}.tar.bz2 \
+ file://${FILESDIR}/configure.patch;patch=1
+S := ${WORKDIR}/${P}/source
+
+inherit autotools
+
+EXTRA_OECONF='--disable-cups --with-readline=${STAGING_LIBDIR}/.. \
+ --without-ads --without-automount'
+do_configure_prepend () {
+ ./script/mkversion.sh
+ if [ ! -e acinclude.m4 ]; then
+ cat aclocal.m4 > acinclude.m4
+ fi
+}