diff options
author | David Shakaryan <omp@gentoo.org> | 2007-06-24 18:54:28 +0000 |
---|---|---|
committer | David Shakaryan <omp@gentoo.org> | 2007-06-24 18:54:28 +0000 |
commit | c11c7e0183ce4d8b6b2f78472f7e4fb64acff3d9 (patch) | |
tree | b63e86ee6016e9e047a4d0d78e153bbf3b1792e6 /sys-libs/libixp | |
parent | Version bump, new version supports 64-bit natively and USB 2.0. (diff) | |
download | gentoo-2-c11c7e0183ce4d8b6b2f78472f7e4fb64acff3d9.tar.gz gentoo-2-c11c7e0183ce4d8b6b2f78472f7e4fb64acff3d9.tar.bz2 gentoo-2-c11c7e0183ce4d8b6b2f78472f7e4fb64acff3d9.zip |
Updated patch by Luke Renn. (bug #170439)
(Portage version: 2.1.3_rc3)
Diffstat (limited to 'sys-libs/libixp')
-rw-r--r-- | sys-libs/libixp/ChangeLog | 6 | ||||
-rw-r--r-- | sys-libs/libixp/files/libixp-0.2-shared-object.patch | 32 |
2 files changed, 26 insertions, 12 deletions
diff --git a/sys-libs/libixp/ChangeLog b/sys-libs/libixp/ChangeLog index d2c0fc67130a..79af2860816e 100644 --- a/sys-libs/libixp/ChangeLog +++ b/sys-libs/libixp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/libixp # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/ChangeLog,v 1.5 2007/02/23 01:36:28 omp Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/ChangeLog,v 1.6 2007/06/24 18:54:28 omp Exp $ + + 24 Jun 2007; David Shakaryan <omp@gentoo.org> + files/libixp-0.2-shared-object.patch: + Updated patch by Luke Renn. (bug #170439) 23 Feb 2007; David Shakaryan <omp@gentoo.org> libixp-0.2-r1.ebuild: Inherit eutils. (bug #161105) diff --git a/sys-libs/libixp/files/libixp-0.2-shared-object.patch b/sys-libs/libixp/files/libixp-0.2-shared-object.patch index c3318d02932e..4f5ab7c0d36e 100644 --- a/sys-libs/libixp/files/libixp-0.2-shared-object.patch +++ b/sys-libs/libixp/files/libixp-0.2-shared-object.patch @@ -1,6 +1,6 @@ -diff -u libixp-0.2_orig/config.mk libixp-0.2/config.mk ---- libixp-0.2_orig/config.mk 2006-12-27 17:59:09.000000000 +0600 -+++ libixp-0.2/config.mk 2007-01-09 10:57:38.699888388 +0600 +diff -uN libixp-0.2.bak/config.mk libixp-0.2/config.mk +--- libixp-0.2.bak/config.mk 2006-12-27 03:59:09.000000000 -0800 ++++ libixp-0.2/config.mk 2007-06-24 11:45:59.000000000 -0700 @@ -14,6 +14,7 @@ # flags CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" @@ -9,10 +9,10 @@ diff -u libixp-0.2_orig/config.mk libixp-0.2/config.mk #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" #LDFLAGS = -g ${LIBS} -diff -u libixp-0.2_orig/Makefile libixp-0.2/Makefile ---- libixp-0.2_orig/Makefile 2006-12-27 17:59:09.000000000 +0600 -+++ libixp-0.2/Makefile 2007-01-09 11:06:30.926977572 +0600 -@@ -9,13 +9,14 @@ +diff -uN libixp-0.2.bak/Makefile libixp-0.2/Makefile +--- libixp-0.2.bak/Makefile 2006-12-27 03:59:09.000000000 -0800 ++++ libixp-0.2/Makefile 2007-06-24 11:45:59.000000000 -0700 +@@ -9,18 +9,23 @@ OBJ = ${SRC:.c=.o} OBJIXPC = ${SRCIXPC:.c=.o} @@ -27,8 +27,18 @@ diff -u libixp-0.2_orig/Makefile libixp-0.2/Makefile + @echo "SOFLAGS = ${SOFLAGS}" @echo "LD = ${LD}" ++${OBJIXPC}: ++ @echo CC ${@:.o=.c} ++ @${CC} -c ${CFLAGS} ${@:.o=.c} ++ .c.o: -@@ -29,6 +30,10 @@ + @echo CC $< +- @${CC} -c ${CFLAGS} $< ++ @${CC} ${SOFLAGS} -c ${CFLAGS} $< + + ${OBJ}: config.mk ixp.h + +@@ -29,6 +34,10 @@ @${AR} $@ ${OBJ} @${RANLIB} $@ @@ -39,7 +49,7 @@ diff -u libixp-0.2_orig/Makefile libixp-0.2/Makefile ixpc: ${OBJIXPC} @echo LD $@ @${LD} -o $@ ${OBJIXPC} ${LDFLAGS} -lixp -@@ -36,7 +41,7 @@ +@@ -36,7 +45,7 @@ clean: @echo cleaning @@ -48,7 +58,7 @@ diff -u libixp-0.2_orig/Makefile libixp-0.2/Makefile dist: clean @echo creating dist tarball -@@ -55,6 +60,9 @@ +@@ -55,6 +64,9 @@ @mkdir -p ${DESTDIR}${PREFIX}/lib @cp -f libixp.a ${DESTDIR}${PREFIX}/lib @chmod 644 ${DESTDIR}${PREFIX}/lib/libixp.a @@ -58,7 +68,7 @@ diff -u libixp-0.2_orig/Makefile libixp-0.2/Makefile @echo installing ixpc to ${DESTDIR}${PREFIX}/bin @mkdir -p ${DESTDIR}${PREFIX}/bin @cp -f ixpc ${DESTDIR}${PREFIX}/bin -@@ -67,8 +75,12 @@ +@@ -67,8 +79,12 @@ uninstall: @echo removing header file from ${DESTDIR}${PREFIX}/include @rm -f ${DESTDIR}${PREFIX}/include/ixp.h |