cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean-up:

Browse Source 
- use PSEUDO_FLAVORS
- fix ownership of various files
- new MULTI_PACKAGES
- slightly newer snapshot
This commit is contained in:
espie 2006-11-25 16:26:46 +00:00
parent 63b8642ed5
commit a64e971c29
13 changed files with 78 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
lang/gcc/4.2/Makefile
View File

@ -1,18 +1,18 @@
# $OpenBSD: Makefile,v 1.6 2006/11/01 23:57:24 naddy Exp $
# $OpenBSD: Makefile,v 1.7 2006/11/25 16:26:46 espie Exp $
ONLY_FOR_ARCHS= alpha i386 m68k sparc sparc64 powerpc vax amd64
#BROKEN='adjust for types changes'
V=4.2.0
DATE=20061014
DATE=20061024
FULL_VERSION=4.2-${DATE}
FULL_PKGVERSION=4.2.${DATE}
PKGNAME= gcc-${FULL_PKGVERSION}
PKGNAME-main= gcc-${FULL_PKGVERSION}
PKGNAME-c++ = g++-${FULL_PKGVERSION}
PKGNAME-estdc= libstdc++-${FULL_PKGVERSION}
PKGNAME-g77= g77-${FULL_PKGVERSION}
PKGNAME-f95= g95-${FULL_PKGVERSION}p0
PKGNAME-f95= g95-${FULL_PKGVERSION}
PKGNAME-java= gcj-${FULL_PKGVERSION}
PKGNAME-objc= gobjc-${FULL_PKGVERSION}
PKGNAME-ada= gnat-${FULL_PKGVERSION}
@ -28,60 +28,33 @@ SHARED_LIBS= estdc++ 7.0 \
MAINTAINER= Marc Espie <espie@openbsd.org>
ADAI386= adastrap-i386-3.3.6-4.tgz:0
DISTFILES= ${DISTNAME}.tar.bz2
SUPDISTFILES= ${ADAI386}
MAKE_GXX=Yes
MAKE_FORTRAN=Yes
MAKE_OBJC=Yes
#MAKE_JAVA=Yes
PSEUDO_FLAVORS=c++ fortran objc java ada
.if ${MACHINE_ARCH} == "i386"
MAKE_ADA=Yes
DISTFILES+=${ADAI386}
FLAVOR?=c++ fortran objc ada
.else
FLAVOR?=c++ fortran objc
.endif
MAKE_GXX?=No
MAKE_FORTRAN?=No
MAKE_OBJC?=No
MAKE_JAVA?=No
MAKE_ADA?=No
.if ${FLAVOR:L:Mjava}
FLAVOR+=c++
.endif
DISTFILES= ${DISTNAME}.tar.bz2
SUPDISTFILES= adastrap-i386-3.3.6-4.tgz:0
BUILD_DEPENDS+= ::devel/autoconf/2.59
BUILD_DEPENDS+= ::devel/metaauto
USE_LIBTOOL= Yes
SUBPACKAGE?=
WANTLIB=c
.if ${SUBPACKAGE} == "-estdc"
WANTLIB+=m
.endif
.if ${MAKE_JAVA:L} == "yes"
. if !defined(PACKAGING) || ${SUBPACKAGE} == "-java"
LIB_DEPENDS+=gc::devel/boehm-gc
. endif
.endif
# This can be patched out, apart from java that wants a pure parser.
BUILD_DEPENDS+= :bison-*:devel/bison
.if ${MAKE_JAVA:L} == "yes"
MAKE_GXX=Yes
.endif
MULTI_PACKAGES=
MULTI_PACKAGES= -main
# No sub packages description
DESCR=${PKGDIR}/DESCR
REGRESS_DEPENDS=::devel/dejagnu
# No way around it, java wants a pure parser
.if ${MAKE_JAVA:L} == "yes"
BUILD_DEPENDS+=:bison-*:devel/bison
.endif
DISTNAME= gcc-${FULL_VERSION}
@ -94,28 +67,28 @@ CONFIGURE_STYLE= gnu
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/gcc
LANGS=c
.if ${MAKE_GXX:L} == "yes"
.if ${FLAVOR:L:Mc++}
LANGS:=${LANGS},c++
MULTI_PACKAGES+=-c++ -estdc
.endif
.if ${MAKE_FORTRAN:L} == "yes"
.if ${FLAVOR:L:Mfortran}
LANGS:=${LANGS},fortran
MULTI_PACKAGES+=-f95
CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
.endif
.if ${MAKE_OBJC:L} == "yes"
.if ${FLAVOR:L:Mobjc}
LANGS:=${LANGS},objc
MULTI_PACKAGES+=-objc
.endif
.if ${MAKE_JAVA:L} == "yes"
.if ${FLAVOR:L:Mjava}
LANGS:=${LANGS},java
#MULTI_PACKAGES+=-java
CONFIGURE_ARGS+=--enable-java-gc=system-boehm
.endif
.if ${MAKE_ADA:L} == "yes"
.if ${FLAVOR:L:Mada}
LANGS:=${LANGS},ada
MULTI_PACKAGES+=-ada
#DISTFILES+=adastrap-${MACHINE_ARCH}-4.0-20050102-1.tgz:0
DISTFILES+=adastrap-${MACHINE_ARCH}-3.3.6-4.tgz:0
CONFIGURE_ENV=ADAC=${WRKDIR}/bin/egcc GNATBIND=${WRKDIR}/bin/gnatbind
MAKE_ENV=ADAC=${WRKDIR}/bin/egcc GNATBIND=${WRKDIR}/bin/gnatbind
CC=${WRKDIR}/bin/egcc
@ -133,6 +106,12 @@ post-extract:
echo "LIB$l_LTVERSION = -version-info ${v:S/./:/}" >> ${WRKSRC}/libversions
.endfor
post-install:
.if ${FLAVOR:L:Mada}
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/adainclude
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/adalib
.endif
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/include
CONFIGURE_ENV+=am_cv_func_iconv=no
CONFIGURE_ENV+=ac_cv_prog_CONFIGURED_M4=/usr/bin/m4
@ -159,7 +138,7 @@ CONFIGURE_ARGS+= \
# visible beast
CONFIGURE_ARGS+=--enable-cpp
.if ${MAKE_JAVA:L} == "yes"
.if ${FLAVOR:L:Mjava}
CONFIGURE_ARGS+=--enable-sjlj-exceptions
.endif
@ -174,7 +153,7 @@ CONFIGURE_ARGS += ${CONFIGURE_SHARED}
post-patch:
cd ${WRKDIST}/libstdc++-v3 && AUTOCONF_VERSION=2.59 autoconf
SEPARATE_BUILD=concurrent
SEPARATE_BUILD=flavored
USE_GMAKE= yes
@ -202,19 +181,18 @@ PKG_ARGS+=-DI386=1
PKG_ARGS+=-DI386=0
.endif
SUBPACKAGE?=
.if defined(PACKAGING)
. if !empty(SUBPACKAGE) && ${SUBPACKAGE} != "-estdc"
RUN_DEPENDS+=::${PKGPATH}
. endif
. if ${SUBPACKAGE} == "-c++"
RUN_DEPENDS+=:gcc-${FULL_PKGVERSION}:${PKGPATH},-estdc
. endif
.endif
.if !defined(PACKAGING) || ${SUBPACKAGE} == "-f95"
LIB_DEPENDS+=gmp:gmp->=4.2:devel/gmp
LIB_DEPENDS+=mpfr::devel/mpfr
.endif
RUN_DEPENDS= :gcc-${FULL_PKGVERSION}:${PKGPATH}
WANTLIB= c
RUN_DEPENDS-main=
RUN_DEPENDS-c++ = ${RUN_DEPENDS} ::${PKGPATH},-estdc
WANTLIB-estdc= c m
LIB_DEPENDS-f95= gmp:gmp->=4.2:devel/gmp \
mpfr::devel/mpfr
LIB_DEPENDS-java= gc::devel/boehm-gc
.include <bsd.port.mk>

