diff options
| author |   Daniel Ahlberg <aliz@gentoo.org> | 2004-02-22 19:07:34 +0000 |
|---|---|---|
| committer | Daniel Ahlberg <aliz@gentoo.org> | 2004-02-22 19:07:34 +0000 |
| commit | 14073e4b00b73f661aee50dd35ca963490408cb3 (patch) | |
| tree | cde923c56ad3a87f2e712012140d018c636ca27f /app-admin/msyslog | |
| parent | Remove arm keywords (Manifest recommit) (diff) | |
| download | gentoo-2-14073e4b00b73f661aee50dd35ca963490408cb3.tar.gz gentoo-2-14073e4b00b73f661aee50dd35ca963490408cb3.tar.bz2 gentoo-2-14073e4b00b73f661aee50dd35ca963490408cb3.zip | |
Closing #38311.
Diffstat (limited to 'app-admin/msyslog')
| -rw-r--r-- | app-admin/msyslog/ChangeLog | 7 | ||||
| -rw-r--r-- | app-admin/msyslog/files/msyslog-1.09a-fPIC.patch | 13 | ||||
| -rw-r--r-- | app-admin/msyslog/msyslog-1.09a-r1.ebuild | 21 |
3 files changed, 29 insertions, 12 deletions
diff --git a/app-admin/msyslog/ChangeLog b/app-admin/msyslog/ChangeLog index d0e865388299..8cb35af0bfd9 100644 --- a/app-admin/msyslog/ChangeLog +++ b/app-admin/msyslog/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-admin/msyslog -# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/msyslog/ChangeLog,v 1.17 2003/09/17 22:28:28 seemant Exp $ +# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/msyslog/ChangeLog,v 1.18 2004/02/22 19:07:34 aliz Exp $ + + 22 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> msyslog-1.09a-r1.ebuild: + Fix fPIC compilation, add amd64 keyword. Closing #38311. *msyslog-1.09a-r1 (17 Sep 2003) diff --git a/app-admin/msyslog/files/msyslog-1.09a-fPIC.patch b/app-admin/msyslog/files/msyslog-1.09a-fPIC.patch new file mode 100644 index 000000000000..4ed76193bac3 --- /dev/null +++ b/app-admin/msyslog/files/msyslog-1.09a-fPIC.patch @@ -0,0 +1,13 @@ +--- src/modules/Makefile.in 2004-02-22 19:03:05.685556772 +0000 ++++ src/modules/Makefile.in 2004-02-22 19:03:18.425421530 +0000 +@@ -46,8 +46,8 @@ + SHARED_PARAMS= @SHARED_PARAMS@ + + $(MLIBNAME): $(MSRCS) $(HASH_SRCS) ../config.h +- $(CC) $(CFLAGS) $(CPPFLAGS) $(DCCFLAGS) -c $(HASH_SRCS) +- $(CC) $(CFLAGS) $(CPPFLAGS) $(DCCFLAGS) -c $(MSRCS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(DCCFLAGS) -fPIC -c $(HASH_SRCS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(DCCFLAGS) -fPIC -c $(MSRCS) + $(CC) $(SHARED_PARAMS) -o $(MLIBNAME) $(MOBJS) $(HASH_OBJS) + + all: $(MLIBNAME) diff --git a/app-admin/msyslog/msyslog-1.09a-r1.ebuild b/app-admin/msyslog/msyslog-1.09a-r1.ebuild index d8cf8c6a8269..e5a94f6108e9 100644 --- a/app-admin/msyslog/msyslog-1.09a-r1.ebuild +++ b/app-admin/msyslog/msyslog-1.09a-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/msyslog/msyslog-1.09a-r1.ebuild,v 1.3 2003/09/23 20:20:55 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/msyslog/msyslog-1.09a-r1.ebuild,v 1.4 2004/02/22 19:07:34 aliz Exp $ IUSE="postgres mysql" @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/msyslog/${P}-src.tar.gz" SLOT="0" LICENSE="BSD" -KEYWORDS="x86 sparc ppc hppa ~mips" +KEYWORDS="x86 sparc ppc hppa ~mips ~amd64" DEPEND="virtual/glibc" RDEPEND="${DEPEND} @@ -25,18 +25,19 @@ RDEPEND="${DEPEND} PROVIDE="virtual/logger" src_unpack() { - unpack ${A} - cd ${S} + unpack ${A} ; cd ${S} + # fix paths for pidfile, config file, libdir, logdir... epatch ${FILESDIR}/${P}-gentoo.diff + epatch ${FILESDIR}/${P}-fPIC.patch } src_compile() { - local myconf - [ "${ARCH}" = "hppa" ] && CFLAGS="${CFLAGS} -fPIC" - use mysql || myconf="${myconf} --without-mysql" - use postgres || myconf="${myconf} --without-pgsql" - econf --with-daemon-name=msyslogd ${myconf} + econf --with-daemon-name=msyslogd \ + `use_with mysql` \ + `use_with postgres pgsql` \ + ${myconf} || die + emake || die } |