[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] trunk r6598: gcc fixes, etc
|
From: |
Carl Hansen |
|
Subject: |
[Gsrc-commit] trunk r6598: gcc fixes, etc |
|
Date: |
Mon, 10 Jun 2019 14:36:38 -0400 (EDT) |
|
User-agent: |
Bazaar (2.7.0dev1) |
------------------------------------------------------------
revno: 6598
revision-id: address@hidden-20190610183629-h1dh06do8c2q7lqa
parent: address@hidden-20190610012740-wfsm2o41syy1l60j
committer: address@hidden
branch nick: trunk
timestamp: Mon 2019-06-10 11:36:29 -0700
message:
gcc fixes, etc
renamed:
pkg/gnualpha/gcc9snap/ => pkg/gnualpha/gcc9snapshot/
gcc9snap-20190601034442-z1ba96fwvbg1kiya-1
modified:
pkg/gnu/gcc7/config.mk config.mk-20160617015453-ksaie5ols1c2eidw-1
pkg/gnu/gcc9/Makefile makefile-20180430051416-apjm8gmvy08pz1zi-3
pkg/gnu/gcc9/config.mk config.mk-20180430051416-apjm8gmvy08pz1zi-2
pkg/gnu/guile/Makefile makefile-20160617014725-uokjfnggs70iry9h-969
pkg/gnualpha/gcc10/Makefile makefile-20190506050828-2enxreepw1xsv1i3-3
pkg/gnualpha/gcc10/sha256sums sha256sums-20190506050828-2enxreepw1xsv1i3-4
pkg/gnualpha/gcc9snapshot/Makefile makefile-20190601034442-z1ba96fwvbg1kiya-3
pkg/other/guile-git/Makefile makefile-20180707222735-xzb9t6me5jer0w17-3
pkg/other/redis/Makefile makefile-20180906205328-zlveh14wki1krtj4-3
pkg/other/redis/sha256sums sha256sums-20180906205328-zlveh14wki1krtj4-4
=== modified file 'pkg/gnu/gcc7/config.mk'
--- a/pkg/gnu/gcc7/config.mk 2018-08-27 00:34:09 +0000
+++ b/pkg/gnu/gcc7/config.mk 2019-06-10 18:36:29 +0000
@@ -28,7 +28,8 @@
#
#CONFIGURE_ARGS +=
-CONFIGURE_OPTS = --program-suffix=-7 \
+CONFIGURE_OPTS = --prefix=$(prefix) \
+--program-suffix=-7 \
--with-local-prefix=$(prefix) \
--with-gmp=$(prefix) \
--with-mpfr=$(prefix) \
=== modified file 'pkg/gnu/gcc9/Makefile'
--- a/pkg/gnu/gcc9/Makefile 2019-05-07 06:12:39 +0000
+++ b/pkg/gnu/gcc9/Makefile 2019-06-10 18:36:29 +0000
@@ -24,7 +24,7 @@
UPSTREAMNAME = gcc
GARVERSION = 9.1.0
HOME_URL = http://www.gnu.org/software/gcc
-DESCRIPTION = GNU Compiler Collection alpha version 9
+DESCRIPTION = GNU Compiler Collection version 9
define BLURB
GCC is the GNU Compiler Collection 9. It provides compiler front-ends
for several languages, including C, C++, Objective-C, Objective-C++, Fortran,
@@ -43,17 +43,13 @@
WORKSRC = $(WORKDIR)/gcc-$(GARVERSION)
WORKOBJ = $(WORKDIR)/gcc-$(GARVERSION).build
-#:BUILD_SCRIPTS = docompilers
+#BUILD_SCRIPTS = compilers
BUILDDEPS = gmp mpfr mpc zlib
LIBDEPS =
# HINT: this Makefile is still being tested. Any comments, address@hidden
-######################################################################
-include ../../../gar/gar.lib/auto.mk
-include ../../../gar/gar.lib/info.mk
-include config.mk
#links
@@ -73,8 +69,10 @@
gnat_ugn.info \
libgomp.info \
libitm.info \
- libquadmath.info \
- libiberty.info
+ libquadmath.info
+
+
+# libiberty.info
# BUG gccbrig.info gfc-internals.info libiberty.info not installing correctly
yet
@@ -82,26 +80,102 @@
######################################################################
# adjust as necessary
-#LDFLAGS += -L/usr/lib/x86_64-linux-gnu
-#CPPFLAGS += -I/usr/include/x86_64-linux-gnu -I$(prefix)/include -isystem
/usr/include/x86_64-linux-gnu
-#CFLAGS += -I/usr/include/x86_64-linux-gnu -I$(prefix)/include -isystem
/usr/include/x86_64-linux-gnu
-
-
-#build-docompilers: configure build
-# cd $(WORKOBJ) && $(MAKE) V=1 $(BUILD_OPTS) -k
-# $(MAKECOOKIE)
-
- #cd $(WORKOBJ)/libiberty/ $(MAKE) info
-# slightly imperfect, but it worked .... sometimes
-# a work-around for error message...
- #CFLAGS=-fno-split-stack make V=1 -C $(WORKOBJ) -f Makefile
-
-post-build: extract
- make V=1 -C $(WORKOBJ) -f Makefile
- $(MAKECOOKIE)
-
- # no-split-stack a work around for me... not sure about it
-#$(BUILD_OPTS)
+# LDFLAGS += -L/usr/lib/x86_64-linux-gnu
+# CPPFLAGS += -I/usr/include/x86_64-linux-gnu -I$(prefix)/include -isystem
/usr/include/x86_64-linux-gnu
+# CFLAGS += -I/usr/include/x86_64-linux-gnu -I$(prefix)/include -isystem
/usr/include/x86_64-linux-gnu
+
+CFLAGS += -v --save-temps
+
+
+## Configuration options for gcc ##
+## Note: you must set up your environment (PATH, LDPATH, etc) to
+## include GSRC-installed packages in order to install gcc as
+## configured below. You can do this easily like so in Bash:
+## $ source $(your_gsrc_dir) setup.sh
+
+## adjust --enable-languages= to your liking; this is maximal.
+## gnat (ada) is a special case; requires a working ada compiler to
+## already be installed, the compiler you are using to compile the rest.
+
+# --enable-languages=c,c++,fortran,go,objc,obj-c++,ada,brig,d,jit \
+
+# jit requires --enable-host-shared
+# --enable-host-shared typically slows the rest of the compiler down by
+# a few %, so you must explicitly enable it.
+
+# If you want to build both the jit and the regular compiler, it is often
+# best to do this via two separate configure/builds, in separate
+# directories, to avoid imposing the performance cost of
+# --enable-host-shared on the regular compiler.
+
+#--enable-cloog-backend=isl \
+
+# note: at end --target=x86_64-linux-gnu
+# Many options at just what Debian ships with;
+# adjust as necessary.
+#--with-system-libunwind \
+#--with-prefix=$(prefix) \
+#--with-local-prefix=$(prefix) \
+#--with-gcc-major-version-only \
+
+CONFIGURE_ARGS = --prefix=$(prefix) \
+--program-suffix=-9 \
+--with-gmp=$(prefix) \
+--with-mpfr=$(prefix) \
+--with-mpc=$(prefix) \
+--with-gnu-ld \
+--with-libiconv-prefix=$(prefix) \
+--with-target-bdw-gc=$(prefix) \
+--enable-checking=release \
+--enable-clocale=gnu \
+--enable-__cxa_atexit \
+--enable-default-pie \
+--enable-gnu-unique-object \
+--enable-gtk-cairo \
+--enable-host-shared \
+--enable-languages=c,c++,fortran,go,ada,brig,d,jit,objc,obj-c++ \
+--enable-libada \
+--enable-libmpx \
+--enable-libssp \
+--enable-libstdcxx-debug \
+--enable-libstdcxx-time=yes \
+--enable-linker-build-id \
+--enable-lto \
+--enable-multiarch \
+--enable-multilib \
+--enable-nls \
+--enable-objc-gc=yes \
+--enable-plugin \
+--enable-shared \
+--enable-threads=posix \
+--with-default-libstdcxx-abi=new \
+--libexecdir=$(prefix)/lib \
+--libdir=$(prefix)/lib \
+--with-abi=m64 \
+--with-multilib-list=m32,m64,mx32 \
+--with-arch-32=i686 \
+--without-included-gettext \
+--with-system-zlib \
+--with-target-system-zlib \
+--enable-offload-targets=nvptx-none \
+--without-cuda-driver \
+--with-tune=generic \
+--disable-vtable-verify \
+--disable-werror \
+--build=x86_64-linux-gnu \
+--host=x86_64-linux-gnu \
+--target=x86_64-linux-gnu
+
+
+#--enable-bootstrap \
+# enable-bootstrap might not be necessary, but it solves some problems
+# of building when not using recent gcc to build.
+
+#CFLAGS+=-fno-split-stack due to compile problems with gccgo
+#BUILD_ARGS?= -Wall -Wextra CFLAGS+=-fno-split-stack
CPLUSFLAGS+=-fno-split-stack LIBS=-liconv
+#BUILD_ARGS?= -Wall -Wextra LIBS=-liconv
+
+BUILD_ARGS ?=
#install-links: build
## @ln -sf gcc-9 $(packageprefix)/bin/cc
@@ -109,9 +183,13 @@
# $(MAKECOOKIE)
#
# gccfixer.sh
+######################################################################
+include ../../../gar/gar.lib/auto.mk
+include ../../../gar/gar.lib/info.mk
+include config.mk
-checkall: build
- cd $(WORKOBJ); make -k check
- $(MAKECOOKIE)
+#checkall: build
+# cd $(WORKOBJ); $(MAKE) V=1 check
+# $(MAKECOOKIE)
=== modified file 'pkg/gnu/gcc9/config.mk'
--- a/pkg/gnu/gcc9/config.mk 2019-05-07 06:12:39 +0000
+++ b/pkg/gnu/gcc9/config.mk 2019-06-10 18:36:29 +0000
@@ -1,84 +1,8 @@
## Configuration options for gcc ##
-## Note: you must set up your environment (PATH, LDPATH, etc) to
-## include GSRC-installed packages in order to install gcc as
-## configured below. You can do this easily like so in Bash:
-## $ source $(your_gsrc_dir) setup.sh
-
-## adjust --enable-languages= to your liking; this is maximal.
-## gnat (ada) is a special case; requires a working ada compiler to
-## already be installed, the compiler you are using to compile the rest.
-
-# --enable-languages=c,c++,fortran,go,jit,lto,objc,obj-c++,ada,brig
-
-# jit requires --enable-host-shared
-# --enable-host-shared typically slows the rest of the compiler down by
-# a few %, so you must explicitly enable it.
-
-# If you want to build both the jit and the regular compiler, it is often
-# best to do this via two separate configure/builds, in separate
-# directories, to avoid imposing the performance cost of
-# --enable-host-shared on the regular compiler.
-
-#--enable-cloog-backend=isl \
-
-# note: at end --target=x86_64-linux-gnu
-# adjust as necessary
-#
-#
-#CONFIGURE_ARGS +=
-# rm go
-# adjust to taste
-# especially --buid --host --target
-
-CONFIGURE_OPTS = --program-suffix=-9 \
---with-local-prefix=$(prefix) \
---with-gmp=$(prefix) \
---with-mpfr=$(prefix) \
---with-mpc=$(prefix) \
---with-target-bdw-gc=$(prefix) \
---enable-checking=release \
---enable-clocale=gnu \
---enable-__cxa_atexit \
---enable-default-pie \
---enable-gnu-unique-object \
---enable-gtk-cairo \
---enable-languages=c,c++,fortran,lto,objc,obj-c++,ada,brig,d \
---enable-libada \
---enable-libmpx \
---enable-libssp \
---enable-libstdcxx-debug \
---enable-libstdcxx-time=yes \
---enable-linker-build-id \
---enable-lto \
---enable-multiarch \
---enable-multilib \
---with-multilib-list=m64,m32,mx32 \
---enable-nls \
---enable-objc-gc=yes \
---enable-plugin \
---enable-shared \
---enable-threads=posix \
---with-abi=m64 \
---with-default-libstdcxx-abi=new \
---with-system-zlib \
---with-target-system-zlib \
---with-tune=generic \
---enable-bootstrap \
---build=x86_64-linux-gnu \
---host=x86_64-linux-gnu \
---target=x86_64-linux-gnu
-
-#--with-multilib-list=m32,m64,mx32 \
-#--with-multilib-list=m32,m64 \
-
-# enable-bootstrap might not be necessary, but it solves some problems
-# of building when not using recent gcc to build.
-
-#CFLAGS+=-fno-split-stack due to compile problems with gccgo
-# probably a better way
-BUILD_OPTS ?= -Wall -Wextra LIBS="-liconv -lpthread $(LIBS)"
-
-#BUILD_OPTS ?=
+
+
+CONFIGURE_OPTS ?=
+BUILD_OPTS ?=
=== modified file 'pkg/gnu/guile/Makefile'
--- a/pkg/gnu/guile/Makefile 2019-05-07 06:12:39 +0000
+++ b/pkg/gnu/guile/Makefile 2019-06-10 18:36:29 +0000
@@ -45,7 +45,7 @@
BUILDDEPS = gmp libtool readline libunistring libffi
LIBDEPS =
# gc
-USE_AUTORECONF = y
+#USE_AUTORECONF = y
######################################################################
=== modified file 'pkg/gnualpha/gcc10/Makefile'
--- a/pkg/gnualpha/gcc10/Makefile 2019-06-05 09:05:39 +0000
+++ b/pkg/gnualpha/gcc10/Makefile 2019-06-10 18:36:29 +0000
@@ -22,7 +22,7 @@
NAME = The GNU Compiler Collection version 10
GARNAME = gcc10
UPSTREAMNAME = gcc
-GARVERSION = 10-20190602
+GARVERSION = 10-20190609
HOME_URL = http://www.gnu.org/software/gcc
DESCRIPTION = GNU Compiler Collection 10 snapshot
define BLURB
@@ -114,8 +114,8 @@
# Many options at just what Debian ships with;
# adjust as necessary.
-CONFIGURE_ARGS = --program-suffix=-9 \
---program-prefix=x86_64-linux-gnu- \
+CONFIGURE_ARGS = --prefix=$(prefix) \
+--program-suffix=-10 \
--with-gmp=$(prefix) \
--with-mpfr=$(prefix) \
--with-mpc=$(prefix) \
@@ -167,7 +167,7 @@
#CFLAGS+=-fno-split-stack due to compile problems with gccgo
#BUILD_ARGS?= -Wall -Wextra CFLAGS+=-fno-split-stack
CPLUSFLAGS+=-fno-split-stack LIBS=-liconv
-#BUILD_ARGS?= -Wall -Wextra LIBS=-liconv
+#BUILD_ARGS?= -Wall -Wextra -Wl,LIBS=-liconv
BUILD_ARGS ?=
=== modified file 'pkg/gnualpha/gcc10/sha256sums'
--- a/pkg/gnualpha/gcc10/sha256sums 2019-06-05 09:05:39 +0000
+++ b/pkg/gnualpha/gcc10/sha256sums 2019-06-10 18:36:29 +0000
@@ -1,1 +1,1 @@
-b6431d231e317733b73910446d1c75cb48e8c177485e974e4099565827dcdba2
download/gcc-10-20190602.tar.xz
+c7bebaeb2fb8f214fe36bb0b478d63eca9ce882263d55562dcc87f089df634bb
download/gcc-10-20190609.tar.xz
=== renamed directory 'pkg/gnualpha/gcc9snap' => 'pkg/gnualpha/gcc9snapshot'
=== modified file 'pkg/gnualpha/gcc9snapshot/Makefile'
--- a/pkg/gnualpha/gcc9snap/Makefile 2019-06-10 01:27:40 +0000
+++ b/pkg/gnualpha/gcc9snapshot/Makefile 2019-06-10 18:36:29 +0000
@@ -20,7 +20,7 @@
# Send bug reports and comments about GSRC problems to address@hidden
NAME = The GNU Compiler Collection version 9snap
-GARNAME = gcc9snap
+GARNAME = gcc9snapshot
UPSTREAMNAME = gcc
GARVERSION = 9-20190608
HOME_URL = http://www.gnu.org/software/gcc
@@ -115,7 +115,6 @@
CONFIGURE_ARGS = --prefix=$(prefix) \
--program-suffix=-9 \
---program-prefix=x86_64-linux-gnu- \
--with-gmp=$(prefix) \
--with-mpfr=$(prefix) \
--with-mpc=$(prefix) \
@@ -200,8 +199,8 @@
# gccfixer.sh
#
-#checkall: build
-# cd $(WORKOBJ); $(MAKE) -k check
-# $(MAKECOOKIE)
+checkall: build
+ cd $(WORKOBJ); $(MAKE) -k check
+ $(MAKECOOKIE)
=== modified file 'pkg/other/guile-git/Makefile'
--- a/pkg/other/guile-git/Makefile 2019-05-07 06:12:39 +0000
+++ b/pkg/other/guile-git/Makefile 2019-06-10 18:36:29 +0000
@@ -29,7 +29,7 @@
######################################################################
#
ohttps://gitlab.com/guile-git/guile-git/-/archive/master/guile-git-master.tar.bz2
#
https://gitlab.com/guile-git/guile-git/-/archive/v0.2.0/guile-git-v0.2.0.tar.bz2
-MASTER_SITES = "https://gitlab.com/";
+MASTER_SITES = https://gitlab.com/
MASTER_SUBDIR = $(GARNAME)/$(GARNAME)/-/archive/v0.2.0/
DISTFILES = $(GARNAME)-v$(GARVERSION).tar.bz2
SIGFILES =
=== modified file 'pkg/other/redis/Makefile'
--- a/pkg/other/redis/Makefile 2018-09-06 20:57:28 +0000
+++ b/pkg/other/redis/Makefile 2019-06-10 18:36:29 +0000
@@ -1,6 +1,7 @@
-# Copyright ©2018 Carl Hansen <address@hidden>
+# Copyright ©2018,2019 Carl Hansen <address@hidden>
#
# This file is part of GSRC, the GNU Source Release Collection.
+# http://www.gnu.org/software/gsrc
#
# GSRC is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -15,11 +16,12 @@
# You should have received a copy of the GNU General Public License
# along with GSRC. If not, see <http://www.gnu.org/licenses/>.
#
+#
# Send bug reports and comments about GSRC problems to address@hidden
NAME = redis
GARNAME = redis
-GARVERSION = 4.0.11
+GARVERSION = 5.0.5
HOME_URL = http://www.redis.io
# http://www.redis.io/download/
DESCRIPTION = in-memory data structure store
@@ -40,7 +42,7 @@
SIGFILES =
LICENSE = BSD
CONFIGURE_SCRIPTS =
-INSTALL_SCRIPTS = redisinstall
+#INSTALL_SCRIPTS = redisinstall
BUILDDEPS =
LIBDEPS =
@@ -50,16 +52,27 @@
include ../../../gar/gar.lib/auto.mk
include config.mk
-post-test:
+post-build-test:
$(MAKE) -C $(WORKSRC) test
- $(MAKECOOKIE)
-install-redisinstall:
- echo HERE IT GOES $(prefix)/packages/$(DISTNAME)
- mkdir -p $(prefix)/packages/$(DISTNAME)
- echo PREFIX=$(packageprefix)/
- $(MAKE) -C $(WORKSRC) PREFIX=$(packageprefix)/ install
- $(MAKECOOKIE)
+#install-redisinstall:
+# echo HERE IT GOES $(prefix)/packages/$(DISTNAME)
+# mkdir -p $(prefix)/packages/$(DISTNAME)
+# echo PREFIX=$(packageprefix)/
+## $(MAKE) -C $(WORKSRC) PREFIX=$(packageprefix)/ install
+# $(MAKECOOKIE)
-sysinstall: install-redisinstall
-
+#sysinstall: install-redisinstall
+
+
+# use standard naem FIXME
+custom-install:
+ mkdir -p $(prefix)/packages/$(DISTNAME)
+ mkdir -p $(prefix)/packages/$(DISTNAME)-DEST
+ $(MAKE) V=1 -C $(WORKSRC)/src -f Makefile
PREFIX=$(prefix)/packages/$(DISTNAME)-DEST install
+ $(MAKECOOKIE)
+
+
+
+
+# $(MAKE) V=1 finish-install
=== modified file 'pkg/other/redis/sha256sums'
--- a/pkg/other/redis/sha256sums 2018-09-06 20:57:28 +0000
+++ b/pkg/other/redis/sha256sums 2019-06-10 18:36:29 +0000
@@ -1,1 +1,1 @@
-fc53e73ae7586bcdacb4b63875d1ff04f68c5474c1ddeda78f00e5ae2eed1bbb
download/redis-4.0.11.tar.gz
+2139009799d21d8ff94fc40b7f36ac46699b9e1254086299f8d3b223ca54a375
download/redis-5.0.5.tar.gz
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] trunk r6598: gcc fixes, etc,
Carl Hansen <=