3.0.1 is out. Remove integrated patches.

Tweak packing-lists.
Put USE_GMAKE in for now...
This commit is contained in:
espie 2001-08-22 09:03:04 +00:00
parent 05f8f9fcc8
commit 64d78e030e
23 changed files with 92 additions and 509 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.45 2001/08/10 22:58:56 naddy Exp $
# $OpenBSD: Makefile,v 1.46 2001/08/22 09:03:04 espie Exp $
# This is a configuration file for egcs
@ -25,7 +25,7 @@ BUILD_DEPENDS= autoconf::devel/autoconf
BUILD_DEPENDS+= bison:bison-*:devel/bison
CATEGORIES= lang
NEED_VERSION= 1.419
NEED_VERSION= 1.420
MAINTAINER= Marc Espie <espie@openbsd.org>
@ -54,10 +54,10 @@ PERMIT_DISTFILES_CDROM=Yes
# and g77-tests only holds duplicates from the main testsuite archive.
#MAKE_TESTS=yes
MAKE_GXX=Yes
MAKE_FORTRAN=Yes
#MAKE_FORTRAN=Yes
# we don't care about chill
#MAKE_CHILL=yes
MAKE_OBJC=Yes
#MAKE_OBJC=Yes
#MAKE_JAVA=Yes
MULTI_PACKAGES=
@ -75,16 +75,16 @@ BUILD_DEPENDS+=bison:bison-*:devel/bison
#### fetch section
LATEST=3.0
V=3.0.1
DIRECTORY=releases/${DISTNAME}/
DISTNAME= gcc-${LATEST}
DISTNAME= gcc-$V
# getting the right archives where they should be
MASTER_SITE_SUBDIR=${LATEST_DATE}
DIST_SUBDIR=egcs
DISTFILES= gcc-${LATEST}${EXTRACT_SUFX}
DISTFILES= gcc-$V${EXTRACT_SUFX}
SITES=
@ -236,7 +236,6 @@ CONFIGURE_ARGS += --with-gnu-ld
CONFIGURE_ARGS += ${CONFIGURE_SHARED}
SEPARATE_BUILD=concurrent
#WRKBUILD=${WRKDIR}/build-${MACHINE_ARCH}
@ -300,5 +299,6 @@ RUN_DEPENDS+=egcc::lang/egcs/stable
. endif
.endif
SUBST_VARS=OSREV V
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (egcs/gcc-3.0.tar.gz) = 145e82e04d286f60f7e55b5dbe567732
RMD160 (egcs/gcc-3.0.tar.gz) = abc403948bd13d2b49e790ea22323808d80e346e
SHA1 (egcs/gcc-3.0.tar.gz) = ddf63f347f1746053af27108a023a6b09c2fcd65
MD5 (egcs/gcc-3.0.1.tar.gz) = 9d34758cdc6194e115513c95d8dac824
RMD160 (egcs/gcc-3.0.1.tar.gz) = 90f72f27b88579f4fe68d38dbdcb5d30076b89eb
SHA1 (egcs/gcc-3.0.1.tar.gz) = f7492884a2d37a11ffdefb2c6174f89ff03ef00f

View File

@ -1,39 +0,0 @@
$OpenBSD: patch-gcc_config_gcc,v 1.1 2001/07/09 10:26:19 espie Exp $
--- gcc/config.gcc.orig Fri Jul 6 10:50:14 2001
+++ gcc/config.gcc Fri Jul 6 10:52:28 2001
@@ -287,7 +287,7 @@ case $machine in
;;
*-*-openbsd*)
tm_file=${cpu_type}/openbsd.h
- tmake_file="t-libc-ok t-openbsd"
+ tmake_file="t-libc-ok t-openbsd t-libgcc-pic"
# avoid surprises, always provide an xm-openbsd file
xm_file=${cpu_type}/xm-openbsd.h
# don't depend on processor x-fragments as well
@@ -1142,6 +1142,8 @@ i[34567]86-*-netbsd*)
use_collect2=yes
;;
i[34567]86-*-openbsd*)
+ # needed to unconfuse gdb
+ tmake_file="t-libc-ok t-openbsd i386/t-openbsd"
# we need collect2 until our bug is fixed...
use_collect2=yes
;;
@@ -2039,6 +2041,8 @@ m68k*-*-netbsd*)
use_collect2=yes
;;
m68k*-*-openbsd*)
+ # needed to unconfuse gdb
+ tmake_file="t-libc-ok t-openbsd m68k/t-openbsd"
float_format=m68k
# we need collect2 until our bug is fixed...
use_collect2=yes
@@ -3030,6 +3034,8 @@ sparc-*-netbsd*)
use_collect2=yes
;;
sparc-*-openbsd*)
+ # needed to unconfuse gdb
+ tmake_file="t-libc-ok t-openbsd sparc/t-openbsd"
# we need collect2 until our bug is fixed...
use_collect2=yes
;;

