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

as discussed with pascal, make build more reproducible, by enforcing

Browse Source 
CONFIG_SITE even if the FSF says no.

Also, finally get rid of the stage3 build/comparison, since apart from
taking build time, it's not really THAT useful unless you're specifically
debugging gcc.
This commit is contained in:
espie 2012-01-23 17:04:10 +00:00
parent ffc317cb53
commit 64971ac124
2 changed files with 278 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lang/gcc/4.6/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2012/01/23 15:34:01 espie Exp $
# $OpenBSD: Makefile,v 1.12 2012/01/23 17:04:10 espie Exp $
ONLY_FOR_ARCHS = amd64 i386 powerpc sparc sparc64
@ -30,7 +30,7 @@ SHARED_LIBS = estdc++ 12.0 \
go 0.0
PSEUDO_FLAVORS = no_c++ no_f95 no_objc no_java no_ada no_go
PSEUDO_FLAVORS = no_c++ no_f95 no_objc no_java no_ada no_go full
FLAVOR ?=
ONLY_FOR_ARCHS-ada = i386
@ -79,15 +79,14 @@ LANGS := ${LANGS},objc
LANGS := ${LANGS},java
DISTFILES += ${ECJ}:1
BUILD_DEPENDS += archivers/zip>=2.3p0
CONFIGURE_ARGS += --enable-libgcj
CONFIGURE_ARGS += --enable-libgcj --without-jar
VMEM_WARNING = Yes
.endif
.if ${BUILD_PACKAGES:M-ada}
LANGS := ${LANGS},ada
DISTFILES += ${ADASTRAP}:0
EXTRACT_ONLY += ${ADASTRAP}
CONFIGURE_ENV = ADAC=${WRKDIR}/bin/egcc GNATBIND=${WRKDIR}/bin/gnatbind
MAKE_ENV = ADAC=${WRKDIR}/bin/egcc GNATBIND=${WRKDIR}/bin/gnatbind
EXTRA_ENV += ADAC=${WRKDIR}/bin/egcc GNATBIND=${WRKDIR}/bin/gnatbind
CC = ${WRKDIR}/bin/egcc
REGRESS_DEPENDS += ${BUILD_PKGPATH},-ada
.endif
@ -98,10 +97,13 @@ LANGS := ${LANGS},go
CONFIGURE_STYLE = gnu
MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC} ${WRKSRC}/gcc
CONFIGURE_ENV += am_cv_func_iconv=no
CONFIGURE_ENV += ac_cv_prog_CONFIGURED_M4=/usr/bin/m4
EXTRA_ENV += am_cv_func_iconv=no JAR=no
EXTRA_ENV += ac_cv_prog_CONFIGURED_M4=/usr/bin/m4
MAKE_FLAGS += ac_cv_path_mkdir=/bin/mkdir
CONFIGURE_ENV += ${EXTRA_ENV}
MAKE_ENV += ${EXTRA_ENV}
# Note: the configure target passes CFLAGS to the configure script anyways.
CFLAGS = -O2 -g
@ -134,9 +136,14 @@ SEPARATE_BUILD = flavored
USE_GMAKE = yes
.if ${FLAVOR:Mfull}
# you shouldn't skip bootstrap unless you know what you're doing
# use bootstrap-lean if you're pressed for space
ALL_TARGET = bootstrap
.else
# skip the stage2/stage3 bullshit under normal circumstances
ALL_TARGET = bootstrap2
.endif
MAKE_FLAGS += libstdc___la_LDFLAGS='-version-info 31:0:0 -lm'

