diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-12-08 02:28:33 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-12-08 02:28:33 +0000 |
| commit | 04522bf31eaaf02f82ac5f4246fa67a5edc4aaaf (patch) | |
| tree | 663e7497367060e52fa26564ac5def2457bbe698 /sys-libs | |
| parent | Added ~sparc keyword as the version bump was inproperly done. (Manifest recom... (diff) | |
| download | gentoo-2-04522bf31eaaf02f82ac5f4246fa67a5edc4aaaf.tar.gz gentoo-2-04522bf31eaaf02f82ac5f4246fa67a5edc4aaaf.tar.bz2 gentoo-2-04522bf31eaaf02f82ac5f4246fa67a5edc4aaaf.zip | |
use the host cracklib utils if need be
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/cracklib/cracklib-2.7-r10.ebuild | 18 | ||||
| -rw-r--r-- | sys-libs/cracklib/files/cracklib-2.7-cross-compile.patch | 9 |
2 files changed, 19 insertions, 8 deletions
diff --git a/sys-libs/cracklib/cracklib-2.7-r10.ebuild b/sys-libs/cracklib/cracklib-2.7-r10.ebuild index 8c6c24995a00..25e1cf8c1f43 100644 --- a/sys-libs/cracklib/cracklib-2.7-r10.ebuild +++ b/sys-libs/cracklib/cracklib-2.7-r10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r10.ebuild,v 1.9 2004/12/07 09:46:11 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r10.ebuild,v 1.10 2004/12/08 02:28:33 vapier Exp $ inherit flag-o-matic eutils toolchain-funcs @@ -25,15 +25,16 @@ S="${WORKDIR}/${MY_P}" src_unpack() { unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}-redhat.patch" - epatch "${FILESDIR}/${P}-gentoo-new.diff" - epatch "${FILESDIR}/${P}-static-lib.patch" - epatch "${FILESDIR}/${P}-libdir.patch" + cd ${S} + epatch ${FILESDIR}/${P}-redhat.patch + epatch ${FILESDIR}/${P}-gentoo-new.diff + epatch ${FILESDIR}/${P}-static-lib.patch + epatch ${FILESDIR}/${P}-libdir.patch + epatch ${FILESDIR}/${P}-parallel-make.patch + epatch ${FILESDIR}/${P}-cross-compile.patch # add compressed dict support, taken from shadow-4.0.4.1 use uclibc && epatch ${FILESDIR}/${PN}-${PV}-gzip.patch - epatch "${FILESDIR}/${P}-parallel-make.patch" sed -i \ -e 's|/usr/dict/words|/usr/share/dict/words|' \ @@ -42,7 +43,8 @@ src_unpack() { if [ "${ARCH}" = "alpha" -a "${CC}" = "ccc" ] ; then sed -i \ - -e 's:CFLAGS += -g :CFLAGS += -g3 :' ${S}/cracklib/Makefile \ + -e 's:CFLAGS += -g :CFLAGS += -g3 :' \ + ${S}/cracklib/Makefile \ || die "sed ${S}/cracklib/Makefile failed" fi } diff --git a/sys-libs/cracklib/files/cracklib-2.7-cross-compile.patch b/sys-libs/cracklib/files/cracklib-2.7-cross-compile.patch new file mode 100644 index 000000000000..86af22dbaf71 --- /dev/null +++ b/sys-libs/cracklib/files/cracklib-2.7-cross-compile.patch @@ -0,0 +1,9 @@ +--- cracklib,2.7/Makefile.orig 2004-12-07 21:39:56.830924520 -0500 ++++ cracklib,2.7/Makefile 2004-12-07 21:40:24.097525749 -0500 +@@ -43,5 +43,5 @@ + $(MAKE) -C cracklib install + $(MAKE) -C util install + @echo 'if "sort" dies from lack of space, see "util/mkdict"' +- util/mkdict $(SRCDICTS) | LD_LIBRARY_PATH=cracklib util/packer $(DESTDIR)$(DICTPATH) ++ PATH="${PATH}:./util" mkdict $(SRCDICTS) | LD_LIBRARY_PATH=cracklib packer $(DESTDIR)$(DICTPATH) + touch installed |