diff options
| author |   Christoph Mende <angelos@gentoo.org> | 2011-03-21 12:55:16 +0000 |
|---|---|---|
| committer | Christoph Mende <angelos@gentoo.org> | 2011-03-21 12:55:16 +0000 |
| commit | 9cea7b3e884b7a8f0e73ebf52fca1e2f67c396e0 (patch) | |
| tree | 2a903b57bbfa3649704b8650e7294c17a56a97de /dev-libs/libmix | |
| parent | Bug #359731 - Die early if get_libdir fails. (diff) | |
| download | gentoo-2-9cea7b3e884b7a8f0e73ebf52fca1e2f67c396e0.tar.gz gentoo-2-9cea7b3e884b7a8f0e73ebf52fca1e2f67c396e0.tar.bz2 gentoo-2-9cea7b3e884b7a8f0e73ebf52fca1e2f67c396e0.zip | |
Fixed build when CLIB is set (bug #353719)
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/libmix')
| -rw-r--r-- | dev-libs/libmix/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/libmix/files/libmix-2.05-gentoo2.patch | 26 | ||||
| -rw-r--r-- | dev-libs/libmix/libmix-2.05-r5.ebuild | 3 |
3 files changed, 33 insertions, 2 deletions
diff --git a/dev-libs/libmix/ChangeLog b/dev-libs/libmix/ChangeLog index 0aae3f833d08..052ac6a71b29 100644 --- a/dev-libs/libmix/ChangeLog +++ b/dev-libs/libmix/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/libmix # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/ChangeLog,v 1.15 2011/02/06 12:38:27 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/ChangeLog,v 1.16 2011/03/21 12:55:16 angelos Exp $ + + 21 Mar 2011; Christoph Mende <angelos@gentoo.org> libmix-2.05-r5.ebuild, + +files/libmix-2.05-gentoo2.patch: + Fixed build when CLIB is set (bug #353719) 06 Feb 2011; Mart Raudsepp <leio@gentoo.org> libmix-2.05.ebuild: Drop to ~mips diff --git a/dev-libs/libmix/files/libmix-2.05-gentoo2.patch b/dev-libs/libmix/files/libmix-2.05-gentoo2.patch new file mode 100644 index 000000000000..41efcc56eca2 --- /dev/null +++ b/dev-libs/libmix/files/libmix-2.05-gentoo2.patch @@ -0,0 +1,26 @@ +diff --git a/Makefile.in b/Makefile.in +index 434b8e5..a384b50 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -54,7 +54,7 @@ libmix++.a: mix/net.h $(OBJS_PP_A) + ${RANLIB} libmix++.a + + libtest: libtest.o +- $(CXX) $(CXXFLAGS) $(CCOPTS) -static -I. -L. libtest++.o -o libtest -lmix++ ${CLIB} ++ $(CXX) $(CXXFLAGS) $(CCOPTS) -static -I. -L. libtest++.o -o libtest -lmix++ $(CLIB) + + libtest.o: + $(CC) $(CCOPTS) $(CFLAGS) -c libtest.c -o libtest.o +diff --git a/configure.in b/configure.in +index 55fb7dd..e9bd924 100644 +--- a/configure.in ++++ b/configure.in +@@ -28,7 +28,7 @@ AC_ARG_WITH([net2], + AS_IF([test "x$with_net2" = "xyes"], [ + AC_DEFINE(LM_USE_NET2) + CLIB="-lnet-1.0 -lpcap" +-]) ++], [CLIB=""]) + + AC_ARG_ENABLE([static], + AS_HELP_STRING([--enable-static], [Build static libs])) diff --git a/dev-libs/libmix/libmix-2.05-r5.ebuild b/dev-libs/libmix/libmix-2.05-r5.ebuild index f9c308e1d8ec..c7e910b014f3 100644 --- a/dev-libs/libmix/libmix-2.05-r5.ebuild +++ b/dev-libs/libmix/libmix-2.05-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/libmix-2.05-r5.ebuild,v 1.1 2011/01/23 10:32:25 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/libmix-2.05-r5.ebuild,v 1.2 2011/03/21 12:55:16 angelos Exp $ EAPI="2" @@ -25,6 +25,7 @@ PATCHES=( "${FILESDIR}"/${P}-fix-pattern.patch "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-libnet.patch + "${FILESDIR}"/${P}-gentoo2.patch ) DOCS=( CHANGES ) |