app-backup/bacula: Major version bump

Package-Manager: Portage-2.3.7, Repoman-2.3.3
This commit is contained in:
Thomas Beierlein
2017-08-18 09:03:41 +02:00
parent d17d2ce9bb
commit df37253483
4 changed files with 507 additions and 0 deletions

View File

@@ -3,3 +3,4 @@ DIST bacula-7.0.5.tar.gz 3216406 SHA256 1457849eb33011b43371801b62ffa13d29bebe51
DIST bacula-7.4.4.tar.gz 3312271 SHA256 01a53d4501b17aeea0c25f0b63e49b4586ac221107834a6c471c43bc602c4c47 SHA512 37f1fd0d91f027fc12cd43b5e575abf0f8d9ccad805775bd308a06cff843b77cfc599e0d45eaf83536c1be669a5189c35744b5774adaefa606fed31d63888029 WHIRLPOOL 53a45d30b2188cacfa092dae4f791c4bb9c3cd4fc0f30fa2fc1e212dfdaccb1fc50a3b709f2d69e71458916916e887362f09a1aabe0219c34867bb6c4d93d0e9
DIST bacula-7.4.6.tar.gz 3312673 SHA256 4e8ea321b64cd49e29aecbdd3cb0dc10615302b18e2f26ffa7e7c82362c1cfed SHA512 2d8c47d184dd5d611bf3d209f0d39b0d2e60763bbb757a393c1ddb2fb361de855a4d53d4cbd76f4fda555cc7c069e79eefcb57fc01389a98dec6dc7815d0cde7 WHIRLPOOL d8831459a8f70a8a6b3b03b6b366ac62181ab2241f9bbf9fad46df95df1923873ec32795dd382c2c3fe66170b573d2ed54802e3784a47beed33aefd17ab84417
DIST bacula-7.4.7.tar.gz 3312991 SHA256 6f6075c2ca90a63cdeeca39b0b82a3ea07ce9999dedc68951d88bed7fbc0be40 SHA512 2dcffe3f02de8e7dedc11f58aeca58fb95486757579065564753376d3fab7699d7577c189d0d34f8490706d773cd6a95d42ef1f35facb95e6fff10dad085c0d0 WHIRLPOOL bc897086f8589d952c6b9dad7751278d21be5e51d9bbcfd2c697f95191ca1295127bb0f06b98c1f05a13e9f7cd0ef61ce7aba87f3cd8d0503168114c9ad96c93
DIST bacula-9.0.3.tar.gz 3951688 SHA256 ae8501960d43399bea13113274993637b6395d73d7d2c47f9b7a07cb4aa72251 SHA512 025cdcc3d92f2674cda7ed2f7d050a8826daf71d0f435d2b34b2514d3f03ab09a299a1882d9d9d51134445f8ba71bb38dc3fabf12d28877604a1b88d92623f7f WHIRLPOOL d82043a7de7e859e0e7059de71e29b046059e80a8c48ddba72ba783237a28fc339c34c51283f5c6a2de8d92e01ceb4a68729a023209677825596d7bed82acda4

View File

