Re: UPDATE: GCC - update library link spec for libpthread

2012-08-19 Thread Pascal Stumpf 
On Thu, 16 Aug 2012 10:55:34 -0400, Brad Smith wrote:
 Update the GCC ports to sync the OpenBSD LIB_SPEC with the base gcc4
 for the new libpthread handling.
 
 Tested with gcc 3.3/4.2/4.6 on amd64.

This changes behaviour of every driver, so it needs bumps in every
subpackage except -estdc.  Other than that, looks ok to me, but not
tested yet.

 
 
 Index: 3.3/Makefile
 ===
 RCS file: /home/cvs/ports/lang/gcc/3.3/Makefile,v
 retrieving revision 1.59
 diff -u -p -r1.59 Makefile
 --- 3.3/Makefile  21 Jun 2012 13:56:57 -  1.59
 +++ 3.3/Makefile  16 Aug 2012 07:12:03 -
 @@ -23,7 +23,7 @@ SHARED_LIBS =   estdc++ 7.0 \
   objc2.0 \
   objc_gc 2.0
  
 -REVISION-main =  3
 +REVISION-main =  4
  REVISION-c++ =   5
  REVISION-estdc = 2
  REVISION-g77 =   4
 Index: 3.3/patches/patch-gcc_config_openbsd-libpthread_h
 ===
 RCS file: 
 /home/cvs/ports/lang/gcc/3.3/patches/patch-gcc_config_openbsd-libpthread_h,v
 retrieving revision 1.1.1.1
 diff -u -p -r1.1.1.1 patch-gcc_config_openbsd-libpthread_h
 --- 3.3/patches/patch-gcc_config_openbsd-libpthread_h 3 Jan 2005 15:21:27 
 -   1.1.1.1
 +++ 3.3/patches/patch-gcc_config_openbsd-libpthread_h 16 Aug 2012 07:11:45 
 -
 @@ -1,6 +1,6 @@
  $OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.1.1.1 2005/01/03 
 15:21:27 espie Exp $
  gcc/config/openbsd-libpthread.h.orig Mon Jan  3 10:17:43 2005
 -+++ gcc/config/openbsd-libpthread.h  Mon Jan  3 10:17:43 2005
 +--- gcc/config/openbsd-libpthread.h.orig Thu Aug 16 03:08:41 2012
  gcc/config/openbsd-libpthread.h  Thu Aug 16 03:09:49 2012
  @@ -0,0 +1,23 @@
  +/* LIB_SPEC appropriate for OpenBSD.  Include -lpthread if -pthread is
  +   specified on the command line. */
 @@ -23,5 +23,5 @@ $OpenBSD: patch-gcc_config_openbsd-libpt
  +the Free Software Foundation, 59 Temple Place - Suite 330,
  +Boston, MA 02111-1307, USA.  */
  +
 -+#define OBSD_LIB_SPEC %{!shared:%{pthread:-lpthread%{p:_p}%{!p:%{pg:_p 
 %{!shared:-lc%{p:_p}%{!p:%{pg:_p}}}
 ++#define OBSD_LIB_SPEC %{pthread:-lpthread%{!shared:%{p|pg:_p}}} 
 -lc%{!shared:%{p|pg:_p}}
  +
 Index: 4.2/Makefile
 ===
 RCS file: /home/cvs/ports/lang/gcc/4.2/Makefile,v
 retrieving revision 1.79
 diff -u -p -r1.79 Makefile
 --- 4.2/Makefile  21 Jun 2012 13:56:57 -  1.79
 +++ 4.2/Makefile  16 Aug 2012 07:13:33 -
 @@ -19,7 +19,7 @@ PKGNAME-java =  gcj-${FULL_PKGVERSION}
  PKGNAME-objc =  gobjc-${FULL_PKGVERSION}
  PKGNAME-ada =   gnat-${FULL_PKGVERSION}
  
 -REVISION-main = 9
 +REVISION-main = 10
  REVISION-c++ = 13
  REVISION-estdc = 3
  REVISION-f95 = 11
 Index: 4.2/patches/patch-gcc_config_openbsd-libpthread_h
 ===
 RCS file: 
 /home/cvs/ports/lang/gcc/4.2/patches/patch-gcc_config_openbsd-libpthread_h,v
 retrieving revision 1.1
 diff -u -p -r1.1 patch-gcc_config_openbsd-libpthread_h
 --- 4.2/patches/patch-gcc_config_openbsd-libpthread_h 20 Oct 2006 13:43:18 
 -  1.1
 +++ 4.2/patches/patch-gcc_config_openbsd-libpthread_h 16 Aug 2012 07:17:55 
 -
 @@ -1,6 +1,6 @@
  $OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.1 2006/10/20 13:43:18 
 espie Exp $
  gcc/config/openbsd-libpthread.h.orig Wed Oct 18 13:46:36 2006
 -+++ gcc/config/openbsd-libpthread.h  Wed Oct 18 13:46:50 2006
 +--- gcc/config/openbsd-libpthread.h.orig Thu Aug 16 03:15:26 2012
  gcc/config/openbsd-libpthread.h  Thu Aug 16 03:16:44 2012
  @@ -0,0 +1,23 @@
  +/* LIB_SPEC appropriate for OpenBSD.  Include -lpthread if -pthread is
  +   specified on the command line. */
 @@ -23,5 +23,5 @@ $OpenBSD: patch-gcc_config_openbsd-libpt
  +the Free Software Foundation, 59 Temple Place - Suite 330,
  +Boston, MA 02111-1307, USA.  */
  +
 -+#define OBSD_LIB_SPEC %{!shared:%{pthread:-lpthread} -lc}
 ++#define OBSD_LIB_SPEC %{pthread:-lpthread%{!shared:%{p|pg:_p}}} 
 -lc%{!shared:%{p|pg:_p}}
  +
 Index: 4.6/Makefile
 ===
 RCS file: /home/cvs/ports/lang/gcc/4.6/Makefile,v
 retrieving revision 1.28
 diff -u -p -r1.28 Makefile
 --- 4.6/Makefile  1 Jul 2012 18:28:40 -   1.28
 +++ 4.6/Makefile  16 Aug 2012 07:18:25 -
 @@ -18,7 +18,7 @@ PKGNAME-objc =  gobjc-${FULL_PKGVERSION}
  PKGNAME-ada =   gnat-${FULL_PKGVERSION}
  PKGNAME-go = gccgo-${FULL_PKGVERSION}
  
 -REVISION-main = 3
 +REVISION-main = 4
  REVISION-c++ = 6
  REVISION-estdc = 3
  REVISION-f95 = 3
 Index: 4.6/patches/patch-gcc_config_openbsd-libpthread_h
 ===
 RCS file: 4.6/patches/patch-gcc_config_openbsd-libpthread_h
 diff -N 4.6/patches/patch-gcc_config_openbsd-libpthread_h
 --- /dev/null

