ccc fixes

5 files changed, 27 insertions, 6 deletions

diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog
index 152580e6e38f..f29f5f51bc8d 100644
--- a/sys-libs/cracklib/ChangeLog
+++ b/sys-libs/cracklib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/cracklib
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.20 2003/05/23 03:38:30 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.21 2003/05/24 18:48:15 taviso Exp $
+
+  24 May 2003; Tavis Ormandy <taviso@gentoo.org> cracklib-2.7-r6.ebuild,
+  cracklib-2.7-r7.ebuild, files/cracklib-2.7-dec-alpha-compiler.diff:
+  dont use -g with ccc, use -g3
 
 *cracklib-2.7-r7 (12 May 2003)
  
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index 005595fd85d9..e06360b5186a 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -1,6 +1,7 @@
-MD5 9e9f633d20819c559863cde1190edfd2 cracklib-2.7-r7.ebuild 1323
-MD5 6146a4de3649142fb03902194c0b6776 cracklib-2.7-r6.ebuild 1178
-MD5 7a4eac5f94bbcc8bf9c786fe5747ce67 ChangeLog 3022
+MD5 a58a00e11d2a568deb149be92f39862c cracklib-2.7-r7.ebuild 1432
+MD5 068ae494cca71f9913dc356479d526b0 cracklib-2.7-r6.ebuild 1286
+MD5 d5ff0ce69898c660d06124e349812c26 ChangeLog 3197
+MD5 85783b83e5bfa51190033895cfaf803e files/cracklib-2.7-dec-alpha-compiler.diff 333
 MD5 954e8e0d53c6f878366e472a90917356 files/cracklib-2.7-redhat.patch 1224
 MD5 9c566d6a249f8d02ad419aac76fffd66 files/cracklib-2.7-gentoo-new.diff 4244
 MD5 f27fad03a3939b6e405193b419b645a4 files/digest-cracklib-2.7-r6 63
diff --git a/sys-libs/cracklib/cracklib-2.7-r6.ebuild b/sys-libs/cracklib/cracklib-2.7-r6.ebuild
index 995347b95877..3f8d4a960dfb 100644
--- a/sys-libs/cracklib/cracklib-2.7-r6.ebuild
+++ b/sys-libs/cracklib/cracklib-2.7-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r6.ebuild,v 1.12 2003/04/05 18:13:17 frogger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r6.ebuild,v 1.13 2003/05/24 18:48:15 taviso Exp $
 
 IUSE=""
 
@@ -26,6 +26,8 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-redhat.patch
 	epatch ${FILESDIR}/${P}-gentoo-new.diff
+	[ "$ARCH" == "alpha" -a "${CC}" == "ccc" ] && \
+		epatch ${FILESDIR}/cracklib-${PV}-dec-alpha-compiler.diff
 }
 
 src_compile() {
diff --git a/sys-libs/cracklib/cracklib-2.7-r7.ebuild b/sys-libs/cracklib/cracklib-2.7-r7.ebuild
index db9eaf18ef82..085311ee4057 100644
--- a/sys-libs/cracklib/cracklib-2.7-r7.ebuild
+++ b/sys-libs/cracklib/cracklib-2.7-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r7.ebuild,v 1.4 2003/05/23 03:38:30 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r7.ebuild,v 1.5 2003/05/24 18:48:15 taviso Exp $
 
 IUSE=""
 
@@ -27,6 +27,9 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-redhat.patch
 	epatch ${FILESDIR}/${P}-gentoo-new.diff
+	[ "$ARCH" == "alpha" -a "${CC}" == "ccc" ] && \
+		epatch ${FILESDIR}/cracklib-${PV}-dec-alpha-compiler.diff
+
 }
 
 src_compile() {
diff --git a/sys-libs/cracklib/files/cracklib-2.7-dec-alpha-compiler.diff b/sys-libs/cracklib/files/cracklib-2.7-dec-alpha-compiler.diff
new file mode 100644
index 000000000000..a3394e1b1455
--- /dev/null
+++ b/sys-libs/cracklib/files/cracklib-2.7-dec-alpha-compiler.diff
@@ -0,0 +1,11 @@
+--- cracklib/Makefile	2003-05-24 19:38:26.000000000 +0100
++++ cracklib/Makefile	2003-05-24 19:35:14.000000000 +0100
+@@ -8,7 +8,7 @@
+ 
+ LIB	= libcrack.so
+ OBJ	= fascist.o packlib.o rules.o stringlib.o
++CFLAGS += -g3 -I../cracklib -DIN_CRACKLIB -fPIC
+-CFLAGS += -g -I../cracklib -DIN_CRACKLIB -fPIC
+ LD	= ld
+ 
+ $(LIB):	$(OBJ) Makefile