@@ -0,0 +1,418 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
inherit eutils multilib qt4-r2 systemd user libtool
MY_PV=${PV/_beta/-b}
MY_P=${PN}-${MY_PV}
DESCRIPTION="Featureful client/server network backup suite"
HOMEPAGE="http://www.bacula.org/"
SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt4 readline +sqlite ssl static tcpd vim-syntax X"
DEPEND="
dev-libs/gmp:0
!bacula-clientonly? (
postgres? ( dev-db/postgresql:=[threads] )
mysql? ( virtual/mysql )
sqlite? ( dev-db/sqlite:3 )
!bacula-nodir? ( virtual/mta )
)
qt4? (
dev-qt/qtsvg:4
x11-libs/qwt:5
)
logwatch? ( sys-apps/logwatch )
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
readline? ( sys-libs/readline:0 )
static? (
virtual/acl[static-libs]
sys-libs/zlib[static-libs]
dev-libs/lzo[static-libs]
sys-libs/ncurses:=[static-libs]
ssl? (
!libressl? ( dev-libs/openssl:0=[static-libs] )
libressl? ( dev-libs/libressl:0=[static-libs] )
)
)
!static? (
virtual/acl
sys-libs/zlib
dev-libs/lzo
sys-libs/ncurses:=
ssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
)
)"
RDEPEND="${DEPEND}
!bacula-clientonly? (
!bacula-nosd? (
sys-block/mtx
app-arch/mt-st
)
)
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
static? ( bacula-clientonly )"
S=${WORKDIR}/${MY_P}
pkg_setup() {
#XOR and !bacula-clientonly controlled by REQUIRED_USE
use mysql && export mydbtype="mysql"
use postgres && export mydbtype="postgresql"
use sqlite && export mydbtype="sqlite3"
# create the daemon group and user
if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
enewgroup bacula
einfo
einfo "The group 'bacula' has been created. Any users you add to this"
einfo "group have access to files created by the daemons."
einfo
fi
if use bacula-clientonly && use static && use qt4; then
ewarn
ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt4' useflag."
ewarn
fi
if ! use bacula-clientonly; then
if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
einfo
einfo "The user 'bacula' has been created. Please see the bacula manual"
einfo "for information about running bacula as a non-root user."
einfo
fi
fi
}
src_prepare() {
# adjusts default configuration files for several binaries
# to /etc/bacula/<config> instead of ./<config>
pushd src >&/dev/null || die
for f in console/console.c dird/dird.c filed/filed.c \
stored/bcopy.c stored/bextract.c stored/bls.c \
stored/bscan.c stored/btape.c stored/stored.c \
qt-console/main.cpp; do
sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
|| die "sed on ${f} failed"
done
popd >&/dev/null || die
# bug 466688 drop deprecated categories from Desktop file
sed -i -e 's/Application;//' scripts/bat.desktop.in || die
# bug 466690 Use CXXFLAGS instead of CFLAGS
sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
# drop automatic install of unneeded documentation (for bug 356499)
epatch "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
# bug #310087
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
# bug #311161
epatch "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
# bat needs to respect LDFLAGS
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-ldflags.patch
# bug #328701
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
epatch "${FILESDIR}"/9.0.2/${PN}-9.0.2-fix-static.patch
# fix soname in libbaccat.so bug #602952
epatch "${FILESDIR}/bacula-fix-sonames.patch"
# do not strip binaries
sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
# fix file not found error during make depend
epatch "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
# Fix systemd unit files:
# bug 497748
sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
# bug 504370
sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
# bug 584442 and 504368
sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
# fix bundled libtool (bug 466696)
# But first move directory with M4 macros out of the way.
# It is only needed by autoconf and gives errors during elibtoolize.
mv autoconf/libtool autoconf/libtool1 || die
elibtoolize
}
src_configure() {
local myconf=''
if use bacula-clientonly; then
myconf="${myconf} \
$(use_enable bacula-clientonly client-only) \
$(use_enable !static libtool) \
$(use_enable static static-cons) \
$(use_enable static static-fd)"
else
myconf="${myconf} \
$(use_enable !bacula-nodir build-dird) \
$(use_enable !bacula-nosd build-stored)"
# bug #311099
# database support needed by dir-only *and* sd-only
# build as well (for building bscan, btape, etc.)
myconf="${myconf}
--with-${mydbtype}"
if use mysql; then
myconf="${myconf} \
--disable-batch-insert"
else
myconf="${myconf} \
--enable-batch-insert"
fi
fi
# do not build bat if 'static' clientonly
if ! use bacula-clientonly || ! use static; then
myconf="${myconf} \
$(use_enable qt4 bat)"
fi
myconf="${myconf} \
$(use_with X x) \
$(use_enable !readline conio) \
$(use_enable readline) \
$(use_with readline readline /usr) \
$(use_with ssl openssl) \
$(use_enable ipv6) \
$(use_with tcpd tcp-wrappers)"
econf \
--enable-acl \
--libdir=/usr/$(get_libdir) \
--docdir=/usr/share/doc/${PF} \
--htmldir=/usr/share/doc/${PF}/html \
--with-pid-dir=/var/run \
--sysconfdir=/etc/bacula \
--with-subsys-dir=/var/lock/subsys \
--with-working-dir=/var/lib/bacula \
--with-logdir=/var/lib/bacula \
--with-scriptdir=/usr/libexec/bacula \
--with-systemd=$(systemd_get_unitdir) \
--with-dir-user=bacula \
--with-dir-group=bacula \
--with-sd-user=root \
--with-sd-group=bacula \
--with-fd-user=root \
--with-fd-group=bacula \
--enable-smartalloc \
--disable-afs \
--host=${CHOST} \
${myconf}
# correct configuration for QT based bat
if use qt4 ; then
pushd src/qt-console
eqmake4
popd
fi
}
src_compile() {
# Make build log verbose (bug #447806)
emake NO_ECHO=""
}
src_install() {
emake DESTDIR="${D}" install
doicon scripts/bacula.png
# install bat icon and desktop file when enabled
# (for some reason ./configure doesn't pick this up)
if use qt4 && ! use static ; then
doicon src/qt-console/images/bat_icon.png
domenu scripts/bat.desktop
fi
# remove some scripts we don't need at all
rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
# rename statically linked apps
if use bacula-clientonly && use static ; then
pushd "${D}"/usr/sbin || die
mv static-bacula-fd bacula-fd || die
mv static-bconsole bconsole || die
popd || die
fi
# extra files which 'make install' doesn't cover
if ! use bacula-clientonly; then
# the database update scripts
diropts -m0750
insinto /usr/libexec/bacula/updatedb
insopts -m0754
doins "${S}"/updatedb/*
fperms 0640 /usr/libexec/bacula/updatedb/README
# the logrotate configuration
# (now unconditional wrt bug #258187)
diropts -m0755
insinto /etc/logrotate.d
insopts -m0644
newins "${S}"/scripts/logrotate bacula
# the logwatch scripts
if use logwatch; then
diropts -m0750
dodir /usr/share/logwatch/scripts/services
dodir /usr/share/logwatch/scripts/shared
dodir /etc/logwatch/conf/logfiles
dodir /etc/logwatch/conf/services
pushd "${S}"/scripts/logwatch >&/dev/null || die
emake DESTDIR="${D}" install
popd >&/dev/null || die
fi
fi
if ! use qt4; then
rm -vf "${D}"/usr/share/man/man1/bat.1*
fi
rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
if use bacula-clientonly || use bacula-nodir; then
rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
rm -vf "${D}"/usr/libexec/bacula/create_*_database
rm -vf "${D}"/usr/libexec/bacula/drop_*_database
rm -vf "${D}"/usr/libexec/bacula/make_*_tables
rm -vf "${D}"/usr/libexec/bacula/update_*_tables
rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
fi
if use bacula-clientonly || use bacula-nosd; then
rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
rm -vf "${D}"/usr/share/man/man8/bcopy.8*
rm -vf "${D}"/usr/share/man/man8/bextract.8*
rm -vf "${D}"/usr/share/man/man8/bls.8*
rm -vf "${D}"/usr/share/man/man8/bscan.8*
rm -vf "${D}"/usr/share/man/man8/btape.8*
rm -vf "${D}"/usr/libexec/bacula/disk-changer
rm -vf "${D}"/usr/libexec/bacula/mtx-changer
rm -vf "${D}"/usr/libexec/bacula/dvd-handler
fi
# documentation
dodoc ChangeLog ReleaseNotes SUPPORT
# install examples (bug #457504)
if use examples; then
docinto examples/
dodoc -r examples/*
fi
# vim-files
if use vim-syntax; then
insinto /usr/share/vim/vimfiles/syntax
doins scripts/bacula.vim
insinto /usr/share/vim/vimfiles/ftdetect
newins scripts/filetype.vim bacula_ft.vim
fi
# setup init scripts
myscripts="bacula-fd"
if ! use bacula-clientonly; then
if ! use bacula-nodir; then
myscripts="${myscripts} bacula-dir"
fi
if ! use bacula-nosd; then
myscripts="${myscripts} bacula-sd"
fi
fi
for script in ${myscripts}; do
# copy over init script and config to a temporary location
# so we can modify them as needed
cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
# now set the database dependancy for the director init script
case "${script}" in
bacula-dir)
case "${mydbtype}" in
sqlite3)
# sqlite databases don't have a daemon
sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
;;
*)
# all other databases have daemons
sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
;;
esac
;;
*)
;;
esac
# install init script and config
newinitd "${T}/${script}".initd "${script}"
newconfd "${T}/${script}".confd "${script}"
done
systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
# make sure the working directory exists
diropts -m0750
keepdir /var/lib/bacula
# make sure bacula group can execute bacula libexec scripts
fowners -R root:bacula /usr/libexec/bacula
}
pkg_postinst() {
if use bacula-clientonly; then
fowners root:bacula /var/lib/bacula
else
fowners bacula:bacula /var/lib/bacula
fi
if ! use bacula-clientonly && ! use bacula-nodir; then
einfo
einfo "If this is a new install, you must create the ${mydbtype} databases with:"
einfo " /usr/libexec/bacula/create_${mydbtype}_database"
einfo " /usr/libexec/bacula/make_${mydbtype}_tables"
einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges"
einfo
ewarn "ATTENTION!"
ewarn "The format of the database may have changed."
ewarn "If you just upgraded from a version below 9.0.0 you must run"
ewarn "'update_bacula_tables' now."
ewarn "Make sure to have a backup of your catalog before."
ewarn
fi
if use sqlite; then
einfo
einfo "Be aware that Bacula does not officially support SQLite database anymore."
einfo "Best use it only for a client-only installation. See Bug #445540."
einfo
fi
einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
einfo "you have to enable 'USE=qt4'."
einfo
}

View File

@@ -0,0 +1,63 @@
--- src/console/Makefile.in.orig 2017-07-25 19:03:05.664760298 +0200
+++ src/console/Makefile.in 2017-07-25 19:05:43.576706091 +0200
@@ -24,6 +24,7 @@
CONSSRCS = console.c console_conf.c authenticate.c @CONS_SRC@
CONSOBJS = console.o console_conf.o authenticate.o @CONS_OBJ@
JSONOBJS = bbconsjson.o console_conf.o
+ZLIBS=@ZLIBS@
# these are the objects that are changed by the .configure process
EXTRAOBJS = @OBJLIST@
@@ -50,18 +51,18 @@
bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
- $(OPENSSL_LIBS)
+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
+ $(OPENSSL_LIBS) $(LIBS)
bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \
- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
- $(OPENSSL_LIBS)
+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
+ $(OPENSSL_LIBS) $(LIBS)
static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
- $(OPENSSL_LIBS)
+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
+ $(OPENSSL_LIBS) $(LIBS)
strip $@
--- src/filed/Makefile.in.orig 2017-07-25 19:09:19.655852979 +0200
+++ src/filed/Makefile.in 2017-07-25 19:11:39.519558592 +0200
@@ -69,19 +69,19 @@
bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
- $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
+ $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
bfdjson: Makefile $(JSONOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(JSONOBJS) \
- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
+ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
- $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
+ $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
strip $@
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status

View File

@@ -0,0 +1,25 @@
# If upgrading the old libraries gets linked first. So fix order of
# lib search path.
--- src/console/Makefile.in.orig 2017-07-26 15:03:07.000000000 +0200
+++ src/console/Makefile.in 2017-07-23 18:31:57.000000000 +0200
@@ -49,17 +49,17 @@
bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
+ $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
$(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
$(OPENSSL_LIBS)
bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(JSONOBJS) \
+ $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \
$(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
$(OPENSSL_LIBS)
static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- $(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
+ $(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
$(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
$(OPENSSL_LIBS)
strip $@