Fixed broken static support. closes #23998.

3 files changed, 93 insertions, 16 deletions

diff --git a/app-admin/bacula/ChangeLog b/app-admin/bacula/ChangeLog
index 343a5ca0c42c..1171c0f3aece 100644
--- a/app-admin/bacula/ChangeLog
+++ b/app-admin/bacula/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/bacula
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/ChangeLog,v 1.17 2004/03/19 22:54:43 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/ChangeLog,v 1.18 2004/03/21 17:46:46 zul Exp $
+
+  21 Mar 2004; Chuck Short <zul@gentoo.org> bacula-1.32f-r5.ebuild,
+  bacula-1.32f.ebuild:
+  Fixed broken static support. Closes #23998.
 
   16 Mar 2004; Chuck Short <zul@gentoo.org> bacula-1.32f.ebuild:
   Added ~sparc keyword
diff --git a/app-admin/bacula/bacula-1.32f-r5.ebuild b/app-admin/bacula/bacula-1.32f-r5.ebuild
index 8763f45c0e05..bc744455eb39 100644
--- a/app-admin/bacula/bacula-1.32f-r5.ebuild
+++ b/app-admin/bacula/bacula-1.32f-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.32f-r5.ebuild,v 1.2 2004/03/19 22:54:43 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.32f-r5.ebuild,v 1.3 2004/03/21 17:46:46 zul Exp $
 
 MY_P="bacula-1.32f-5"
 S="${WORKDIR}/${MY_P}"
@@ -38,10 +38,10 @@ src_compile() {
 		&& myconf="${myconf} --enable-client-only"
 
 	#might be handy to have static bins in certain situations ...
-	use static \
-		&& myconf="${myconf} --enable-static-tools \
-		--enable-static-fd --enable-static-sd \
-		--enable-static-dir --enable-static-cons"
+	#use static \
+	#	&& myconf="${myconf} --enable-static-tools \
+	#	--enable-static-fd --enable-static-sd \
+	#	--enable-static-dir --enable-static-cons"
 	myconf="
 		`use_enable readline`
 		`use_enable gnome`
@@ -77,17 +77,56 @@ src_compile() {
 		--host=${CHOST} ${myconf} || die "bad ./configure"
 
 	emake || die "compile problem"
+
+	if use static
+	then
+		cd ${S}/src/filed
+		make static-baula-fd
+		cd ${S}/src/console
+		make static-console
+		cd ${S}/src/dird
+		make static-bacula-dir
+		if use gnome
+		then
+		  cd ${S}/src/gnome-console
+		  make static-gnome-console
+		fi
+		cd ${S}/src/stored
+		make static-bacula-sd
+	fi
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
+
+	if use static
+	then
+		cd ${S}/src/filed
+		cp static-bacula-fd ${D}/usr/sbin/bacula-fd
+		cd ${S}/src/console
+		cp static-console ${D}/usr/sbin/console
+		cd ${S}/src/dird
+		cp static-bacula-dir ${D}/usr/sbin/bacula-dir
+		if use gnome
+		then
+			cd ${S}/src/gnome-console
+			cp static-gnome-console ${D}/usr/sbin/gnome-console
+		fi
+		cd ${S}/src/storge
+		cp static-bacula-sd ${D}/usr/sbin/bacula-sd
+	fi
+
 	rm -rf ${D}/var #empty dir
 
-	dodoc ABOUT-NLS COPYING ChangeLog CheckList INSTALL \
-		README ReleaseNotes kernstodo doc/bacula.pdf
-	cp -a examples ${D}/usr/share/doc/${PF}
+	for a in ${S}/{ABOUT-NLS,COPYING,Changelog,CheckList,INSTALL \
+			README,ReleaseNotes,kernstodo,doc/bacula.pdf}
+	do
+		dodoc $a
+	done
+
+	cp -a ${S}/examples ${D}/usr/share/doc/${PF}
 	chown -R root:root ${D}/usr/share/doc/${PF} #hrmph :\
-	dohtml -r doc/html-manual doc/home-page
+	dohtml -r ${S}/doc/html-manual doc/home-page
 
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/bacula-init bacula
diff --git a/app-admin/bacula/bacula-1.32f.ebuild b/app-admin/bacula/bacula-1.32f.ebuild
index e3a4d05707d0..1ef9b77a6040 100644
--- a/app-admin/bacula/bacula-1.32f.ebuild
+++ b/app-admin/bacula/bacula-1.32f.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.32f.ebuild,v 1.4 2004/03/16 18:57:25 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.32f.ebuild,v 1.5 2004/03/21 17:46:46 zul Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="featureful client/server network backup suite"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/bacula/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
+KEYWORDS="~x86 ~ppc"
 IUSE="readline tcpd ssl gnome mysql sqlite X static"
 
 #theres a local sqlite use flag. use it -OR- mysql, not both.
@@ -49,10 +49,6 @@ src_compile() {
 		&& myconf="${myconf} --enable-client-only"
 
 	#might be handy to have static bins in certain situations ...
-	use static \
-		&& myconf="${myconf} --enable-static-tools \
-		--enable-static-fd --enable-static-sd \
-		--enable-static-dir --enable-static-cons"
 	myconf="
 		`use_enable readline`
 		`use_enable gnome`
@@ -88,10 +84,48 @@ src_compile() {
 		--host=${CHOST} ${myconf} || die "bad ./configure"
 
 	emake || die "compile problem"
+
+	if use static
+	then
+		cd ${S}/src/files
+		make static-bacula-fd
+		cd ${S}/src/console
+		make static-console
+		cd ${S}/src/dird
+		make static-bacula-dir
+		if use gnome
+		then
+		  cd ${S}/src/gnome-console
+		  make static-gnome-console
+		fi
+		cd ${S}/src/storged
+		make static-bacula-sd
+	fi
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
+
+	if use static
+	then
+		cd ${S}/src/filed
+		cp static-bacula-fd ${D}/usr/sbin/bacula-fd
+		rm -f ${D}/usr/sbin/static-bacula-fd
+		cd ${S}/src/console
+		cp static-console ${D}/usr/sbin/console
+		cd ${S}/src/dird
+		cp static-bacula-dir  ${D}/usr/sbin/bacula-dir
+		rm -f ${D}/usr/sbin/static-bacula-dir
+		if use gnome
+		then
+		   cd ${S}/src/gnome-console
+		   cp static-gnome-console ${D}/usr/sbin/gnome-console
+		fi
+		cd ${S}/src/storage
+		cp static-bacula-sd ${D}/usr/sbin/bacula-sd
+		rm -f ${D}/usr/sbin/static-bacula-sd
+	fi
+
 	rm -rf ${D}/var #empty dir
 
 	dodoc ABOUT-NLS COPYING ChangeLog CheckList INSTALL \