Re: UPDATE: GCC - update library link spec for libpthread

2012-08-19 Thread Brad Smith 
On Sun, Aug 19, 2012 at 01:57:29PM +0200, Pascal Stumpf wrote:
 On Thu, 16 Aug 2012 10:55:34 -0400, Brad Smith wrote:
  Update the GCC ports to sync the OpenBSD LIB_SPEC with the base gcc4
  for the new libpthread handling.
  
  Tested with gcc 3.3/4.2/4.6 on amd64.
 
 This changes behaviour of every driver, so it needs bumps in every
 subpackage except -estdc.  Other than that, looks ok to me, but not
 tested yet.


Index: 3.3/Makefile
===
RCS file: /home/cvs/ports/lang/gcc/3.3/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- 3.3/Makefile21 Jun 2012 13:56:57 -  1.59
+++ 3.3/Makefile19 Aug 2012 12:20:44 -
@@ -23,13 +23,13 @@ SHARED_LIBS =   estdc++ 7.0 \
objc2.0 \
objc_gc 2.0
 
-REVISION-main =3
-REVISION-c++ = 5
+REVISION-main =4
+REVISION-c++ = 6
 REVISION-estdc =   2
-REVISION-g77 = 4
-REVISION-java =4
-REVISION-objc =4
-REVISION-ada = 4
+REVISION-g77 = 5
+REVISION-java =5
+REVISION-objc =5
+REVISION-ada = 5
 EPOCH =0
 
 MAINTAINER =   Marc Espie es...@openbsd.org