View File

@ -1,20 +0,0 @@
$OpenBSD: patch-gcc_config_i386_openbsd_h,v 1.2 2001/07/13 14:06:56 espie Exp $
--- gcc/config/i386/openbsd.h.orig Sun May 20 21:49:17 2001
+++ gcc/config/i386/openbsd.h Fri Jul 13 16:03:53 2001
@@ -114,6 +114,8 @@ Boston, MA 02111-1307, USA. */
configuration files... */
#define DWARF2_UNWIND_INFO 0
+#undef ASM_PREFERRED_EH_DATA_FORMAT
+
/* Assembler format: alignment output. */
/* A C statement to output to the stdio stream FILE an assembler
@@ -133,3 +135,7 @@ Boston, MA 02111-1307, USA. */
#endif
/* Note that we pick up ASM_OUTPUT_MI_THUNK from unix.h. */
+
+#undef ASM_COMMENT_START
+#define ASM_COMMENT_START ";#"
+

View File

@ -1,10 +0,0 @@
$OpenBSD: patch-gcc_config_i386_t-openbsd,v 1.1 2001/07/09 10:26:20 espie Exp $
--- gcc/config/i386/t-openbsd.orig Fri Jul 6 10:47:23 2001
+++ gcc/config/i386/t-openbsd Fri Jul 6 10:47:57 2001
@@ -0,0 +1,6 @@
+# gdb gets confused if pic code is linked with non pic
+# We cope by building variants of libgcc.
+MULTILIB_OPTIONS = fpic
+MULTILIB_MATCHES=fpic=fPIC
+LIBGCC = stmp-multilib
+INSTALL_LIBGCC = install-multilib

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-gcc_config_m68k_t-openbsd,v 1.1 2001/07/09 10:26:20 espie Exp $
--- gcc/config/m68k/t-openbsd.orig Fri Jul 6 10:52:57 2001
+++ gcc/config/m68k/t-openbsd Fri Jul 6 10:52:48 2001
@@ -0,0 +1,5 @@
+# gdb gets confused if pic code is linked with non pic
+# We cope by building all variants of libgcc.
+MULTILIB_OPTIONS = fpic/fPIC
+LIBGCC = stmp-multilib
+INSTALL_LIBGCC = install-multilib

View File

