On Sat, 25 Aug 2012 09:55:38 -0400, Brad Smith wrote:
> Re-sync the GCC compilers LIB_SPEC with the base compilers.
The 4.7 REVISION is totally wrong obviously, and 3.3,-obj has it going
backwards. Apart from that, looks ok.
> Index: 3.3/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/3.3/Makefile,v
> retrieving revision 1.60
> diff -u -p -r1.60 Makefile
> --- 3.3/Makefile 20 Aug 2012 12:35:41 -0000 1.60
> +++ 3.3/Makefile 25 Aug 2012 13:03:50 -0000
> @@ -23,13 +23,13 @@ SHARED_LIBS = estdc++ 7.0 \
> objc 2.0 \
> objc_gc 2.0
>
> -REVISION-main = 4
> -REVISION-c++ = 6
> +REVISION-main = 5
> +REVISION-c++ = 7
> REVISION-estdc = 2
> -REVISION-g77 = 5
> -REVISION-java = 5
> -REVISION-objc = 5
> -REVISION-ada = 5
> +REVISION-g77 = 6
> +REVISION-java = 6
> +REVISION-objc = 4
> +REVISION-ada = 6
> 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.2
> diff -u -p -r1.2 patch-gcc_config_openbsd-libpthread_h
> --- 3.3/patches/patch-gcc_config_openbsd-libpthread_h 20 Aug 2012 12:35:41
> -0000 1.2
> +++ 3.3/patches/patch-gcc_config_openbsd-libpthread_h 25 Aug 2012 13:18:15
> -0000
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.2 2012/08/20 12:35:41
> pascal Exp $
> ---- 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
> +--- gcc/config/openbsd-libpthread.h.orig Sat Aug 25 09:04:51 2012
> ++++ gcc/config/openbsd-libpthread.h Sat Aug 25 09:17:11 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 "%{pthread:-lpthread%{!shared:%{p|pg:_p}}}
> -lc%{!shared:%{p|pg:_p}}"
> ++#define OBSD_LIB_SPEC "%{pthread:-lpthread%{!shared:%{p|pg:_p}}}
> %{!shared:-lc%{p:_p}%{!p:%{pg:_p}}}"
> +
> Index: 4.2/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/4.2/Makefile,v
> retrieving revision 1.80
> diff -u -p -r1.80 Makefile
> --- 4.2/Makefile 20 Aug 2012 12:35:41 -0000 1.80
> +++ 4.2/Makefile 25 Aug 2012 13:19:00 -0000
> @@ -19,13 +19,13 @@ PKGNAME-java = gcj-${FULL_PKGVERSION}
> PKGNAME-objc = gobjc-${FULL_PKGVERSION}
> PKGNAME-ada = gnat-${FULL_PKGVERSION}
>
> -REVISION-main = 10
> -REVISION-c++ = 14
> +REVISION-main = 11
> +REVISION-c++ = 15
> REVISION-estdc = 3
> -REVISION-f95 = 12
> -REVISION-java = 12
> -REVISION-objc = 11
> -REVISION-ada = 10
> +REVISION-f95 = 13
> +REVISION-java = 13
> +REVISION-objc = 12
> +REVISION-ada = 11
> 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.2
> diff -u -p -r1.2 patch-gcc_config_openbsd-libpthread_h
> --- 4.2/patches/patch-gcc_config_openbsd-libpthread_h 20 Aug 2012 12:35:41
> -0000 1.2
> +++ 4.2/patches/patch-gcc_config_openbsd-libpthread_h 25 Aug 2012 13:24:06
> -0000
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.2 2012/08/20 12:35:41
> pascal Exp $
> ---- 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
> +--- gcc/config/openbsd-libpthread.h.orig Sat Aug 25 09:20:29 2012
> ++++ gcc/config/openbsd-libpthread.h Sat Aug 25 09:23:10 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 "%{pthread:-lpthread%{!shared:%{p|pg:_p}}}
> -lc%{!shared:%{p|pg:_p}}"
> ++#define OBSD_LIB_SPEC "%{pthread:-lpthread%{!shared:%{p|pg:_p}}}
> %{!shared:-lc%{p:_p}%{!p:%{pg:_p}}}"
> +
> Index: 4.6/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/4.6/Makefile,v
> retrieving revision 1.30
> diff -u -p -r1.30 Makefile
> --- 4.6/Makefile 23 Aug 2012 19:19:16 -0000 1.30
> +++ 4.6/Makefile 25 Aug 2012 13:25:01 -0000
> @@ -18,14 +18,14 @@ PKGNAME-objc = gobjc-${FULL_PKGVERSION}
> PKGNAME-ada = gnat-${FULL_PKGVERSION}
> PKGNAME-go = gccgo-${FULL_PKGVERSION}
>
> -REVISION-main = 4
> -REVISION-c++ = 7
> +REVISION-main = 5
> +REVISION-c++ = 8
> REVISION-estdc = 4
> -REVISION-f95 = 4
> -REVISION-java = 5
> -REVISION-objc = 4
> -REVISION-ada = 4
> -REVISION-go = 5
> +REVISION-f95 = 5
> +REVISION-java = 6
> +REVISION-objc = 5
> +REVISION-ada = 5
> +REVISION-go = 6
>
> SHARED_LIBS = estdc++ 14.0 \
> gfortran 3.0 \
> Index: 4.6/patches/patch-gcc_config_openbsd-libpthread_h
> ===================================================================
> RCS file:
> /home/cvs/ports/lang/gcc/4.6/patches/patch-gcc_config_openbsd-libpthread_h,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-gcc_config_openbsd-libpthread_h
> --- 4.6/patches/patch-gcc_config_openbsd-libpthread_h 20 Aug 2012 12:35:41
> -0000 1.3
> +++ 4.6/patches/patch-gcc_config_openbsd-libpthread_h 25 Aug 2012 13:33:41
> -0000
> @@ -1,10 +1,10 @@
> $OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.3 2012/08/20 12:35:41
> pascal Exp $
> ---- 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
> +--- gcc/config/openbsd-libpthread.h.orig Sun Sep 27 09:20:23 2009
> ++++ gcc/config/openbsd-libpthread.h Sat Aug 25 09:28:37 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}}"
> ++#define OBSD_LIB_SPEC "%{pthread:-lpthread%{!shared:%{p|pg:_p}}}
> %{!shared:-lc%{p:_p}%{!p:%{pg:_p}}}"
>
> Index: 4.7/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/4.7/Makefile,v
> retrieving revision 1.11
> diff -u -p -r1.11 Makefile
> --- 4.7/Makefile 23 Aug 2012 19:19:16 -0000 1.11
> +++ 4.7/Makefile 25 Aug 2012 13:46:37 -0000
> @@ -21,7 +21,7 @@ PKGNAME-ada = gnat-${FULL_PKGVERSION}
> #PKGNAME-go = gccgo-${FULL_PKGVERSION}
> PKGSPEC-main = gcc->=4.7,<4.8
>
> -REVISION = 1
> +REVISION = 2
>
> SHARED_LIBS = estdc++ 15.0 \
> gfortran 4.0 \
> Index: 4.7/patches/patch-gcc_config_openbsd-libpthread_h
> ===================================================================
> RCS file:
> /home/cvs/ports/lang/gcc/4.7/patches/patch-gcc_config_openbsd-libpthread_h,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-gcc_config_openbsd-libpthread_h
> --- 4.7/patches/patch-gcc_config_openbsd-libpthread_h 20 Aug 2012 12:35:41
> -0000 1.1
> +++ 4.7/patches/patch-gcc_config_openbsd-libpthread_h 25 Aug 2012 13:51:39
> -0000
> @@ -1,10 +1,10 @@
> $OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.1 2012/08/20 12:35:41
> pascal Exp $
> ---- 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
> +--- gcc/config/openbsd-libpthread.h.orig Sun Sep 27 09:20:23 2009
> ++++ gcc/config/openbsd-libpthread.h Sat Aug 25 09:50:23 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}}"
> ++#define OBSD_LIB_SPEC "%{pthread:-lpthread%{!shared:%{p|pg:_p}}}
> %{!shared:-lc%{p:_p}%{!p:%{pg:_p}}}"
>
>
> --
> This message has been scanned for viruses and
> dangerous content by MailScanner, and is
> believed to be clean.
>
>
