summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Krier <cedk@gentoo.org>2007-01-06 23:34:16 +0000
committerCédric Krier <cedk@gentoo.org>2007-01-06 23:34:16 +0000
commit8f14caddac082144939b0b6e416a9ce73a53f9fa (patch)
tree34b5a913d178f544a4a5870d52140d290dbfe7a2 /net-p2p/mute
parentapp-backup/darbackup: Fixed the gentoo ebuild to enforce the use of dar32 || ... (diff)
downloadsunrise-8f14caddac082144939b0b6e416a9ce73a53f9fa.tar.gz
sunrise-8f14caddac082144939b0b6e416a9ce73a53f9fa.tar.bz2
sunrise-8f14caddac082144939b0b6e416a9ce73a53f9fa.zip
net-p2p/mute: Fix compilation for gcc4
svn path=/sunrise/; revision=2607
Diffstat (limited to 'net-p2p/mute')
-rw-r--r--net-p2p/mute/Manifest16
-rw-r--r--net-p2p/mute/files/mute-0.5-makefile.patch24
-rw-r--r--net-p2p/mute/mute-0.5.ebuild8
3 files changed, 31 insertions, 17 deletions
diff --git a/net-p2p/mute/Manifest b/net-p2p/mute/Manifest
index 5d7ed8557..c6d4769f1 100644
--- a/net-p2p/mute/Manifest
+++ b/net-p2p/mute/Manifest
@@ -6,15 +6,15 @@ AUX mute-0.5-configure.patch 524 RMD160 2816ebc0c16f9e6e821f089516e98136dceedc8f
MD5 3c8c175175ce9be6380dec65b298ef31 files/mute-0.5-configure.patch 524
RMD160 2816ebc0c16f9e6e821f089516e98136dceedc8f files/mute-0.5-configure.patch 524
SHA256 1d61f0abb6d5f117fbab0acc07937906a4a780a03aa39d22bf7641462a6a848e files/mute-0.5-configure.patch 524
-AUX mute-0.5-makefile.patch 1705 RMD160 b8e175161cd4946b01d6c8350aa7af7a3cafc35b SHA1 329742d2da6cb4ddafe6484557d8a1a3193506e4 SHA256 1b9e8ef5336ddbae636175dd3fa75e77ad27c64b1b211b3d49ca1a7c59e15112
-MD5 f577757db882baaa18663a1723a35f58 files/mute-0.5-makefile.patch 1705
-RMD160 b8e175161cd4946b01d6c8350aa7af7a3cafc35b files/mute-0.5-makefile.patch 1705
-SHA256 1b9e8ef5336ddbae636175dd3fa75e77ad27c64b1b211b3d49ca1a7c59e15112 files/mute-0.5-makefile.patch 1705
+AUX mute-0.5-makefile.patch 2873 RMD160 debecd4aeefae9b701d3b40f6fd6706abe729855 SHA1 076b8f6e6fbaedfc1bd2bcecef01586f2bb8d8c5 SHA256 9decc1f41c2cc2cbd04b7ff44f9a41bad4e71bd7902fc62ff1f316c4dd5e3ac9
+MD5 db68f2f5adf84de4e26e250e6bc6fe35 files/mute-0.5-makefile.patch 2873
+RMD160 debecd4aeefae9b701d3b40f6fd6706abe729855 files/mute-0.5-makefile.patch 2873
+SHA256 9decc1f41c2cc2cbd04b7ff44f9a41bad4e71bd7902fc62ff1f316c4dd5e3ac9 files/mute-0.5-makefile.patch 2873
DIST MUTE_fileSharing-0.5_UnixSource.tar.gz 717833 RMD160 5c0f534d80c1c38551d715597a2b76602552563e SHA1 4c7b3c74622601a0f7e1955aff86ad4ecd83db27 SHA256 13091fb3899549f5f4fd7cc2382c53b6560762025b25df858aca37e96b2646b3
-EBUILD mute-0.5.ebuild 2128 RMD160 24d1e7f1aed5d70629b29bef6a6c8151e9884a9b SHA1 0357f992205c4fc6460931d57c00b84201051d6a SHA256 6d54e25bfbdf926403dde20054dac91009bf0165ebc033d509a2b1e6086d7b35
-MD5 191315420dcc534c7002bf7fdbbb945d mute-0.5.ebuild 2128
-RMD160 24d1e7f1aed5d70629b29bef6a6c8151e9884a9b mute-0.5.ebuild 2128
-SHA256 6d54e25bfbdf926403dde20054dac91009bf0165ebc033d509a2b1e6086d7b35 mute-0.5.ebuild 2128
+EBUILD mute-0.5.ebuild 2224 RMD160 6aef45ed79ec3c992b85f6e2ded56bb5ce55ceb3 SHA1 0b24c9fcbae77363ebb2bf618f19f7715b842e4d SHA256 163a9f361a8d0811bac98f8041f706c6d17915b7f79bf54a187301414796a309
+MD5 1a968d612a517a0216b16bc1473b1b8b mute-0.5.ebuild 2224
+RMD160 6aef45ed79ec3c992b85f6e2ded56bb5ce55ceb3 mute-0.5.ebuild 2224
+SHA256 163a9f361a8d0811bac98f8041f706c6d17915b7f79bf54a187301414796a309 mute-0.5.ebuild 2224
MISC ChangeLog 469 RMD160 14b2a9610c3755afb443e08a3ec6a5d59782b510 SHA1 0fe043674fe1d6f9f266ea52d09f8f3875c500d2 SHA256 a2c80999eb8739dcf56a85219843e06b689555f9363c83420cd89d0ef7f01d05
MD5 b1f337246494ee696f5e751b7989ee41 ChangeLog 469
RMD160 14b2a9610c3755afb443e08a3ec6a5d59782b510 ChangeLog 469
diff --git a/net-p2p/mute/files/mute-0.5-makefile.patch b/net-p2p/mute/files/mute-0.5-makefile.patch
index 2682d57ae..09cca1097 100644
--- a/net-p2p/mute/files/mute-0.5-makefile.patch
+++ b/net-p2p/mute/files/mute-0.5-makefile.patch
@@ -1,6 +1,18 @@
+diff -ru MUTE_fileSharing-0.5_UnixSource~/MUTE/Makefile MUTE_fileSharing-0.5_UnixSource/MUTE/Makefile
+--- MUTE_fileSharing-0.5_UnixSource~/MUTE/Makefile 2007-01-07 00:26:40.000000000 +0100
++++ MUTE_fileSharing-0.5_UnixSource/MUTE/Makefile 2007-01-07 00:27:48.000000000 +0100
+@@ -26,7 +26,7 @@
+
+
+ all:
+- cd crypto; make; cd ../layers/messageRouting; make; cd ../pointToPoint; make; cd ../fileTransfer; make; cd ../../userInterface/fileTransferWebInterface; make; cd ../textBased; make; cd ../../otherApps/fileSharing; make; cd userInterface/textBased; make; cd ../../../..
++ cd crypto; cd ../layers/messageRouting; make; cd ../pointToPoint; make; cd ../fileTransfer; make; cd ../../userInterface/fileTransferWebInterface; make; cd ../textBased; make; cd ../../otherApps/fileSharing; make; cd userInterface/textBased; make; cd ../../../..
+
+ clean:
+ cd crypto; make clean; cd ../layers/messageRouting; make clean; cd ../pointToPoint; make clean; cd ../fileTransfer; make clean; cd ../../userInterface/fileTransferWebInterface; make clean; cd ../textBased; make clean; cd ../../otherApps/fileSharing; make clean; cd userInterface/textBased; make clean; cd ../../../..
diff -ru MUTE_fileSharing-0.5_UnixSource~/MUTE/Makefile.common MUTE_fileSharing-0.5_UnixSource/MUTE/Makefile.common
---- MUTE_fileSharing-0.5_UnixSource~/MUTE/Makefile.common 2006-09-04 11:54:51.000000000 +0200
-+++ MUTE_fileSharing-0.5_UnixSource/MUTE/Makefile.common 2006-09-04 19:32:46.000000000 +0200
+--- MUTE_fileSharing-0.5_UnixSource~/MUTE/Makefile.common 2007-01-07 00:26:40.000000000 +0100
++++ MUTE_fileSharing-0.5_UnixSource/MUTE/Makefile.common 2007-01-07 00:27:33.000000000 +0100
@@ -37,8 +37,9 @@
@@ -13,8 +25,8 @@ diff -ru MUTE_fileSharing-0.5_UnixSource~/MUTE/Makefile.common MUTE_fileSharing-
COMPILE = ${GXX} ${COMPILE_FLAGS} -c
diff -ru MUTE_fileSharing-0.5_UnixSource~/MUTE/Makefile.GnuLinuxX86 MUTE_fileSharing-0.5_UnixSource/MUTE/Makefile.GnuLinuxX86
---- MUTE_fileSharing-0.5_UnixSource~/MUTE/Makefile.GnuLinuxX86 2006-09-04 11:54:51.000000000 +0200
-+++ MUTE_fileSharing-0.5_UnixSource/MUTE/Makefile.GnuLinuxX86 2006-09-04 12:02:50.000000000 +0200
+--- MUTE_fileSharing-0.5_UnixSource~/MUTE/Makefile.GnuLinuxX86 2007-01-07 00:26:40.000000000 +0100
++++ MUTE_fileSharing-0.5_UnixSource/MUTE/Makefile.GnuLinuxX86 2007-01-07 00:27:33.000000000 +0100
@@ -22,7 +22,7 @@
@@ -25,8 +37,8 @@ diff -ru MUTE_fileSharing-0.5_UnixSource~/MUTE/Makefile.GnuLinuxX86 MUTE_fileSha
diff -ru MUTE_fileSharing-0.5_UnixSource~/MUTE/otherApps/fileSharing/userInterface/wxWindows/Makefile.all MUTE_fileSharing-0.5_UnixSource/MUTE/otherApps/fileSharing/userInterface/wxWindows/Makefile.all
---- MUTE_fileSharing-0.5_UnixSource~/MUTE/otherApps/fileSharing/userInterface/wxWindows/Makefile.all 2006-09-04 11:54:51.000000000 +0200
-+++ MUTE_fileSharing-0.5_UnixSource/MUTE/otherApps/fileSharing/userInterface/wxWindows/Makefile.all 2006-09-04 20:23:38.000000000 +0200
+--- MUTE_fileSharing-0.5_UnixSource~/MUTE/otherApps/fileSharing/userInterface/wxWindows/Makefile.all 2007-01-07 00:26:40.000000000 +0100
++++ MUTE_fileSharing-0.5_UnixSource/MUTE/otherApps/fileSharing/userInterface/wxWindows/Makefile.all 2007-01-07 00:27:33.000000000 +0100
@@ -47,6 +47,8 @@
ROOT_PATH = ../../../../..
diff --git a/net-p2p/mute/mute-0.5.ebuild b/net-p2p/mute/mute-0.5.ebuild
index 880c42157..6f46f8927 100644
--- a/net-p2p/mute/mute-0.5.ebuild
+++ b/net-p2p/mute/mute-0.5.ebuild
@@ -16,7 +16,8 @@ SLOT="0"
KEYWORDS="~x86"
IUSE="wxwindows"
-DEPEND="wxwindows? ( >=x11-libs/wxGTK-2.6 )"
+DEPEND="dev-libs/crypto++
+ wxwindows? ( >=x11-libs/wxGTK-2.6 )"
RDEPEND="${DEPEND}"
S=${WORKDIR}/${MY_P}
@@ -52,11 +53,12 @@ src_compile() {
# break the crypto at startup
filter-flags -fomit-frame-pointer
- emake GXX=$(tc-getCXX) || die "emake failed"
+ emake GXX=$(tc-getCXX) CRYPTO_LIB="/usr/lib/libcrypto++.a" || die "emake failed"
if use wxwindows; then
cd "${S}/MUTE/otherApps/fileSharing/userInterface/wxWindows"
- emake GXX="$(tc-getCXX)" WX_CONFIG="${WX_CONFIG}" || die "emake failed"
+ emake GXX="$(tc-getCXX)" WX_CONFIG="${WX_CONFIG}" \
+ CRYPTO_LIB="/usr/lib/libcrypto++.a" || die "emake failed"
fi
}