8
lang/gcc/4.2/distinfo
View File

@ -1,8 +1,8 @@
MD5 (gcc/adastrap-i386-3.3.6-4.tgz) = 216977774d85b97542cfaa8b0e79b909
MD5 (gcc/gcc-4.2-20061014.tar.bz2) = 1436184012555202c14f58f7c781b2e6
MD5 (gcc/gcc-4.2-20061024.tar.bz2) = 24b8fbdef7e9d8701a41379b5d8a69d7
RMD160 (gcc/adastrap-i386-3.3.6-4.tgz) = ac93ba044f2b9d7f68ab09b4746c4cba28521d7b
RMD160 (gcc/gcc-4.2-20061014.tar.bz2) = 660f6d2a7ca5caf98c7dff231cc85c9ca421c862
RMD160 (gcc/gcc-4.2-20061024.tar.bz2) = 1b41a1a03af89969f2c9809bb486c0e8fa5fd7da
SHA1 (gcc/adastrap-i386-3.3.6-4.tgz) = 0a79e84f47a5a6a57197e76c31eae933622d395c
SHA1 (gcc/gcc-4.2-20061014.tar.bz2) = 4f11b09ff264db6f1a523741f44dad7fe4ae6592
SHA1 (gcc/gcc-4.2-20061024.tar.bz2) = d0dbfeb2a0be7b6984319214027fd1da0a7e9af0
SIZE (gcc/adastrap-i386-3.3.6-4.tgz) = 16776383
SIZE (gcc/gcc-4.2-20061014.tar.bz2) = 40625634
SIZE (gcc/gcc-4.2-20061024.tar.bz2) = 40654041

