mirror of
https://github.com/flatcar/scripts.git
synced 2025-11-20 18:12:01 +01:00
dialog: update to latest upstream version
This fixes a bogus bash runtime dependency and speeds up builds a bit by not building static libs at all. BUG=chromium-os:36114 TEST=build_image for daisy no longer installs bash TEST=cbuildbot for all paladins passed Change-Id: I609ea8e5ae5e692583b4af04bfc084e30b3757a6 Reviewed-on: https://gerrit.chromium.org/gerrit/37379 Commit-Ready: Mike Frysinger <vapier@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Mike Frysinger
Gerrit
parent
5b8593e53b
commit
b0f89bef3d
@ -1 +1 @@
|
||||
DIST dialog-1.1-20100428.tgz 400036 RMD160 fce98c3207ebdb155f01fb38df8b89de75f9b875 SHA1 6945b302bf5b107c12f6009c25699d265b45579c SHA256 3205574d988f600e8b5bf0a8833748fa26b76ec51bc9aa0a2a340067b51c7d01
|
||||
DIST dialog-1.1-20120706.tgz 444554 SHA256 305aa1000680aa87bb2148a725f9107ef4cd29dcd6185b44d079cb87cf0ce2f5 SHA512 90000dbdd33226767a45a66a60af25c0e743e78d938b329c980c929c18bcdc5e88031ef7f19ca8ab0471060ff2011aa7d52366cb094537d08ea64f5ef2e0b97d WHIRLPOOL b87d065bf9717b3cbf06e0307187f528c8824bef3b6f57e3eba3c6f36cc9a0ebe755e85fa472738826fc96da39f73371495883d7b1246608aa5c1a7de44c1196
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-1.1.20100428.ebuild,v 1.10 2011/08/17 16:15:43 vapier Exp $
|
||||
|
||||
EAPI=2
|
||||
|
||||
inherit eutils
|
||||
|
||||
MY_PV="${PV/1.1./1.1-}"
|
||||
S=${WORKDIR}/${PN}-${MY_PV}
|
||||
DESCRIPTION="tool to display dialog boxes from a shell"
|
||||
HOMEPAGE="http://invisible-island.net/dialog/dialog.html"
|
||||
SRC_URI="ftp://invisible-island.net/${PN}/${PN}-${MY_PV}.tgz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
|
||||
IUSE="examples minimal nls unicode"
|
||||
|
||||
RDEPEND=">=app-shells/bash-2.04-r3
|
||||
!unicode? ( >=sys-libs/ncurses-5.2-r5 )
|
||||
unicode? ( >=sys-libs/ncurses-5.2-r5[unicode] )"
|
||||
DEPEND="${RDEPEND}
|
||||
nls? ( sys-devel/gettext )
|
||||
!minimal? ( sys-devel/libtool )"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-shared.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local ncursesw
|
||||
use unicode && ncursesw="w"
|
||||
econf \
|
||||
$(use_enable nls) \
|
||||
$(use_with !minimal libtool) \
|
||||
--with-ncurses${ncursesw}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use minimal; then
|
||||
emake DESTDIR="${D}" install || die "install failed"
|
||||
else
|
||||
emake DESTDIR="${D}" install-full || die "install failed"
|
||||
fi
|
||||
|
||||
dodoc CHANGES README VERSION
|
||||
|
||||
if use examples; then
|
||||
docinto samples
|
||||
dodoc samples/*
|
||||
fi
|
||||
}
|
||||
66
sdk_container/src/third_party/portage-stable/dev-util/dialog/dialog-1.1.20120706.ebuild
vendored
Normal file
66
sdk_container/src/third_party/portage-stable/dev-util/dialog/dialog-1.1.20120706.ebuild
vendored
Normal file
@ -0,0 +1,66 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-1.1.20120706.ebuild,v 1.7 2012/11/05 20:03:55 vapier Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit multilib eutils
|
||||
|
||||
MY_PV="${PV/1.1./1.1-}"
|
||||
S=${WORKDIR}/${PN}-${MY_PV}
|
||||
DESCRIPTION="tool to display dialog boxes from a shell"
|
||||
HOMEPAGE="http://invisible-island.net/dialog/dialog.html"
|
||||
SRC_URI="ftp://invisible-island.net/${PN}/${PN}-${MY_PV}.tgz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
|
||||
IUSE="examples minimal nls static-libs unicode"
|
||||
|
||||
RDEPEND="
|
||||
>=sys-libs/ncurses-5.2-r5
|
||||
unicode? ( sys-libs/ncurses[unicode] )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
nls? ( sys-devel/gettext )
|
||||
!minimal? ( sys-devel/libtool )
|
||||
!<=sys-freebsd/freebsd-contrib-8.9999
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
sed -i configure -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' || die
|
||||
sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--disable-rpath-hack \
|
||||
$(use_enable nls) \
|
||||
$(use_with !minimal libtool) \
|
||||
--with-libtool-opts=$(usex static-libs '' '-shared') \
|
||||
--with-ncurses$(usex unicode w '')
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use minimal; then
|
||||
emake DESTDIR="${D}" install
|
||||
else
|
||||
emake DESTDIR="${D}" install-full
|
||||
fi
|
||||
|
||||
dodoc CHANGES README
|
||||
|
||||
if use examples; then
|
||||
docinto samples
|
||||
dodoc $( find samples -maxdepth 1 -type f )
|
||||
docinto samples/copifuncs
|
||||
dodoc $( find samples/copifuncs -maxdepth 1 -type f )
|
||||
docinto samples/install
|
||||
dodoc $( find samples/install -type f )
|
||||
fi
|
||||
|
||||
if ! use static-libs; then
|
||||
rm -f "${ED}"usr/$(get_libdir)/libdialog.{la,a}
|
||||
fi
|
||||
}
|
||||
@ -1,80 +0,0 @@
|
||||
--- dialog-1.1-20100428/aclocal.m4
|
||||
+++ dialog-1.1-20100428/aclocal.m4
|
||||
@@ -3460,6 +3460,7 @@
|
||||
])
|
||||
# common library maintenance symbols that are convenient for libtool scripts:
|
||||
LIB_CREATE='${AR} -cr'
|
||||
+LIB_LIBS=''
|
||||
LIB_OBJECT='${OBJECTS}'
|
||||
LIB_SUFFIX=.a
|
||||
LIB_PREP="$RANLIB"
|
||||
@@ -3494,7 +3495,8 @@
|
||||
AC_MSG_ERROR(Cannot find libtool)
|
||||
fi
|
||||
])dnl
|
||||
- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o'
|
||||
+ LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} ${LDFLAGS} -o'
|
||||
+ LIB_LIBS='$(LIBS)'
|
||||
LIB_OBJECT='${OBJECTS:.o=.lo}'
|
||||
LIB_SUFFIX=.la
|
||||
LIB_CLEAN='${LIBTOOL} --mode=clean'
|
||||
@@ -3547,6 +3549,7 @@
|
||||
AC_SUBST(LIBTOOL_OPTS)
|
||||
|
||||
AC_SUBST(LIB_CREATE)
|
||||
+AC_SUBST(LIB_LIBS)
|
||||
AC_SUBST(LIB_OBJECT)
|
||||
AC_SUBST(LIB_SUFFIX)
|
||||
AC_SUBST(LIB_PREP)
|
||||
--- dialog-1.1-20100428/configure
|
||||
+++ dialog-1.1-20100428/configure
|
||||
@@ -8305,6 +8305,7 @@
|
||||
|
||||
# common library maintenance symbols that are convenient for libtool scripts:
|
||||
LIB_CREATE='${AR} -cr'
|
||||
+LIB_LIBS=''
|
||||
LIB_OBJECT='${OBJECTS}'
|
||||
LIB_SUFFIX=.a
|
||||
LIB_PREP="$RANLIB"
|
||||
@@ -8409,7 +8410,8 @@
|
||||
echo "$as_me: error: Cannot find libtool" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o'
|
||||
+ LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} ${LDFLAGS} -o'
|
||||
+ LIB_LIBS='$(LIBS)'
|
||||
LIB_OBJECT='${OBJECTS:.o=.lo}'
|
||||
LIB_SUFFIX=.la
|
||||
LIB_CLEAN='${LIBTOOL} --mode=clean'
|
||||
@@ -13848,6 +13850,7 @@
|
||||
s,@LIBTOOL_CXX@,$LIBTOOL_CXX,;t t
|
||||
s,@LIBTOOL_OPTS@,$LIBTOOL_OPTS,;t t
|
||||
s,@LIB_CREATE@,$LIB_CREATE,;t t
|
||||
+s,@LIB_LIBS@,$LIB_LIBS,;t t
|
||||
s,@LIB_OBJECT@,$LIB_OBJECT,;t t
|
||||
s,@LIB_SUFFIX@,$LIB_SUFFIX,;t t
|
||||
s,@LIB_PREP@,$LIB_PREP,;t t
|
||||
--- dialog-1.1-20100428/makefile.in
|
||||
+++ dialog-1.1-20100428/makefile.in
|
||||
@@ -54,6 +54,7 @@
|
||||
LIBTOOL_CLEAN = @LIB_CLEAN@
|
||||
LIBTOOL_COMPILE = @LIB_COMPILE@
|
||||
LIBTOOL_CREATE = @LIB_CREATE@
|
||||
+LIBTOOL_LIBS = @LIB_LIBS@
|
||||
LIBTOOL_LINK = @LIB_LINK@
|
||||
LIBTOOL_INSTALL = @LIB_INSTALL@
|
||||
LIBTOOL_UNINSTALL = @LIB_UNINSTALL@
|
||||
@@ -140,11 +141,11 @@
|
||||
$(OBJECTS) : $(srcdir)/dialog.h $(srcdir)/dlg_keys.h dlg_config.h VERSION
|
||||
|
||||
$(LIB) : $(LIB_OBJECT)
|
||||
- $(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT)
|
||||
+ $(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT) $(LIBTOOL_LIBS)
|
||||
$(RANLIB) $@
|
||||
|
||||
dialog$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@
|
||||
- $(LINK) -o $@ dialog$o -L. -ldialog $(LDFLAGS) $(LIBS)
|
||||
+ $(LINK) $(LDFLAGS) -o $@ dialog$o -L. -ldialog $(LIBS)
|
||||
|
||||
clean \
|
||||
distclean \
|
||||
Loading…
x
Reference in New Issue
Block a user