@ -1,42 +0,0 @@
$OpenBSD: patch-gcc_config_openbsd_h,v 1.2 2001/07/13 14:06:57 espie Exp $
--- gcc/config/openbsd.h.orig Mon Sep 25 13:45:51 2000
+++ gcc/config/openbsd.h Tue Jul 10 12:39:40 2001
@@ -78,12 +78,16 @@ Boston, MA 02111-1307, USA. */
since all code must be compiled with -pthread to work.
This two-stage defines makes it easy to pick that for targets that
have subspecs. */
+#ifdef CPP_CPU_SPEC
+#define OBSD_CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE} %{pthread:-D_POSIX_THREADS}"
+#else
#define OBSD_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_POSIX_THREADS}"
+#endif
/* LIB_SPEC appropriate for OpenBSD. Select the appropriate libc,
depending on profiling and threads. Basically,
-lc(_r)?(_p)?, select _r for threads, and _p for p or pg. */
-#define OBSD_LIB_SPEC "-lc%{pthread:_r}%{p:_p}%{!p:%{pg:_p}}"
+#define OBSD_LIB_SPEC "%{!shared:-lc%{pthread:_r}%{p:_p}%{!p:%{pg:_p}}}"
#ifndef OBSD_HAS_CORRECT_SPECS
@@ -103,6 +107,7 @@ Boston, MA 02111-1307, USA. */
pic code. */
#undef ASM_SPEC
#define ASM_SPEC "%{fpic:-k} %{fPIC:-k -K} %|"
+
#else
/* Since we use gas, stdin -> - is a good idea, but we don't want to
override native specs just for that. */
@@ -116,10 +121,10 @@ Boston, MA 02111-1307, USA. */
#undef LINK_SPEC
#ifdef OBSD_NO_DYNAMIC_LIBRARIES
#define LINK_SPEC \
- "%{!nostdlib:%{!r*:%{!e*:-e start}}} -dc -dp %{assert*}"
+ "%{g:%{!nostdlib:-L/usr/lib/debug}} %{!nostdlib:%{!r*:%{!e*:-e start}}} -dc -dp %{assert*}"
#else
#define LINK_SPEC \
- "%{!shared:%{!nostdlib:%{!r*:%{!e*:-e start}}}} %{shared:-Bshareable -x} -dc -dp %{R*} %{static:-Bstatic} %{assert*}"
+ "%{g:%{!nostdlib:-L/usr/lib/debug}} %{!shared:%{!nostdlib:%{!r*:%{!e*:-e start}}}} %{shared:-Bshareable -x} -dc -dp %{R*} %{static:-Bstatic} %{assert*}"
#endif
#undef LIB_SPEC

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-gcc_config_sparc_openbsd_h,v 1.1 2001/07/13 14:06:58 espie Exp $
--- gcc/config/sparc/openbsd.h.orig Fri Jul 13 16:03:16 2001
+++ gcc/config/sparc/openbsd.h Fri Jul 13 16:03:46 2001
@@ -64,5 +64,6 @@ Boston, MA 02111-1307, USA. */
configuration files... */
#define DWARF2_UNWIND_INFO 0
-/* Default sparc.h does already define ASM_OUTPUT_MI_THUNK */
+#undef ASM_PREFERRED_EH_DATA_FORMAT
+/* Default sparc.h does already define ASM_OUTPUT_MI_THUNK */

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-gcc_config_sparc_t-openbsd,v 1.1 2001/07/09 10:26:20 espie Exp $
--- gcc/config/sparc/t-openbsd.orig Fri Jul 6 10:53:10 2001
+++ gcc/config/sparc/t-openbsd Fri Jul 6 10:53:07 2001
@@ -0,0 +1,5 @@
+# The native linker doesn't handle linking -fpic code with -fPIC code. Ugh.
+# We cope by building both variants of libgcc.
+MULTILIB_OPTIONS = fpic/fPIC
+LIBGCC = stmp-multilib
+INSTALL_LIBGCC = install-multilib

View File

@ -1,6 +0,0 @@
$OpenBSD: patch-gcc_config_t-libgcc-pic,v 1.1 2001/07/09 10:26:20 espie Exp $
--- gcc/config/t-libgcc-pic.orig Fri Jul 6 10:49:28 2001
+++ gcc/config/t-libgcc-pic Fri Jul 6 10:49:37 2001
@@ -0,0 +1,2 @@
+# Compile libgcc2.a with pic.
+TARGET_LIBGCC2_CFLAGS = -fPIC

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_except_h,v 1.1 2001/07/09 10:26:20 espie Exp $
--- gcc/except.h.orig Sun Jul 8 13:06:47 2001
+++ gcc/except.h Sun Jul 8 13:06:58 2001
@@ -180,7 +180,7 @@ extern tree (*lang_eh_runtime_type) PARA
#if ! (defined (EH_RETURN_DATA_REGNO) \
&& (defined (IA64_UNWIND_INFO) \
- || (defined (DWARF2_UNWIND_INFO) \
+ || (DWARF2_UNWIND_INFO \
&& defined (EH_RETURN_STACKADJ_RTX) \
&& (defined (EH_RETURN_HANDLER_RTX) \
|| defined (HAVE_eh_return)))))