Index: 3.3/patches/patch-gcc_config_openbsd-libpthread_h
===
RCS file: 
/home/cvs/ports/lang/gcc/3.3/patches/patch-gcc_config_openbsd-libpthread_h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-gcc_config_openbsd-libpthread_h
--- 3.3/patches/patch-gcc_config_openbsd-libpthread_h   3 Jan 2005 15:21:27 
-   1.1.1.1
+++ 3.3/patches/patch-gcc_config_openbsd-libpthread_h   16 Aug 2012 07:11:45 
-
@@ -1,6 +1,6 @@
 $OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.1.1.1 2005/01/03 15:21:27 
espie Exp $
 gcc/config/openbsd-libpthread.h.orig   Mon Jan  3 10:17:43 2005
-+++ gcc/config/openbsd-libpthread.hMon Jan  3 10:17:43 2005
+--- gcc/config/openbsd-libpthread.h.orig   Thu Aug 16 03:08:41 2012
 gcc/config/openbsd-libpthread.hThu Aug 16 03:09:49 2012
 @@ -0,0 +1,23 @@
 +/* LIB_SPEC appropriate for OpenBSD.  Include -lpthread if -pthread is
 +   specified on the command line. */
@@ -23,5 +23,5 @@ $OpenBSD: patch-gcc_config_openbsd-libpt
 +the Free Software Foundation, 59 Temple Place - Suite 330,
 +Boston, MA 02111-1307, USA.  */
 +
-+#define OBSD_LIB_SPEC %{!shared:%{pthread:-lpthread%{p:_p}%{!p:%{pg:_p 
%{!shared:-lc%{p:_p}%{!p:%{pg:_p}}}
++#define OBSD_LIB_SPEC %{pthread:-lpthread%{!shared:%{p|pg:_p}}} 
-lc%{!shared:%{p|pg:_p}}
 +
Index: 4.2/Makefile
===
RCS file: /home/cvs/ports/lang/gcc/4.2/Makefile,v
retrieving revision 1.79
diff -u -p -r1.79 Makefile
--- 4.2/Makefile21 Jun 2012 13:56:57 -  1.79
+++ 4.2/Makefile19 Aug 2012 12:24:16 -
@@ -19,13 +19,13 @@ PKGNAME-java =  gcj-${FULL_PKGVERSION}
 PKGNAME-objc =  gobjc-${FULL_PKGVERSION}
 PKGNAME-ada =   gnat-${FULL_PKGVERSION}
 
-REVISION-main = 9
-REVISION-c++ = 13
+REVISION-main = 10
+REVISION-c++ = 14
 REVISION-estdc = 3
-REVISION-f95 = 11
-REVISION-java = 11
-REVISION-objc = 10
-REVISION-ada = 9
+REVISION-f95 = 12
+REVISION-java = 12
+REVISION-objc = 11
+REVISION-ada = 10
 EPOCH = 0
 
 SHARED_LIBS =  estdc++ 13.0 \
Index: 4.2/patches/patch-gcc_config_openbsd-libpthread_h
===
RCS file: 
/home/cvs/ports/lang/gcc/4.2/patches/patch-gcc_config_openbsd-libpthread_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-gcc_config_openbsd-libpthread_h
--- 4.2/patches/patch-gcc_config_openbsd-libpthread_h   20 Oct 2006 13:43:18 
-  1.1
+++ 4.2/patches/patch-gcc_config_openbsd-libpthread_h   16 Aug 2012 07:17:55 
-
@@ -1,6 +1,6 @@
 $OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.1 2006/10/20 13:43:18 
espie Exp $
 gcc/config/openbsd-libpthread.h.orig   Wed Oct 18 13:46:36 2006