10
lang/gcc/4.2/patches/patch-gcc_ada_Makefile_in
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-gcc_ada_Makefile_in,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
--- gcc/ada/Makefile.in.orig Sat Apr 8 22:11:21 2006
+++ gcc/ada/Makefile.in Mon Jul 24 12:30:01 2006
@@ -116,12 +116,12 @@ MAKEINFO = makeinfo
TEXI2DVI = texi2dvi
$OpenBSD: patch-gcc_ada_Makefile_in,v 1.2 2006/11/25 16:26:46 espie Exp $
--- gcc/ada/Makefile.in.orig Tue Oct 17 06:24:13 2006
+++ gcc/ada/Makefile.in Mon Oct 30 12:43:35 2006
@@ -117,12 +117,12 @@ TEXI2DVI = texi2dvi
TEXI2PDF = texi2pdf
GNATBIND = $(STAGE_PREFIX)gnatbind
GNATBIND_FLAGS = -static -x
-ADA_CFLAGS =

8
lang/gcc/4.2/patches/patch-gcc_cp_decl2_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gcc_cp_decl2_c,v 1.2 2006/10/20 13:43:18 espie Exp $
--- gcc/cp/decl2.c.orig Tue Oct 3 20:04:10 2006
+++ gcc/cp/decl2.c Wed Oct 18 00:37:31 2006
@@ -3007,7 +3007,7 @@ build_java_method_aliases (void)
$OpenBSD: patch-gcc_cp_decl2_c,v 1.3 2006/11/25 16:26:46 espie Exp $
--- gcc/cp/decl2.c.orig Fri Oct 20 22:13:42 2006
+++ gcc/cp/decl2.c Mon Oct 30 12:43:37 2006
@@ -3015,7 +3015,7 @@ build_java_method_aliases (void)
oid = DECL_ASSEMBLER_NAME (fndecl);
oname = IDENTIFIER_POINTER (oid);
gcc_assert (oname[0] == '_' && oname[1] == 'Z');