View File

@ -1,6 +1,5 @@
$OpenBSD: patch-libffi_configure_in,v 1.1 2001/07/09 10:26:20 espie Exp $
--- libffi/configure.in.orig Mon Jul 9 09:33:19 2001
+++ libffi/configure.in Mon Jul 9 09:35:39 2001
--- libffi/configure.in.orig Mon Jun 25 21:57:42 2001
+++ libffi/configure.in Wed Aug 22 09:32:45 2001
@@ -40,6 +40,7 @@ AC_PROG_LIBTOOL
TARGETDIR="unknown"
case "$host" in
@ -15,9 +14,9 @@ $OpenBSD: patch-libffi_configure_in,v 1.1 2001/07/09 10:26:20 espie Exp $
i*86-*-mingw*) TARGET=X86_WIN32; TARGETDIR=x86;;
+i*86-*-openbsd*) TARGET=X86; TARGETDIR=x86;;
sparc-sun-4*) TARGET=SPARC; TARGETDIR=sparc;;
sparc-sun-*) TARGET=SPARC; TARGETDIR=sparc;;
+sparc-*-openbsd*) TARGET=SPARC; TARGETDIR=sparc;;
sparc*-sun-*) TARGET=SPARC; TARGETDIR=sparc;;
sparc-*-linux*) TARGET=SPARC; TARGETDIR=sparc;;
+sparc-*-openbsd*) TARGET=SPARC; TARGETDIR=sparc;;
sparc64-*-linux*) TARGET=SPARC; TARGETDIR=sparc;;
alpha*-*-linux* | alpha*-*-osf*) TARGET=ALPHA; TARGETDIR=alpha;;
+alpha*-*-openbsd*) TARGET=ALPHA; TARGETDIR=alpha;;

View File

@ -1,87 +0,0 @@
$OpenBSD: patch-libffi_src_x86_sysv_S,v 1.1 2001/07/09 10:26:20 espie Exp $
--- libffi/src/x86/sysv.S.orig Mon Jul 9 09:45:23 2001
+++ libffi/src/x86/sysv.S Mon Jul 9 09:57:25 2001
@@ -33,7 +33,11 @@
.globl ffi_prep_args
# This assumes we are using gas.
+#ifdef __OpenBSD__
+ .align 4
+#else
.balign 16
+#endif
.globl ffi_call_SYSV
.type ffi_call_SYSV,@function
@@ -130,39 +134,45 @@ epilogue:
.ffi_call_SYSV_end:
.size ffi_call_SYSV,.ffi_call_SYSV_end-ffi_call_SYSV
+#ifdef __OpenBSD__
+.data
+#define FOURBYTE long
+#else
.section .eh_frame,"aw",@progbits
+#define FOURBYTE 4byte
+#endif
__FRAME_BEGIN__:
- .4byte .LLCIE1
+ .FOURBYTE .LLCIE1
.LSCIE1:
- .4byte 0x0
- .byte 0x1
- .byte 0x0
- .byte 0x1
- .byte 0x7c
- .byte 0x8
- .byte 0xc
- .byte 0x4
- .byte 0x4
- .byte 0x88
- .byte 0x1
+ .FOURBYTE 0x0
+ .byte 0x1
+ .byte 0x0
+ .byte 0x1
+ .byte 0x7c
+ .byte 0x8
+ .byte 0xc
+ .byte 0x4
+ .byte 0x4
+ .byte 0x88
+ .byte 0x1
.align 4
.LECIE1:
.set .LLCIE1,.LECIE1-.LSCIE1
- .4byte .LLFDE1
+ .FOURBYTE .LLFDE1
.LSFDE1:
- .4byte .LSFDE1-__FRAME_BEGIN__
- .4byte .LFB1
- .4byte .LFE1-.LFB1
- .byte 0x4
- .4byte .LCFI0-.LFB1
- .byte 0xe
- .byte 0x8
- .byte 0x85
- .byte 0x2
- .byte 0x4
- .4byte .LCFI1-.LCFI0
- .byte 0xd
- .byte 0x5
+ .FOURBYTE .LSFDE1-__FRAME_BEGIN__
+ .FOURBYTE .LFB1
+ .FOURBYTE .LFE1-.LFB1
+ .byte 0x4
+ .FOURBYTE .LCFI0-.LFB1
+ .byte 0xe
+ .byte 0x8
+ .byte 0x85
+ .byte 0x2
+ .byte 0x4
+ .FOURBYTE .LCFI1-.LCFI0
+ .byte 0xd
+ .byte 0x5
.align 4
.LEFDE1:
.set .LLFDE1,.LEFDE1-.LSFDE1