-+++ gcc/config/openbsd-libpthread.hWed Oct 18 13:46:50 2006
+--- gcc/config/openbsd-libpthread.h.orig   Thu Aug 16 03:15:26 2012
 gcc/config/openbsd-libpthread.hThu Aug 16 03:16:44 2012
 @@ -0,0 +1,23 @@
 +/* LIB_SPEC appropriate for OpenBSD.  Include -lpthread if -pthread is
 +   specified on the command line. */
@@ -23,5 +23,5 @@ $OpenBSD: patch-gcc_config_openbsd-libpt
 +the Free Software Foundation, 59 Temple Place - Suite 330,
 +Boston, MA 02111-1307, USA.  */
 +
-+#define OBSD_LIB_SPEC %{!shared:%{pthread:-lpthread} -lc}
++#define OBSD_LIB_SPEC %{pthread:-lpthread%{!shared:%{p|pg:_p}}} 
-lc%{!shared:%{p|pg:_p}}
 +
Index: 4.6/Makefile
===
RCS file: /home/cvs/ports/lang/gcc/4.6/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- 4.6/Makefile1 Jul 2012 18:28:40 -   1.28
+++ 4.6/Makefile

UPDATE: GCC - update library link spec for libpthread

2012-08-16 Thread Brad Smith 
Update the GCC ports to sync the OpenBSD LIB_SPEC with the base gcc4
for the new libpthread handling.

Tested with gcc 3.3/4.2/4.6 on amd64.


Index: 3.3/Makefile
===
RCS file: /home/cvs/ports/lang/gcc/3.3/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- 3.3/Makefile21 Jun 2012 13:56:57 -  1.59
+++ 3.3/Makefile16 Aug 2012 07:12:03 -
@@ -23,7 +23,7 @@ SHARED_LIBS = estdc++ 7.0 \
objc2.0 \
objc_gc 2.0
 
-REVISION-main =3
+REVISION-main =4
 REVISION-c++ = 5
 REVISION-estdc =   2
 REVISION-g77 = 4
Index: 3.3/patches/patch-gcc_config_openbsd-libpthread_h
===
RCS file: 
/home/cvs/ports/lang/gcc/3.3/patches/patch-gcc_config_openbsd-libpthread_h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-gcc_config_openbsd-libpthread_h
--- 3.3/patches/patch-gcc_config_openbsd-libpthread_h   3 Jan 2005 15:21:27 
-   1.1.1.1
+++ 3.3/patches/patch-gcc_config_openbsd-libpthread_h   16 Aug 2012 07:11:45 
-
@@ -1,6 +1,6 @@
 $OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.1.1.1 2005/01/03 15:21:27 
espie Exp $
 gcc/config/openbsd-libpthread.h.orig   Mon Jan  3 10:17:43 2005
-+++ gcc/config/openbsd-libpthread.hMon Jan  3 10:17:43 2005
+--- gcc/config/openbsd-libpthread.h.orig   Thu Aug 16 03:08:41 2012
 gcc/config/openbsd-libpthread.hThu Aug 16 03:09:49 2012
 @@ -0,0 +1,23 @@
 +/* LIB_SPEC appropriate for OpenBSD.  Include -lpthread if -pthread is
 +   specified on the command line. */
@@ -23,5 +23,5 @@ $OpenBSD: patch-gcc_config_openbsd-libpt
 +the Free Software Foundation, 59 Temple Place - Suite 330,
 +Boston, MA 02111-1307, USA.  */
 +
-+#define OBSD_LIB_SPEC %{!shared:%{pthread:-lpthread%{p:_p}%{!p:%{pg:_p 
%{!shared:-lc%{p:_p}%{!p:%{pg:_p}}}
++#define OBSD_LIB_SPEC %{pthread:-lpthread%{!shared:%{p|pg:_p}}} 
-lc%{!shared:%{p|pg:_p}}
 +