264
lang/gcc/4.6/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,264 @@
$OpenBSD: patch-Makefile_in,v 1.1 2012/01/23 17:04:10 espie Exp $
--- Makefile.in.orig Sun Jan 22 09:47:02 2012
+++ Makefile.in Sun Jan 22 09:49:09 2012
@@ -3256,7 +3256,7 @@ configure-build-libiberty:
srcdiroption="--srcdir=$${topdir}/libiberty"; \
libsrcdir="$$s/libiberty"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -3312,7 +3312,7 @@ configure-build-bison:
srcdiroption="--srcdir=$${topdir}/bison"; \
libsrcdir="$$s/bison"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -3368,7 +3368,7 @@ configure-build-byacc:
srcdiroption="--srcdir=$${topdir}/byacc"; \
libsrcdir="$$s/byacc"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -3424,7 +3424,7 @@ configure-build-flex:
srcdiroption="--srcdir=$${topdir}/flex"; \
libsrcdir="$$s/flex"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -3480,7 +3480,7 @@ configure-build-m4:
srcdiroption="--srcdir=$${topdir}/m4"; \
libsrcdir="$$s/m4"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -3536,7 +3536,7 @@ configure-build-texinfo:
srcdiroption="--srcdir=$${topdir}/texinfo"; \
libsrcdir="$$s/texinfo"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -3592,7 +3592,7 @@ configure-build-fixincludes:
srcdiroption="--srcdir=$${topdir}/fixincludes"; \
libsrcdir="$$s/fixincludes"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -46136,7 +46136,7 @@ configure-target-libstdc++-v3:
srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
libsrcdir="$$s/libstdc++-v3"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -47120,7 +47120,7 @@ configure-target-libmudflap:
srcdiroption="--srcdir=$${topdir}/libmudflap"; \
libsrcdir="$$s/libmudflap"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -47577,7 +47577,7 @@ configure-target-libssp:
srcdiroption="--srcdir=$${topdir}/libssp"; \
libsrcdir="$$s/libssp"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -48034,7 +48034,7 @@ configure-target-newlib:
srcdiroption="--srcdir=$${topdir}/newlib"; \
libsrcdir="$$s/newlib"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -48490,7 +48490,7 @@ configure-target-libgcc:
srcdiroption="--srcdir=$${topdir}/libgcc"; \
libsrcdir="$$s/libgcc"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -49469,7 +49469,7 @@ configure-target-libquadmath:
srcdiroption="--srcdir=$${topdir}/libquadmath"; \
libsrcdir="$$s/libquadmath"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -49926,7 +49926,7 @@ configure-target-libgfortran:
srcdiroption="--srcdir=$${topdir}/libgfortran"; \
libsrcdir="$$s/libgfortran"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -50383,7 +50383,7 @@ configure-target-libobjc:
srcdiroption="--srcdir=$${topdir}/libobjc"; \
libsrcdir="$$s/libobjc"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -50840,7 +50840,7 @@ configure-target-libgo:
srcdiroption="--srcdir=$${topdir}/libgo"; \
libsrcdir="$$s/libgo"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -51297,7 +51297,7 @@ configure-target-libtermcap:
srcdiroption="--srcdir=$${topdir}/libtermcap"; \
libsrcdir="$$s/libtermcap"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -51689,7 +51689,7 @@ configure-target-winsup:
srcdiroption="--srcdir=$${topdir}/winsup"; \
libsrcdir="$$s/winsup"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -52146,7 +52146,7 @@ configure-target-libgloss:
srcdiroption="--srcdir=$${topdir}/libgloss"; \
libsrcdir="$$s/libgloss"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -52598,7 +52598,7 @@ configure-target-gperf:
srcdiroption="--srcdir=$${topdir}/gperf"; \
libsrcdir="$$s/gperf"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -53055,7 +53055,7 @@ configure-target-examples:
srcdiroption="--srcdir=$${topdir}/examples"; \
libsrcdir="$$s/examples"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -53497,7 +53497,7 @@ configure-target-libffi:
srcdiroption="--srcdir=$${topdir}/libffi"; \
libsrcdir="$$s/libffi"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -53954,7 +53954,7 @@ configure-target-libjava:
srcdiroption="--srcdir=$${topdir}/libjava"; \
libsrcdir="$$s/libjava"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -54411,7 +54411,7 @@ configure-target-zlib:
srcdiroption="--srcdir=$${topdir}/zlib"; \
libsrcdir="$$s/zlib"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -54868,7 +54868,7 @@ configure-target-boehm-gc:
srcdiroption="--srcdir=$${topdir}/boehm-gc"; \
libsrcdir="$$s/boehm-gc"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -55325,7 +55325,7 @@ configure-target-qthreads:
srcdiroption="--srcdir=$${topdir}/qthreads"; \
libsrcdir="$$s/qthreads"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -55782,7 +55782,7 @@ configure-target-rda:
srcdiroption="--srcdir=$${topdir}/rda"; \
libsrcdir="$$s/rda"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -56239,7 +56239,7 @@ configure-target-libada:
srcdiroption="--srcdir=$${topdir}/libada"; \
libsrcdir="$$s/libada"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1
@@ -56695,7 +56695,7 @@ configure-target-libgomp:
srcdiroption="--srcdir=$${topdir}/libgomp"; \
libsrcdir="$$s/libgomp"; \
rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--target=${target_alias} $${srcdiroption} \
|| exit 1