View File

@ -1,22 +0,0 @@
Current snapshots won't build on many bsd systems without the following
patch, as machine/endian.h cannot be included without including sys/types.h
first.
2000-12-27 Marc Espie <espie@openbsd.org>
* configure.in: Check for sys/types.h.
* configure: Rebuild.
* libmath/mathconf.h: Include sys/types.h prior to
machine/endian.h if available.
--- libstdc++-v3/configure.in.orig Thu Jun 14 10:47:35 2001
+++ libstdc++-v3/configure.in Fri Jul 13 15:13:06 2001
@@ -204,7 +204,7 @@ else
# Check for available headers.
AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h machine/endian.h \
- machine/param.h sys/machine.h fp.h locale.h float.h inttypes.h gconv.h])
+ machine/param.h sys/machine.h sys/types.h fp.h locale.h float.h inttypes.h gconv.h])
GLIBCPP_CHECK_COMPILER_FEATURES
GLIBCPP_CHECK_LINKER_FEATURES

View File

@ -1,38 +1,30 @@
$OpenBSD: patch-libstdc++-v3_libmath_Makefile_in,v 1.1 2001/07/13 14:06:59 espie Exp $
$OpenBSD: patch-libstdc++-v3_libmath_Makefile_in,v 1.2 2001/08/22 09:03:04 espie Exp $
--- libstdc++-v3/libmath/Makefile.in.orig Mon May 14 21:49:10 2001
+++ libstdc++-v3/libmath/Makefile.in Fri Jul 13 15:13:06 2001
@@ -131,7 +131,7 @@ libmath_la_DEPENDENCIES = $(libmath_la_L
+++ libstdc++-v3/libmath/Makefile.in Sat Jul 14 16:02:28 2001
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
@@ -131,7 +131,11 @@ libmath_la_DEPENDENCIES = $(libmath_la_L
libmath_la_SOURCES = signbit.c signbitf.c
-LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --mode=link --tag=CC "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --mode=link --tag CC "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+
+# Need to explicitly set LTCOMPILE to make sure libtool uses the correct
+# configuration
+LTCOMPILE = $(LIBTOOL) --mode=compile --tag CC $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
GLIBCPP_INCLUDE_DIR = @GLIBCPP_INCLUDE_DIR@
@@ -157,7 +157,7 @@ libmath_la_LDFLAGS =
@@ -157,7 +161,6 @@ libmath_la_LDFLAGS =
libmath_la_OBJECTS = signbit.lo signbitf.lo
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile --tag CC $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
DIST_COMMON = Makefile.am Makefile.in
@@ -215,13 +215,13 @@ distclean-compile:
maintainer-clean-compile:
.c.lo:
- $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ $(LIBTOOL) --mode=compile --tag CC $(COMPILE) -c $<
.s.lo:
- $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ $(LIBTOOL) --mode=compile --tag CC $(COMPILE) -c $<
.S.lo:
- $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ $(LIBTOOL) --mode=compile --tag CC $(COMPILE) -c $<
mostlyclean-libtool:
-rm -f *.lo

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-libstdc++-v3_libmath_mathconf_h,v 1.3 2001/07/13 14:06:59 espie Exp $
--- libstdc++-v3/libmath/mathconf.h.orig Sun Feb 25 10:25:42 2001
+++ libstdc++-v3/libmath/mathconf.h Fri Jul 13 15:13:06 2001
@@ -34,6 +34,9 @@
# include <endian.h>
#else
# ifdef _GLIBCPP_HAVE_MACHINE_ENDIAN_H
+# ifdef _GLIBCPP_HAVE_SYS_TYPES_H
+# include <sys/types.h>
+# endif
# include <machine/endian.h>
# else
# ifdef _GLIBCPP_HAVE_SYS_MACHINE_H

View File

@ -1,70 +0,0 @@
$OpenBSD: patch-libstdc++-v3_libsupc++_Makefile_in,v 1.3 2001/07/13 14:07:00 espie Exp $
--- libstdc++-v3/libsupc++/Makefile.in.orig Mon Jun 4 04:29:37 2001
+++ libstdc++-v3/libsupc++/Makefile.in Fri Jul 13 15:13:06 2001
@@ -32,7 +32,7 @@ mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
-DESTDIR =
+# DESTDIR =
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -273,18 +273,18 @@ maintainer-clean-toolexeclibLTLIBRARIES:
install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(toolexeclibdir)
+ $(mkinstalldirs) $(toolexeclibdir)
@list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
- echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(toolexeclibdir)/$$p"; \
- $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(toolexeclibdir)/$$p; \
+ echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(toolexeclibdir)/$$p"; \
+ $(LIBTOOL) --mode=install $(INSTALL) $$p $(toolexeclibdir)/$$p; \
else :; fi; \
done
uninstall-toolexeclibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \
- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(toolexeclibdir)/$$p; \
+ $(LIBTOOL) --mode=uninstall rm -f $(toolexeclibdir)/$$p; \
done
.c.o:
@@ -414,8 +414,8 @@ all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(toolexeclibdir) \
- $(DESTDIR)$(glibcppinstalldir)
+ $(mkinstalldirs) $(toolexeclibdir) \
+ $(glibcppinstalldir)
mostlyclean-generic:
@@ -479,19 +479,19 @@ maintainer-clean-generic clean mostlycle
# prepending each of $(glibcppinstall_HEADERS) with VPATH below.
install-glibcppinstallHEADERS: $(glibcppinstall_HEADERS)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(glibcppinstalldir)
+ $(mkinstalldirs) $(glibcppinstalldir)
@list='$(glibcppinstall_HEADERS)'; for p in $$list; do \
q=`echo $$p | sed -e 's,.*/,,'`; \
if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
- echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcppinstalldir)/$$q"; \
- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcppinstalldir)/$$q; \
+ echo " $(INSTALL_DATA) $$d$$p $(glibcppinstalldir)/$$q"; \
+ $(INSTALL_DATA) $$d$$p $(glibcppinstalldir)/$$q; \
done
uninstall-glibcppinstallHEADERS:
@$(NORMAL_UNINSTALL)
list='$(glibcppinstall_HEADERS)'; for p in $$list; do \
q=`echo $$p | sed -e 's,.*/,,'`; \
- rm -f $(DESTDIR)$(glibcppinstalldir)/$$q; \
+ rm -f $(glibcppinstalldir)/$$q; \
done
# Tell versions [3.59,3.63) of GNU make to not export all variables.

View File

@ -1,59 +0,0 @@
$OpenBSD: patch-libstdc++-v3_src_Makefile_in,v 1.3 2001/07/13 14:07:01 espie Exp $
--- libstdc++-v3/src/Makefile.in.orig Fri Jun 8 22:09:30 2001
+++ libstdc++-v3/src/Makefile.in Fri Jul 13 15:13:06 2001
@@ -33,7 +33,7 @@ mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
-DESTDIR =
+# DESTDIR =
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -284,18 +284,18 @@ maintainer-clean-toolexeclibLTLIBRARIES:
install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(toolexeclibdir)
+ $(mkinstalldirs) $(toolexeclibdir)
@list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
- echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(toolexeclibdir)/$$p"; \
- $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(toolexeclibdir)/$$p; \
+ echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(toolexeclibdir)/$$p"; \
+ $(LIBTOOL) --mode=install $(INSTALL) $$p $(toolexeclibdir)/$$p; \
else :; fi; \
done
uninstall-toolexeclibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \
- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(toolexeclibdir)/$$p; \
+ $(LIBTOOL) --mode=uninstall rm -f $(toolexeclibdir)/$$p; \
done
.c.o:
@@ -421,7 +421,7 @@ all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(toolexeclibdir)
+ $(mkinstalldirs) $(toolexeclibdir)
mostlyclean-generic:
@@ -511,10 +511,10 @@ install-data-local: myinstalldirs myinst
# NB: installation of shadow header directories is not attempted.
myinstalldirs:
if test -z "$(MULTISUBDIR)"; then \
- $(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/backward; \
- $(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/bits; \
- $(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/ext; \
- $(mkinstalldirs) $(DESTDIR)$(gxx_target_include_dir)/bits; \
+ $(mkinstalldirs) $(gxx_include_dir)/backward; \
+ $(mkinstalldirs) $(gxx_include_dir)/bits; \
+ $(mkinstalldirs) $(gxx_include_dir)/ext; \
+ $(mkinstalldirs) $(gxx_target_include_dir)/bits; \
fi
myinstallheaders:
if test -z "$(MULTISUBDIR)"; then \

View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared-objc,v 1.1 2001/07/09 10:26:22 espie Exp $
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/libobjc.so.1.0
@comment $OpenBSD: PFRAG.shared-objc,v 1.2 2001/08/22 09:03:04 espie Exp $
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/libobjc.so.1.0

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2001/07/09 10:26:22 espie Exp $
@comment $OpenBSD: PLIST,v 1.5 2001/08/22 09:03:04 espie Exp $
@option no-default-conflict
@pkgcfl egcs-*-core
@pkgcfl gcc-*-core
@ -10,7 +10,7 @@ bin/eg++
bin/egcc
bin/egccbug
bin/egcov
bin/${MACHINE_ARCH}-unknown-openbsd2.9-gcc
bin/${MACHINE_ARCH}-unknown-openbsd${OSREV}-gcc
info/cpp.info
info/cpp.info-1
info/cpp.info-2
@ -57,32 +57,29 @@ info/gcc.info-7
info/gcc.info-8
info/gcc.info-9
lib/fpic/libiberty.a
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/cc1
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/collect2
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/cpp0
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/fpic/libg2c.a
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/fpic/libgcc.a
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/include/README
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/include/float.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/include/g2c.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/include/limits.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/include/machine/ansi.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/include/stdarg.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/include/syslimits.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/include/varargs.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/libg2c.a
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/libgcc.a
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/specs
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/tradcpp0
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/cc1
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/collect2
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/cpp0
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/fpic/libgcc.a
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/README
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/float.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/limits.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/machine/ansi.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/stdarg.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/syslimits.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/varargs.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/libgcc.a
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/specs
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/tradcpp0
lib/libiberty.a
man/man1/cpp.1
man/man1/egcc.1
man/man1/gcov.1
%%SHARED%%
@dirrm lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/include/machine
@dirrm lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/include
@dirrm lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/fpic
@dirrm lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0
@dirrm lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/machine
@dirrm lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include
@dirrm lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/fpic
@dirrm lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}
@dirrm lib/fpic
@exec install-info --info-dir=%D/info %D/info/cpp.info
@exec install-info --info-dir=%D/info %D/info/cppinternals.info

View File

@ -1,11 +1,11 @@
@comment $OpenBSD: PLIST-c++,v 1.2 2001/07/09 10:26:22 espie Exp $
@comment $OpenBSD: PLIST-c++,v 1.3 2001/08/22 09:03:04 espie Exp $
@option no-default-conflict
@pkgcfl egcs-*-c++
@pkgcfl gcc-*-c++
bin/ec++
bin/ec++filt
bin/${MACHINE_ARCH}-unknown-openbsd2.9-c++
bin/${MACHINE_ARCH}-unknown-openbsd2.9-g++
bin/${MACHINE_ARCH}-unknown-openbsd${OSREV}-c++
bin/${MACHINE_ARCH}-unknown-openbsd${OSREV}-g++
include/g++-v3/algorithm
include/g++-v3/backward/algo.h
include/g++-v3/backward/algobase.h
@ -103,6 +103,7 @@ include/g++-v3/bits/std_iosfwd.h
include/g++-v3/bits/std_iostream.h
include/g++-v3/bits/std_istream.h
include/g++-v3/bits/std_iterator.h
include/g++-v3/bits/std_limits.h
include/g++-v3/bits/std_list.h
include/g++-v3/bits/std_locale.h
include/g++-v3/bits/std_map.h
@ -187,19 +188,19 @@ include/g++-v3/ext/stl_hashtable.h
include/g++-v3/ext/stl_rope.h
include/g++-v3/fstream
include/g++-v3/functional
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd2.9/bits/atomicity.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd2.9/bits/basic_file_model.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd2.9/bits/c++config.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd2.9/bits/c++io.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd2.9/bits/c++locale.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd2.9/bits/ctype_base.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd2.9/bits/ctype_inline.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd2.9/bits/ctype_noninline.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd2.9/bits/gthr-default.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd2.9/bits/gthr-single.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd2.9/bits/gthr.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd2.9/bits/os_defines.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd2.9/bits/std_limits.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd${OSREV}/bits/atomicity.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd${OSREV}/bits/basic_file_model.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd${OSREV}/bits/c++config.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd${OSREV}/bits/c++io.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd${OSREV}/bits/c++locale.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd${OSREV}/bits/ctype_base.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd${OSREV}/bits/ctype_inline.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd${OSREV}/bits/ctype_noninline.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd${OSREV}/bits/gthr-default.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd${OSREV}/bits/gthr-single.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd${OSREV}/bits/gthr.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd${OSREV}/bits/limits.h
include/g++-v3/${MACHINE_ARCH}-unknown-openbsd${OSREV}/bits/os_defines.h
include/g++-v3/iomanip
include/g++-v3/ios
include/g++-v3/iosfwd
@ -229,13 +230,13 @@ lib/fpic/libstdc++.a
lib/fpic/libstdc++.la
lib/fpic/libsupc++.a
lib/fpic/libsupc++.la
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/cc1plus
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/cc1plus
lib/libstdc++.a
lib/libstdc++.la
lib/libsupc++.a
lib/libsupc++.la
man/man1/eg++.1
@dirrm include/g++-v3/${MACHINE_ARCH}-unknown-openbsd2.9/bits
@dirrm include/g++-v3/${MACHINE_ARCH}-unknown-openbsd${OSREV}/bits
@dirrm include/g++-v3/ext
@dirrm include/g++-v3/bits
@dirrm include/g++-v3/backward

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-g77,v 1.2 2001/07/11 10:58:36 espie Exp $
@comment $OpenBSD: PLIST-g77,v 1.3 2001/08/22 09:03:04 espie Exp $
@option no-default-conflict
@pkgcfl egcs-*-g77
@pkgcfl gcc-*-g77
@ -26,6 +26,9 @@ info/g77.info-6
info/g77.info-7
info/g77.info-8
info/g77.info-9
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/f771
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/f771
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/fpic/libg2c.a
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/g2c.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/libg2c.a
man/man1/eg77.1
@exec install-info --info-dir=%D/info %D/info/g77.info

View File

@ -1,19 +1,19 @@
@comment $OpenBSD: PLIST-objc,v 1.2 2001/07/11 10:58:36 espie Exp $
@comment $OpenBSD: PLIST-objc,v 1.3 2001/08/22 09:03:04 espie Exp $
@option no-default-conflict
@pkgcfl egcs-*-objc
@pkgcfl gcc-*-objc
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/cc1obj
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/include/objc/NXConstStr.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/include/objc/Object.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/include/objc/Protocol.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/include/objc/encoding.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/include/objc/hash.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/include/objc/objc-api.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/include/objc/objc-list.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/include/objc/objc.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/include/objc/sarray.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/include/objc/thr.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/include/objc/typedstream.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/libobjc.a
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/libobjc.la
@dirrm lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd2.9/3.0/include/objc
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/cc1obj
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/objc/NXConstStr.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/objc/Object.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/objc/Protocol.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/objc/encoding.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/objc/hash.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/objc/objc-api.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/objc/objc-list.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/objc/objc.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/objc/sarray.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/objc/thr.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/objc/typedstream.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/libobjc.a
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/libobjc.la
@dirrm lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/objc