8
lang/gcc/4.2/patches/patch-gcc_cp_parser_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gcc_cp_parser_c,v 1.2 2006/10/20 13:43:18 espie Exp $
--- gcc/cp/parser.c.orig Fri Oct 13 10:38:43 2006
+++ gcc/cp/parser.c Wed Oct 18 00:37:31 2006
@@ -16322,7 +16322,7 @@ cp_parser_require (cp_parser* parser,
$OpenBSD: patch-gcc_cp_parser_c,v 1.3 2006/11/25 16:26:46 espie Exp $
--- gcc/cp/parser.c.orig Wed Oct 18 01:22:14 2006
+++ gcc/cp/parser.c Mon Oct 30 12:43:38 2006
@@ -16381,7 +16381,7 @@ cp_parser_require (cp_parser* parser,
/* Output the MESSAGE -- unless we're parsing tentatively. */
if (!cp_parser_simulate_error (parser))
{

8
lang/gcc/4.2/patches/patch-libobjc_Makefile_in
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-libobjc_Makefile_in,v 1.2 2006/10/20 13:43:18 espie Exp $
--- libobjc/Makefile.in.orig Wed Oct 11 01:48:09 2006
+++ libobjc/Makefile.in Wed Oct 18 00:37:32 2006
$OpenBSD: patch-libobjc_Makefile_in,v 1.3 2006/11/25 16:26:46 espie Exp $
--- libobjc/Makefile.in.orig Sun Oct 15 09:42:57 2006
+++ libobjc/Makefile.in Sat Nov 25 16:49:40 2006
@@ -273,15 +273,17 @@ doc: info dvi pdf html
.PHONY: install-html
install-html:
+include $(toplevel_srcdir)/libversions
+include $(top_srcdir)/../libversions
+
libobjc$(libext).la: $(OBJS)
$(LIBTOOL_LINK) $(CC) -o $@ $(OBJS) \

10
lang/gcc/4.2/patches/patch-libstdc++-v3_libsupc++_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libstdc++-v3_libsupc++_Makefile_in,v 1.2 2006/10/20 13:43:18 espie Exp $
--- libstdc++-v3/libsupc++/Makefile.in.orig Fri Jul 21 23:11:46 2006
+++ libstdc++-v3/libsupc++/Makefile.in Wed Oct 18 00:37:32 2006
@@ -307,7 +307,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
$OpenBSD: patch-libstdc++-v3_libsupc++_Makefile_in,v 1.3 2006/11/25 16:26:46 espie Exp $
--- libstdc++-v3/libsupc++/Makefile.in.orig Mon Oct 16 21:08:22 2006
+++ libstdc++-v3/libsupc++/Makefile.in Mon Oct 30 12:43:40 2006
@@ -308,7 +308,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
# Need this library to both be part of libstdc++.a, and installed
# separately too.
# 1) separate libsupc++.la
@ -10,7 +10,7 @@ $OpenBSD: patch-libstdc++-v3_libsupc++_Makefile_in,v 1.2 2006/10/20 13:43:18 esp
# 2) integrated libsupc++convenience.la that is to be a part of libstdc++.a
noinst_LTLIBRARIES = libsupc++convenience.la
headers = \
@@ -488,7 +488,7 @@ clean-toolexeclibLTLIBRARIES:
@@ -489,7 +489,7 @@ clean-toolexeclibLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done

12
lang/gcc/4.2/patches/patch-libstdc++-v3_src_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libstdc++-v3_src_Makefile_in,v 1.2 2006/10/20 13:43:18 espie Exp $
--- libstdc++-v3/src/Makefile.in.orig Fri Jul 28 06:57:34 2006
+++ libstdc++-v3/src/Makefile.in Wed Oct 18 00:37:32 2006
@@ -299,7 +299,7 @@ WARN_CXXFLAGS = \
$OpenBSD: patch-libstdc++-v3_src_Makefile_in,v 1.3 2006/11/25 16:26:46 espie Exp $
--- libstdc++-v3/src/Makefile.in.orig Mon Oct 16 21:08:22 2006
+++ libstdc++-v3/src/Makefile.in Mon Oct 30 12:43:40 2006
@@ -300,7 +300,7 @@ WARN_CXXFLAGS = \
AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
# Cross compiler support.
@ -10,7 +10,7 @@ $OpenBSD: patch-libstdc++-v3_src_Makefile_in,v 1.2 2006/10/20 13:43:18 espie Exp
@ENABLE_SYMVERS_DARWIN_TRUE@@ENABLE_SYMVERS_TRUE@version_arg = -Wl,-exported_symbols_list,libstdc++-symbols.explist
@ENABLE_SYMVERS_FALSE@version_arg =
@ENABLE_SYMVERS_GNU_NAMESPACE_TRUE@@ENABLE_SYMVERS_TRUE@version_arg = -Wl,--version-script=libstdc++-symbols.ver
@@ -385,9 +385,11 @@ libstdc___la_LIBADD = \
@@ -386,9 +386,11 @@ libstdc___la_LIBADD = \
$(top_builddir)/libmath/libmath.la \
$(top_builddir)/libsupc++/libsupc++convenience.la
@ -23,7 +23,7 @@ $OpenBSD: patch-libstdc++-v3_src_Makefile_in,v 1.2 2006/10/20 13:43:18 espie Exp
# Use special rules for the deprecated source files so that they find
@@ -499,7 +501,7 @@ clean-toolexeclibLTLIBRARIES:
@@ -500,7 +502,7 @@ clean-toolexeclibLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done

2
lang/gcc/4.2/pkg/PFRAG.I386 → lang/gcc/4.2/pkg/PFRAG.I386-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.I386,v 1.1 2006/08/01 08:58:11 espie Exp $
@comment $OpenBSD: PFRAG.I386-main,v 1.1 2006/11/25 16:26:46 espie Exp $
lib/gcc/${CONFIG}/${V}/include/emmintrin.h
lib/gcc/${CONFIG}/${V}/include/mm3dnow.h
lib/gcc/${CONFIG}/${V}/include/mm_malloc.h

2
lang/gcc/4.2/pkg/PFRAG.PIC → lang/gcc/4.2/pkg/PFRAG.PIC-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.PIC,v 1.1 2006/10/20 13:43:18 espie Exp $
@comment $OpenBSD: PFRAG.PIC-main,v 1.1 2006/11/25 16:26:46 espie Exp $
lib/gcc/${CONFIG}/${V}/fpic/
lib/gcc/${CONFIG}/${V}/fpic/libgcc.a
lib/gcc/${CONFIG}/${V}/fpic/libgcov.a

2
lang/gcc/4.2/pkg/PFRAG.shared
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
@lib lib/libssp.so.${LIBssp_VERSION}

2
lang/gcc/4.2/pkg/PFRAG.shared-main Normal file
View File

@ -0,0 +1,2 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.1 2006/11/25 16:26:46 espie Exp $
@lib lib/libssp.so.${LIBssp_VERSION}

3
lang/gcc/4.2/pkg/PLIST → lang/gcc/4.2/pkg/PLIST-main
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2006/10/20 13:43:18 espie Exp $
@comment $OpenBSD: PLIST-main,v 1.1 2006/11/25 16:26:46 espie Exp $
@pkgpath lang/gcc/4.2
%%SHARED%%
bin/ecpp
bin/egcc