pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: nia
Date: Fri Oct 1 11:56:14 UTC 2021
Modified Files:
pkgsrc/lang: Makefile
pkgsrc/lang/gcc10: options.mk
pkgsrc/lang/gcc6: options.mk
pkgsrc/lang/gcc7: options.mk
pkgsrc/lang/gcc8: options.mk
pkgsrc/mk/compiler: gcc.mk
Removed Files:
pkgsrc/lang/gcc34: DESCR Makefile README buildlink3.mk distinfo
options.mk preconfigure.mk
pkgsrc/lang/gcc34/files: 4netbsdintnam.ads 5netbsd64osinte.ads
5netbsd64system.ads 5netbsdintman.adb 5netbsdosinte.adb
5netbsdosinte.ads 5netbsdparame.adb 5netbsdsystem.ads
5netbsdtaprop.adb 5netbsdtasinf.ads 5netbsdtpopse.adb
7netbsdtpopsp.adb ada_lwp_self.c adasignal.c
alpha-baseline_symbols1.txt alpha-baseline_symbols2.txt
dragonfly-spec.h dragonfly.h dummy_pthreads.c
i386-baseline_symbols1.txt i386-baseline_symbols2.txt
i386-dragonfly.h i386-dragonfly64.h netbsd64macro.dfs
sparc64-baseline_symbols2.txt x86_64-baseline_symbols2.txt
pkgsrc/lang/gcc34/patches: patch-aa patch-ab patch-ac patch-ae patch-af
patch-ag patch-ah patch-ai patch-aj patch-ak patch-al patch-am
patch-at patch-ba patch-bb patch-ca patch-cc patch-cd
patch-gcc_config_freebsd-spec.h patch-gcc_config_sol2.h
patch-libstdc++-v3_config_os_bsd_netbsd_ctype__inline.h
patch-libstdc++-v3_config_os_bsd_netbsd_ctype__noninline.h
pkgsrc/lang/gcc44: DESCR Makefile buildlink3.mk distinfo options.mk
pkgsrc/lang/gcc44/files: hello.f hello.m values.c
pkgsrc/lang/gcc44/patches: patch-ac patch-ad patch-af patch-ag patch-ai
patch-aj patch-ak patch-al patch-am patch-gcc_doc_c-tree.texi
patch-gcc_doc_cppopts.texi patch-gcc_doc_gcc.texi
patch-gcc_doc_invoke.texi patch-gcc_doc_sourcebuild.texi
patch-gcc_ginclude_stddef.h patch-gcc_toplev.h
patch-libstdc++-v3_config_os_bsd_netbsd_ctype__inline.h
patch-libstdc++-v3_config_os_bsd_netbsd_ctype__noninline.h
Log Message:
Prune gcc34, gcc44.
To generate a diff of this commit:
cvs rdiff -u -r1.606 -r1.607 pkgsrc/lang/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc10/options.mk
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/lang/gcc34/DESCR
cvs rdiff -u -r1.61 -r0 pkgsrc/lang/gcc34/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/lang/gcc34/README
cvs rdiff -u -r1.24 -r0 pkgsrc/lang/gcc34/buildlink3.mk
cvs rdiff -u -r1.28 -r0 pkgsrc/lang/gcc34/distinfo
cvs rdiff -u -r1.8 -r0 pkgsrc/lang/gcc34/options.mk
cvs rdiff -u -r1.4 -r0 pkgsrc/lang/gcc34/preconfigure.mk
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/lang/gcc34/files/4netbsdintnam.ads \
pkgsrc/lang/gcc34/files/5netbsd64osinte.ads \
pkgsrc/lang/gcc34/files/5netbsd64system.ads \
pkgsrc/lang/gcc34/files/5netbsdintman.adb \
pkgsrc/lang/gcc34/files/5netbsdosinte.adb \
pkgsrc/lang/gcc34/files/5netbsdosinte.ads \
pkgsrc/lang/gcc34/files/5netbsdparame.adb \
pkgsrc/lang/gcc34/files/5netbsdsystem.ads \
pkgsrc/lang/gcc34/files/5netbsdtaprop.adb \
pkgsrc/lang/gcc34/files/5netbsdtasinf.ads \
pkgsrc/lang/gcc34/files/5netbsdtpopse.adb \
pkgsrc/lang/gcc34/files/7netbsdtpopsp.adb \
pkgsrc/lang/gcc34/files/ada_lwp_self.c \
pkgsrc/lang/gcc34/files/adasignal.c \
pkgsrc/lang/gcc34/files/dummy_pthreads.c
cvs rdiff -u -r1.1 -r0 pkgsrc/lang/gcc34/files/alpha-baseline_symbols1.txt \
pkgsrc/lang/gcc34/files/alpha-baseline_symbols2.txt \
pkgsrc/lang/gcc34/files/dragonfly-spec.h \
pkgsrc/lang/gcc34/files/dragonfly.h \
pkgsrc/lang/gcc34/files/i386-baseline_symbols1.txt \
pkgsrc/lang/gcc34/files/i386-dragonfly.h \
pkgsrc/lang/gcc34/files/i386-dragonfly64.h \
pkgsrc/lang/gcc34/files/sparc64-baseline_symbols2.txt \
pkgsrc/lang/gcc34/files/x86_64-baseline_symbols2.txt
cvs rdiff -u -r1.2 -r0 pkgsrc/lang/gcc34/files/i386-baseline_symbols2.txt \
pkgsrc/lang/gcc34/files/netbsd64macro.dfs
cvs rdiff -u -r1.1 -r0 pkgsrc/lang/gcc34/patches/patch-aa \
pkgsrc/lang/gcc34/patches/patch-ai pkgsrc/lang/gcc34/patches/patch-aj \
pkgsrc/lang/gcc34/patches/patch-ak pkgsrc/lang/gcc34/patches/patch-al \
pkgsrc/lang/gcc34/patches/patch-am pkgsrc/lang/gcc34/patches/patch-cd \
pkgsrc/lang/gcc34/patches/patch-gcc_config_freebsd-spec.h \
pkgsrc/lang/gcc34/patches/patch-gcc_config_sol2.h \
pkgsrc/lang/gcc34/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__inline.h \
pkgsrc/lang/gcc34/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__noninline.h
cvs rdiff -u -r1.2 -r0 pkgsrc/lang/gcc34/patches/patch-ab \
pkgsrc/lang/gcc34/patches/patch-at pkgsrc/lang/gcc34/patches/patch-cc
cvs rdiff -u -r1.4 -r0 pkgsrc/lang/gcc34/patches/patch-ac
cvs rdiff -u -r1.3 -r0 pkgsrc/lang/gcc34/patches/patch-ae \
pkgsrc/lang/gcc34/patches/patch-ah pkgsrc/lang/gcc34/patches/patch-ca
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/lang/gcc34/patches/patch-af \
pkgsrc/lang/gcc34/patches/patch-ag pkgsrc/lang/gcc34/patches/patch-ba \
pkgsrc/lang/gcc34/patches/patch-bb
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/lang/gcc44/DESCR
cvs rdiff -u -r1.56 -r0 pkgsrc/lang/gcc44/Makefile
cvs rdiff -u -r1.12 -r0 pkgsrc/lang/gcc44/buildlink3.mk
cvs rdiff -u -r1.22 -r0 pkgsrc/lang/gcc44/distinfo
cvs rdiff -u -r1.13 -r0 pkgsrc/lang/gcc44/options.mk
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/lang/gcc44/files/hello.f \
pkgsrc/lang/gcc44/files/hello.m
cvs rdiff -u -r1.1 -r0 pkgsrc/lang/gcc44/files/values.c
cvs rdiff -u -r1.4 -r0 pkgsrc/lang/gcc44/patches/patch-ac \
pkgsrc/lang/gcc44/patches/patch-ad pkgsrc/lang/gcc44/patches/patch-aj
cvs rdiff -u -r1.2 -r0 pkgsrc/lang/gcc44/patches/patch-af \
pkgsrc/lang/gcc44/patches/patch-ag pkgsrc/lang/gcc44/patches/patch-ai \
pkgsrc/lang/gcc44/patches/patch-ak pkgsrc/lang/gcc44/patches/patch-al
cvs rdiff -u -r1.1 -r0 pkgsrc/lang/gcc44/patches/patch-am \
pkgsrc/lang/gcc44/patches/patch-gcc_doc_c-tree.texi \
pkgsrc/lang/gcc44/patches/patch-gcc_doc_cppopts.texi \
pkgsrc/lang/gcc44/patches/patch-gcc_doc_gcc.texi \
pkgsrc/lang/gcc44/patches/patch-gcc_doc_invoke.texi \
pkgsrc/lang/gcc44/patches/patch-gcc_doc_sourcebuild.texi \
pkgsrc/lang/gcc44/patches/patch-gcc_ginclude_stddef.h \
pkgsrc/lang/gcc44/patches/patch-gcc_toplev.h \
pkgsrc/lang/gcc44/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__inline.h \
pkgsrc/lang/gcc44/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__noninline.h
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc6/options.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/gcc7/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/gcc8/options.mk
cvs rdiff -u -r1.226 -r1.227 pkgsrc/mk/compiler/gcc.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/lang/Makefile
diff -u pkgsrc/lang/Makefile:1.606 pkgsrc/lang/Makefile:1.607
--- pkgsrc/lang/Makefile:1.606 Thu Sep 16 19:19:40 2021
+++ pkgsrc/lang/Makefile Fri Oct 1 11:56:12 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.606 2021/09/16 19:19:40 wiz Exp $
+# $NetBSD: Makefile,v 1.607 2021/10/01 11:56:12 nia Exp $
#
COMMENT= Programming languages
@@ -72,8 +72,6 @@ SUBDIR+= gcc3-c
SUBDIR+= gcc3-c++
SUBDIR+= gcc3-f77
SUBDIR+= gcc3-objc
-SUBDIR+= gcc34
-SUBDIR+= gcc44
SUBDIR+= gcc5-aux
SUBDIR+= gcc6
SUBDIR+= gcc6-aux
Index: pkgsrc/lang/gcc10/options.mk
diff -u pkgsrc/lang/gcc10/options.mk:1.1 pkgsrc/lang/gcc10/options.mk:1.2
--- pkgsrc/lang/gcc10/options.mk:1.1 Sun May 10 15:02:44 2020
+++ pkgsrc/lang/gcc10/options.mk Fri Oct 1 11:56:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2020/05/10 15:02:44 maya Exp $
+# $NetBSD: options.mk,v 1.2 2021/10/01 11:56:13 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME}
PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \
@@ -126,8 +126,7 @@ DISTFILES+= ${ISL16}.tar.bz2
###
### Optional languages
-### Ada could be added although there is a bootstrapping issue. See
-### ../gcc34-ada for guidance
+### Ada could be added although there is a bootstrapping issue.
###
.if !empty(PKG_OPTIONS:Mgcc-objc++)
Index: pkgsrc/lang/gcc6/options.mk
diff -u pkgsrc/lang/gcc6/options.mk:1.3 pkgsrc/lang/gcc6/options.mk:1.4
--- pkgsrc/lang/gcc6/options.mk:1.3 Sun Nov 3 19:03:59 2019
+++ pkgsrc/lang/gcc6/options.mk Fri Oct 1 11:56:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2019/11/03 19:03:59 rillig Exp $
+# $NetBSD: options.mk,v 1.4 2021/10/01 11:56:14 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME}
PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \
@@ -120,8 +120,7 @@ DISTFILES += ${ISL14}.tar.bz2
###
### Optional languages
-### Ada could be added although there is a bootstrapping issue. See
-### ../gcc34-ada for guidance
+### Ada could be added although there is a bootstrapping issue.
###
.if !empty(PKG_OPTIONS:Mgcc-objc++)
Index: pkgsrc/lang/gcc7/options.mk
diff -u pkgsrc/lang/gcc7/options.mk:1.6 pkgsrc/lang/gcc7/options.mk:1.7
--- pkgsrc/lang/gcc7/options.mk:1.6 Sun Nov 3 19:04:00 2019
+++ pkgsrc/lang/gcc7/options.mk Fri Oct 1 11:56:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2019/11/03 19:04:00 rillig Exp $
+# $NetBSD: options.mk,v 1.7 2021/10/01 11:56:14 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME}
PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \
@@ -122,8 +122,7 @@ post-extract:
###
### Optional languages
-### Ada could be added although there is a bootstrapping issue. See
-### ../gcc34-ada for guidance
+### Ada could be added although there is a bootstrapping issue.
###
.if !empty(PKG_OPTIONS:Mgcc-objc++)
. if empty(PKG_OPTIONS:Mgcc-c++)
Index: pkgsrc/lang/gcc8/options.mk
diff -u pkgsrc/lang/gcc8/options.mk:1.4 pkgsrc/lang/gcc8/options.mk:1.5
--- pkgsrc/lang/gcc8/options.mk:1.4 Wed Apr 8 06:39:57 2020
+++ pkgsrc/lang/gcc8/options.mk Fri Oct 1 11:56:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2020/04/08 06:39:57 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2021/10/01 11:56:14 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME}
PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \
@@ -126,8 +126,7 @@ DISTFILES+= ${ISL16}.tar.bz2
###
### Optional languages
-### Ada could be added although there is a bootstrapping issue. See
-### ../gcc34-ada for guidance
+### Ada could be added although there is a bootstrapping issue.
###
.if !empty(PKG_OPTIONS:Mgcc-objc++)
Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.226 pkgsrc/mk/compiler/gcc.mk:1.227
--- pkgsrc/mk/compiler/gcc.mk:1.226 Tue Aug 3 07:19:20 2021
+++ pkgsrc/mk/compiler/gcc.mk Fri Oct 1 11:56:12 2021
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.226 2021/08/03 07:19:20 nia Exp $
+# $NetBSD: gcc.mk,v 1.227 2021/10/01 11:56:12 nia Exp $
#
# This is the compiler definition for the GNU Compiler Collection.
#
@@ -94,7 +94,7 @@ _DEF_VARS.gcc= \
_IS_BUILTIN_GCC \
_LANGUAGES.gcc \
_LINKER_RPATH_FLAG \
- _NEED_GCC2 _NEED_GCC3 _NEED_GCC34 \
+ _NEED_GCC2 _NEED_GCC3 \
_NEED_GCC6 _NEED_GCC7 _NEED_GCC8 _NEED_GCC9 \
_NEED_GCC10 \
_NEED_GCC_AUX _NEED_NEWER_GCC \
@@ -126,7 +126,7 @@ _USE_VARS.gcc= \
_PKGSRC_USE_FORTIFY _PKGSRC_USE_RELRO _PKGSRC_USE_STACK_CHECK \
_OPSYS_INCLUDE_DIRS _OPSYS_LIB_DIRS
_IGN_VARS.gcc= \
- _GCC2_PATTERNS _GCC3_PATTERNS _GCC34_PATTERNS \
+ _GCC2_PATTERNS _GCC3_PATTERNS \
_GCC6_PATTERNS _GCC7_PATTERNS _GCC8_PATTERNS _GCC9_PATTERNS \
_GCC10_PATTERNS _GCC_AUX_PATTERNS
_LISTED_VARS.gcc= \
@@ -160,12 +160,9 @@ _GCC_DIST_VERSION:= ${${_GCC_DIST_NAME:t
_GCC2_PATTERNS= [0-1].* 2.[0-9] 2.[0-9].* 2.[1-8][0-9] 2.[1-8][0-9].* \
2.9[0-4] 2.9[0-4].* 2.95 2.95.[0-3]
-# _GCC3_PATTERNS matches N s.t. 2.95.3 < N < 3.4.
+# _GCC3_PATTERNS matches N s.t. 2.95.3 < N < 4.
_GCC3_PATTERNS= 2.95.[4-9]* 2.95.[1-9][0-9]* 2.9[6-9] 2.9[6-9].* \
- 2.[1-9][0-9][0-9]* 3.[0-3] 3.[0-3].*
-
-# _GCC34_PATTERNS matches N s.t. 3.4 <= N < 4.
-_GCC34_PATTERNS= 3.[4-9] 3.[4-9].* 3.[1-9][0-9]*
+ 2.[1-9][0-9][0-9]* 3.[0-9] 3.[0-9].*
# _GCC6_PATTERNS matches N s.t. 4.5 <= N < 7.
_GCC6_PATTERNS= 4.[0-9] 4.[0-9]* 5 5.* 6 6.*
@@ -297,12 +294,6 @@ _NEED_GCC3?= no
_NEED_GCC3= yes
. endif
.endfor
-_NEED_GCC34?= no
-.for _pattern_ in ${_GCC34_PATTERNS}
-. if !empty(_GCC_REQD:M${_pattern_})
-_NEED_GCC34= yes
-. endif
-.endfor
_NEED_GCC6?= no
.for _pattern_ in ${_GCC6_PATTERNS}
. if !empty(_GCC_REQD:M${_pattern_})
@@ -341,7 +332,6 @@ _NEED_NEWER_GCC=NO
. endif
.endfor
.if !empty(_NEED_GCC2:M[nN][oO]) && !empty(_NEED_GCC3:M[nN][oO]) && \
- !empty(_NEED_GCC34:M[nN][oO]) && \
!empty(_NEED_GCC6:M[nN][oO]) && !empty(_NEED_GCC7:M[nN][oO]) && \
!empty(_NEED_GCC8:M[nN][oO]) && !empty(_NEED_GCC9:M[nN][oO]) && \
!empty(_NEED_GCC10:M[nN][oO]) && \
@@ -355,8 +345,6 @@ LANGUAGES.gcc?= c
LANGUAGES.gcc= c c++ fortran77 objc
.elif !empty(_NEED_GCC3:M[yY][eE][sS])
LANGUAGES.gcc= c c++ fortran77 java objc
-.elif !empty(_NEED_GCC34:M[yY][eE][sS])
-LANGUAGES.gcc= c c++ fortran77 objc
.elif !empty(_NEED_GCC6:M[yY][eE][sS])
LANGUAGES.gcc= c c++ fortran fortran77 go java objc obj-c++
.elif !empty(_NEED_GCC7:M[yY][eE][sS])
@@ -483,24 +471,6 @@ MAKEFLAGS+= _IGNORE_GCC=yes
_GCC_PKGSRCDIR= ../../lang/gcc3-c
_GCC_DEPENDENCY= gcc3-c>=${_GCC_REQD}:../../lang/gcc3-c
. endif
-.elif !empty(_NEED_GCC34:M[yY][eE][sS])
-#
-# We require gcc-3.4.x in the lang/gcc34 directory.
-#
-_GCC_PKGBASE= gcc34
-. if ${PKGPATH} == lang/gcc34
-_IGNORE_GCC= yes
-MAKEFLAGS+= _IGNORE_GCC=yes
-. endif
-. if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc)
-_GCC_PKGSRCDIR= ../../lang/gcc34
-_GCC_DEPENDENCY= gcc34>=${_GCC_REQD}:../../lang/gcc34
-. if !empty(_LANGUAGES.gcc:Mc++) || \
- !empty(_LANGUAGES.gcc:Mfortran77) || \
- !empty(_LANGUAGES.gcc:Mobjc)
-_USE_GCC_SHLIB?= yes
-. endif
-. endif
.elif !empty(_NEED_GCC6:M[yY][eE][sS])
#
# We require gcc-6.x in the lang/gcc6-* directory.
Home |
Main Index |
Thread Index |
Old Index