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 -0000 1.59
> +++ 3.3/Makefile 16 Aug 2012 07:12:03 -0000
> @@ -23,7 +23,7 @@ SHARED_LIBS = estdc++ 7.0 \
> objc 2.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
> -0000 1.1.1.1
> +++ 3.3/patches/patch-gcc_config_openbsd-libpthread_h 16 Aug 2012 07:11:45
> -0000
> @@ -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 -0000 1.79
> +++ 4.2/Makefile 16 Aug 2012 07:13:33 -0000
> @@ -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
> -0000 1.1
> +++ 4.2/patches/patch-gcc_config_openbsd-libpthread_h 16 Aug 2012 07:17:55
> -0000
> @@ -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 -0000 1.28
> +++ 4.6/Makefile 16 Aug 2012 07:18:25 -0000
> @@ -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 -0000
> +++ 4.6/patches/patch-gcc_config_openbsd-libpthread_h 16 Aug 2012 07:24:30
> -0000
> @@ -0,0 +1,10 @@
> +$OpenBSD$
> +--- gcc/config/openbsd-libpthread.h.orig Thu Aug 16 03:22:15 2012
> ++++ gcc/config/openbsd-libpthread.h Thu Aug 16 03:22:55 2012
> +@@ -18,5 +18,5 @@
> + along with GCC; see the file COPYING3. If not see
> + <http://www.gnu.org/licenses/>. */
> +
> +-#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.7/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/4.7/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- 4.7/Makefile 15 Jul 2012 08:56:26 -0000 1.9
> +++ 4.7/Makefile 16 Aug 2012 07:25:34 -0000
> @@ -21,6 +21,8 @@ PKGNAME-ada = gnat-${FULL_PKGVERSION}
> #PKGNAME-go = gccgo-${FULL_PKGVERSION}
> PKGSPEC-main = gcc->=4.7,<4.8
>
> +REVISION-main = 0
> +
> SHARED_LIBS = estdc++ 15.0 \
> gfortran 4.0 \
> gcj 2.0 \
> Index: 4.7/patches/patch-gcc_config_openbsd-libpthread_h
> ===================================================================
> RCS file: 4.7/patches/patch-gcc_config_openbsd-libpthread_h
> diff -N 4.7/patches/patch-gcc_config_openbsd-libpthread_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ 4.7/patches/patch-gcc_config_openbsd-libpthread_h 16 Aug 2012 07:32:03
> -0000
> @@ -0,0 +1,10 @@
> +$OpenBSD$
> +--- gcc/config/openbsd-libpthread.h.orig Thu Aug 16 03:30:37 2012
> ++++ gcc/config/openbsd-libpthread.h Thu Aug 16 03:30:49 2012
> +@@ -18,5 +18,5 @@
> + along with GCC; see the file COPYING3. If not see
> + <http://www.gnu.org/licenses/>. */
> +
> +-#define OBSD_LIB_SPEC "%{!shared:%{pthread:-lpthread} -lc}"
> ++#define OBSD_LIB_SPEC "%{pthread:-lpthread%{!shared:%{p|pg:_p}}}
> -lc%{!shared:%{p|pg:_p}}"
> +
>
> --
> This message has been scanned for viruses and
> dangerous content by MailScanner, and is
> believed to be clean.
>
>
