diff options
| author | sobomax <sobomax@FreeBSD.org> | 2002-02-03 07:16:38 +0000 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2002-02-03 07:16:38 +0000 |
| commit | 594ce5050ba78dedca2f1fb70e88e855b65b761b (patch) | |
| tree | d9d86277b106dc3e35ab98ceff2f44f5f1e270e1 /deskutils | |
| parent | dbaad9994576c2847f9c9f9011c559ed1e1adb84 (diff) | |
| download | FreeBSD-ports-594ce5050ba78dedca2f1fb70e88e855b65b761b.zip FreeBSD-ports-594ce5050ba78dedca2f1fb70e88e855b65b761b.tar.gz | |
Fix patch, so that it doesn't break some ports on 4-STABLE.
Submitted by: Joe Macus Clarke <marcus@marcuscom.com>
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/mrproject/files/patch-ltmain.sh | 14 | ||||
| -rw-r--r-- | deskutils/planner/files/patch-ltmain.sh | 14 |
2 files changed, 16 insertions, 12 deletions
diff --git a/deskutils/mrproject/files/patch-ltmain.sh b/deskutils/mrproject/files/patch-ltmain.sh index 13a95af..91713d2 100644 --- a/deskutils/mrproject/files/patch-ltmain.sh +++ b/deskutils/mrproject/files/patch-ltmain.sh @@ -1,13 +1,15 @@ $FreeBSD$ ---- ltmain.sh.orig Sat Jan 26 02:53:27 2002 -+++ ltmain.sh Tue Jan 29 09:13:29 2002 -@@ -1037,8 +1037,14 @@ +--- ltmain.sh.orig Wed Jan 23 11:38:40 2002 ++++ ltmain.sh Sun Feb 3 01:44:17 2002 +@@ -1037,8 +1037,16 @@ continue ;; + -pthread) ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" + compiler_flags="$compiler_flags -pthread" + continue + ;; @@ -18,7 +20,7 @@ $FreeBSD$ continue ;; -@@ -2416,6 +2422,9 @@ +@@ -2412,6 +2420,9 @@ *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; @@ -27,8 +29,8 @@ $FreeBSD$ + ;; *) # Add libc to deplibs on all other systems if necessary. - if test $build_libtool_need_lc = "yes"; then -@@ -4183,10 +4192,12 @@ + if test "$build_libtool_need_lc" = "yes"; then +@@ -4179,10 +4190,12 @@ fi # Install the pseudo-library for information purposes. diff --git a/deskutils/planner/files/patch-ltmain.sh b/deskutils/planner/files/patch-ltmain.sh index 13a95af..91713d2 100644 --- a/deskutils/planner/files/patch-ltmain.sh +++ b/deskutils/planner/files/patch-ltmain.sh @@ -1,13 +1,15 @@ $FreeBSD$ ---- ltmain.sh.orig Sat Jan 26 02:53:27 2002 -+++ ltmain.sh Tue Jan 29 09:13:29 2002 -@@ -1037,8 +1037,14 @@ +--- ltmain.sh.orig Wed Jan 23 11:38:40 2002 ++++ ltmain.sh Sun Feb 3 01:44:17 2002 +@@ -1037,8 +1037,16 @@ continue ;; + -pthread) ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" + compiler_flags="$compiler_flags -pthread" + continue + ;; @@ -18,7 +20,7 @@ $FreeBSD$ continue ;; -@@ -2416,6 +2422,9 @@ +@@ -2412,6 +2420,9 @@ *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; @@ -27,8 +29,8 @@ $FreeBSD$ + ;; *) # Add libc to deplibs on all other systems if necessary. - if test $build_libtool_need_lc = "yes"; then -@@ -4183,10 +4192,12 @@ + if test "$build_libtool_need_lc" = "yes"; then +@@ -4179,10 +4190,12 @@ fi # Install the pseudo-library for information purposes. |