Index: 4.2/Makefile
===
RCS file: /home/cvs/ports/lang/gcc/4.2/Makefile,v
retrieving revision 1.79
diff -u -p -r1.79 Makefile
--- 4.2/Makefile21 Jun 2012 13:56:57 -  1.79
+++ 4.2/Makefile16 Aug 2012 07:13:33 -
@@ -19,7 +19,7 @@ PKGNAME-java =  gcj-${FULL_PKGVERSION}
 PKGNAME-objc =  gobjc-${FULL_PKGVERSION}
 PKGNAME-ada =   gnat-${FULL_PKGVERSION}
 
-REVISION-main = 9
+REVISION-main = 10
 REVISION-c++ = 13
 REVISION-estdc = 3
 REVISION-f95 = 11
Index: 4.2/patches/patch-gcc_config_openbsd-libpthread_h
===
RCS file: 
/home/cvs/ports/lang/gcc/4.2/patches/patch-gcc_config_openbsd-libpthread_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-gcc_config_openbsd-libpthread_h
--- 4.2/patches/patch-gcc_config_openbsd-libpthread_h   20 Oct 2006 13:43:18 
-  1.1
+++ 4.2/patches/patch-gcc_config_openbsd-libpthread_h   16 Aug 2012 07:17:55 
-
@@ -1,6 +1,6 @@
 $OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.1 2006/10/20 13:43:18 
espie Exp $
 gcc/config/openbsd-libpthread.h.orig   Wed Oct 18 13:46:36 2006
-+++ gcc/config/openbsd-libpthread.hWed Oct 18 13:46:50 2006
+--- gcc/config/openbsd-libpthread.h.orig   Thu Aug 16 03:15:26 2012
 gcc/config/openbsd-libpthread.hThu Aug 16 03:16:44 2012
 @@ -0,0 +1,23 @@
 +/* LIB_SPEC appropriate for OpenBSD.  Include -lpthread if -pthread is
 +   specified on the command line. */
@@ -23,5 +23,5 @@ $OpenBSD: patch-gcc_config_openbsd-libpt
 +the Free Software Foundation, 59 Temple Place - Suite 330,
 +Boston, MA 02111-1307, USA.  */
 +
-+#define OBSD_LIB_SPEC %{!shared:%{pthread:-lpthread} -lc}
++#define OBSD_LIB_SPEC %{pthread:-lpthread%{!shared:%{p|pg:_p}}} 
-lc%{!shared:%{p|pg:_p}}
 +
Index: 4.6/Makefile
===
RCS file: /home/cvs/ports/lang/gcc/4.6/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- 4.6/Makefile1 Jul 2012 18:28:40 -   1.28
+++ 4.6/Makefile16 Aug 2012 07:18:25 -
@@ -18,7 +18,7 @@ PKGNAME-objc =  gobjc-${FULL_PKGVERSION}
 PKGNAME-ada =   gnat-${FULL_PKGVERSION}
 PKGNAME-go =   gccgo-${FULL_PKGVERSION}
 
-REVISION-main = 3
+REVISION-main = 4
 REVISION-c++ = 6
 REVISION-estdc = 3
 REVISION-f95 = 3
Index: 4.6/patches/patch-gcc_config_openbsd-libpthread_h
===
RCS file: 4.6/patches/patch-gcc_config_openbsd-libpthread_h
diff -N 4.6/patches/patch-gcc_config_openbsd-libpthread_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ 4.6/patches/patch-gcc_config_openbsd-libpthread_h   16 Aug 2012 07:24:30 
-
@@ -0,0 +1,10 @@
+$OpenBSD$
+--- gcc/config/openbsd-libpthread.h.orig   Thu Aug 16 03:22:15 2012
 gcc/config/openbsd-libpthread.hThu Aug 16 03:22:55 2012
+@@ -18,5

Re: UPDATE: GCC - update library link spec for libpthread

2012-08-16 Thread Matthew Dempsky 
On Thu, Aug 16, 2012 at 7:55 AM, Brad Smith b...@comstyle.com wrote:
 Update the GCC ports to sync the OpenBSD LIB_SPEC with the base gcc4
 for the new libpthread handling.

 Tested with gcc 3.3/4.2/4.6 on amd64.

Looks right to me.  ok matthew