diff options
| -rw-r--r-- | dev-libs/pwlib/files/opts.diff | 21 | ||||
| -rw-r--r-- | dev-libs/pwlib/pwlib-1.4.7.ebuild | 11 |
2 files changed, 10 insertions, 22 deletions
diff --git a/dev-libs/pwlib/files/opts.diff b/dev-libs/pwlib/files/opts.diff deleted file mode 100644 index 2970d86b2d4d..000000000000 --- a/dev-libs/pwlib/files/opts.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -urN pwlib/make/unix.mak pwlib-modified/make/unix.mak ---- pwlib/make/unix.mak Thu Jun 20 00:49:04 2002 -+++ pwlib-modified/make/unix.mak Tue Jul 23 00:56:39 2002 -@@ -636,7 +636,7 @@ - STDCCFLAGS += -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -malign-functions=0 - STDCCFLAGS += -malign-jumps=0 -malign-loops=0 - else --STDCCFLAGS += -mcpu=$(CPUTYPE) -+STDCCFLAGS += - endif - endif - endif -@@ -1201,7 +1201,7 @@ - - else - --OPTCCFLAGS += -O3 -DNDEBUG -+OPTCCFLAGS += -DNDEBUG - #OPTCCFLAGS += -DP_USE_INLINES=1 - #OPTCCFLAGS += -fconserve-space - ifneq ($(OSTYPE),Carbon) diff --git a/dev-libs/pwlib/pwlib-1.4.7.ebuild b/dev-libs/pwlib/pwlib-1.4.7.ebuild index 6ed439c62fe7..427f134b806c 100644 --- a/dev-libs/pwlib/pwlib-1.4.7.ebuild +++ b/dev-libs/pwlib/pwlib-1.4.7.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/dev-libs/pwlib/pwlib-1.4.7.ebuild,v 1.7 2003/03/27 02:02:04 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.4.7.ebuild,v 1.8 2003/04/01 12:45:27 liquidx Exp $ S=${WORKDIR}/${PN} @@ -39,6 +39,15 @@ src_unpack() { -e "s:-mcpu=\$(CPUTYPE)::" \ -e "s:-O3 -DNDEBUG:-DNDEBUG:" \ < unix.mak.orig > unix.mak + + # patch unix.mak so it doesn't require annoying upgrades + cp unix.mak unix.mak.orig2 + sed \ + -e "s:-DP_SSL -I\$(OPENSSLDIR)/include -I\$(OPENSSLDIR)/crypto:-DP_SSL:" \ + -e "s:^LDFLAGS.*\+= -L\$(OPENSSLDIR)/lib -L\$(OPENSSLDIR):LDFLAGS +=:" \ + < unix.mak.orig2 > unix.mak + + rm unix.mak.orig unix.mak.orig2 } src_compile() { |