On some machines resulting binaries contains "/usr/lib" before "/usr/local/lib/gcc45" in rpath and user gets something like this if tries to launch that binary: /libexec/ld-elf.so.1: /usr/lib/libstdc++.so.6: version GLIBCXX_3.4.10 required by /usr/local/bin/eiskaltdcpp-gtk not found Attached patch adds BUILD_DEPENDS on devel/chrpath, which is used to overwrite rpath in built binaries (-DCMAKE_INSTALL_RPATH only aappends directories to rpath) Fix: Patch attached Patch attached with submission follows: How-To-Repeat: make install clean -C /usr/ports/net-p2p/eiskaltdcpp-daemon && readelf -d /usr/local/bin/eiskaltdcpp-daemon | grep RPATH
Responsible Changed From-To: freebsd-ports-bugs->scheidell I'll take it
could you resubmit this? first one I tried failed. ../daemon failed. Patching file Makefile using Plan A... Hunk #1 succeeded at 7. Hunk #2 failed at 18. Hunk #3 succeeded at 66 with fuzz 1 (offset 1 line). 1 out of 3 hunks failed--saving rejects to Makefile.rej done %pwd /usr/home/scheidell/freebsd/ports/net-p2p/eiskaltdcpp-daemon -- Michael Scheidell, CTO o: 561-999-5000 d: 561-948-2259 >*| *SECNAP Network Security Corporation * Best Mobile Solutions Product of 2011 * Best Intrusion Prevention Product * Hot Company Finalist 2011 * Best Email Security Product * Certified SNORT Integrator
State Changed From-To: open->suspended waiting for updated patches from submitter/maintainer
On =D1=87=D1=82, 24 =D0=BB=D0=B8=D1=81 2011 16:44:15 Michael Scheidell wrot= e: > could you resubmit this? first one I tried failed. >=20 >=20 > ../daemon failed. >=20 > Patching file Makefile using Plan A... > Hunk #1 succeeded at 7. > Hunk #2 failed at 18. > Hunk #3 succeeded at 66 with fuzz 1 (offset 1 line). > 1 out of 3 hunks failed--saving rejects to Makefile.rej > done > %pwd > /usr/home/scheidell/freebsd/ports/net-p2p/eiskaltdcpp-daemon That's strange. Patch applies cleanly on few machines: # cd /usr/ports && fetch -o - 'http://www.freebsd.org/cgi/query- pr.cgi?pr=3D162340&getpatch=3D1' | patch -p1 =2D 100% of 3557 B 9460 kBps Hmm... Looks like a unified diff to me... The text leading up to this was: =2D------------------------- |diff --git a/net-p2p/eiskaltdcpp-daemon/Makefile b/net-p2p/eiskaltdcpp- daemon/Makefile |index fc688c0..3bfab50 100644 |--- a/net-p2p/eiskaltdcpp-daemon/Makefile |+++ b/net-p2p/eiskaltdcpp-daemon/Makefile =2D------------------------- Patching file net-p2p/eiskaltdcpp-daemon/Makefile using Plan A... Hunk #1 succeeded at 7. Hunk #2 succeeded at 18. Hunk #3 succeeded at 65. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: =2D------------------------- |diff --git a/net-p2p/eiskaltdcpp-gtk/Makefile b/net-p2p/eiskaltdcpp- gtk/Makefile |index 3f81028..40392af 100644 |--- a/net-p2p/eiskaltdcpp-gtk/Makefile |+++ b/net-p2p/eiskaltdcpp-gtk/Makefile =2D------------------------- Patching file net-p2p/eiskaltdcpp-gtk/Makefile using Plan A... Hunk #1 succeeded at 7. Hunk #2 succeeded at 19. Hunk #3 succeeded at 75. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: =2D------------------------- |diff --git a/net-p2p/eiskaltdcpp-lib/Makefile b/net-p2p/eiskaltdcpp- lib/Makefile |index 96cf777..f220523 100644 |--- a/net-p2p/eiskaltdcpp-lib/Makefile |+++ b/net-p2p/eiskaltdcpp-lib/Makefile =2D------------------------- Patching file net-p2p/eiskaltdcpp-lib/Makefile using Plan A... Hunk #1 succeeded at 7. Hunk #2 succeeded at 18. Hunk #3 succeeded at 78. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: =2D------------------------- |diff --git a/net-p2p/eiskaltdcpp-qt/Makefile b/net-p2p/eiskaltdcpp- qt/Makefile |index 6105321..32ea6f1 100644 |--- a/net-p2p/eiskaltdcpp-qt/Makefile |+++ b/net-p2p/eiskaltdcpp-qt/Makefile =2D------------------------- Patching file net-p2p/eiskaltdcpp-qt/Makefile using Plan A... Hunk #1 succeeded at 7. Hunk #2 succeeded at 21. Hunk #3 succeeded at 117. done
Let me clean my tinderbox and try again -- Michael Scheidell, CTO SECNAP Network Security -----Original message----- From: Maxim Ignatenko <gelraen.ua@gmail.com> To: Michael Scheidell <scheidell@freebsd.org> Cc: "bug-followup@freebsd.org" <bug-followup@freebsd.org> Sent: Thu, Nov 24, 2011 18:15:13 GMT+00:00 Subject: Re: ports/162340: Update: net-p2p/eiskaltdcpp-{lib,daemon,qt,gtk} On ÑÑ, 24 Ð»Ð¸Ñ 2011 16:44:15 Michael Scheidell wrote: > could you resubmit this? first one I tried failed. > > > ../daemon failed. > > Patching file Makefile using Plan A... > Hunk #1 succeeded at 7. > Hunk #2 failed at 18. > Hunk #3 succeeded at 66 with fuzz 1 (offset 1 line). > 1 out of 3 hunks failed--saving rejects to Makefile.rej > done > %pwd > /usr/home/scheidell/freebsd/ports/net-p2p/eiskaltdcpp-daemon That's strange. Patch applies cleanly on few machines: # cd /usr/ports && fetch -o - 'http://www.freebsd.org/cgi/query- pr.cgi?pr=162340&getpatch=1' | patch -p1 - 100% of 3557 B 9460 kBps Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/net-p2p/eiskaltdcpp-daemon/Makefile b/net-p2p/eiskaltdcpp- daemon/Makefile |index fc688c0..3bfab50 100644 |--- a/net-p2p/eiskaltdcpp-daemon/Makefile |+++ b/net-p2p/eiskaltdcpp-daemon/Makefile -------------------------- Patching file net-p2p/eiskaltdcpp-daemon/Makefile using Plan A... Hunk #1 succeeded at 7. Hunk #2 succeeded at 18. Hunk #3 succeeded at 65. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/net-p2p/eiskaltdcpp-gtk/Makefile b/net-p2p/eiskaltdcpp- gtk/Makefile |index 3f81028..40392af 100644 |--- a/net-p2p/eiskaltdcpp-gtk/Makefile |+++ b/net-p2p/eiskaltdcpp-gtk/Makefile -------------------------- Patching file net-p2p/eiskaltdcpp-gtk/Makefile using Plan A... Hunk #1 succeeded at 7. Hunk #2 succeeded at 19. Hunk #3 succeeded at 75. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/net-p2p/eiskaltdcpp-lib/Makefile b/net-p2p/eiskaltdcpp- lib/Makefile |index 96cf777..f220523 100644 |--- a/net-p2p/eiskaltdcpp-lib/Makefile |+++ b/net-p2p/eiskaltdcpp-lib/Makefile -------------------------- Patching file net-p2p/eiskaltdcpp-lib/Makefile using Plan A... Hunk #1 succeeded at 7. Hunk #2 succeeded at 18. Hunk #3 succeeded at 78. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/net-p2p/eiskaltdcpp-qt/Makefile b/net-p2p/eiskaltdcpp- qt/Makefile |index 6105321..32ea6f1 100644 |--- a/net-p2p/eiskaltdcpp-qt/Makefile |+++ b/net-p2p/eiskaltdcpp-qt/Makefile -------------------------- Patching file net-p2p/eiskaltdcpp-qt/Makefile using Plan A... Hunk #1 succeeded at 7. Hunk #2 succeeded at 21. Hunk #3 succeeded at 117. done
On 11/24/11 12:49 PM, Maxim Ignatenko wrote: > On ÑÑ, 24 Ð»Ð¸Ñ 2011 16:44:15 Michael Scheidell wrote: >> could you resubmit this? first one I tried failed. >> >> >> ../daemon failed. >> >> Patching file Makefile using Plan A... >> Hunk #1 succeeded at 7. >> Hunk #2 failed at 18. >> Hunk #3 succeeded at 66 with fuzz 1 (offset 1 line). >> 1 out of 3 hunks failed--saving rejects to Makefile.rej >> done >> %pwd found the problem.. this is a mega patch for four ports, and by applying it as written, it attempted to patch the ../Makefile (in ports/net-p2p). I edited the patch to put in full paths, and it applied. compiling in tinderbox now. -qt finished, waiting for the rest. taking a turkey break. -- Michael Scheidell, CTO o: 561-999-5000 d: 561-948-2259 >*| *SECNAP Network Security Corporation * Best Mobile Solutions Product of 2011 * Best Intrusion Prevention Product * Hot Company Finalist 2011 * Best Email Security Product * Certified SNORT Integrator
scheidell 2011-11-28 16:30:44 UTC FreeBSD ports repository Modified files: net-p2p/eiskaltdcpp-daemon Makefile net-p2p/eiskaltdcpp-gtk Makefile net-p2p/eiskaltdcpp-lib Makefile net-p2p/eiskaltdcpp-qt Makefile Log: PR: 162340 Submitted by: gelraen.ua@gmail.com Approved by: gabor (mentor) Feature safe: yes On some machines resulting binaries contains "/usr/lib" before "/usr/local/lib/gcc45" in rpath and user gets something like this if tries to launch that binary: /libexec/ld-elf.so.1: /usr/lib/libstdc++.so.6: version GLIBCXX_3.4.10 required by /usr/local/bin/eiskaltdcpp-gtk not found Attached patch adds BUILD_DEPENDS on devel/chrpath, which is used to overwrite rpath in built binaries (-DCMAKE_INSTALL_RPATH only aappends directories to rpath) Revision Changes Path 1.3 +7 -0 ports/net-p2p/eiskaltdcpp-daemon/Makefile 1.5 +7 -0 ports/net-p2p/eiskaltdcpp-gtk/Makefile 1.4 +7 -0 ports/net-p2p/eiskaltdcpp-lib/Makefile 1.4 +8 -0 ports/net-p2p/eiskaltdcpp-qt/Makefile _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: suspended->closed Committed with changes, thanks