summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-02-04 20:43:00 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-02-04 20:43:00 -0500
commit077eac41e34f47e21d94e6ed330dba578e5fb0f3 (patch)
tree17eef5c782bdeef0c100a546e31ba5318c4eeb3f
parentc271ab745f80167f452ee6afa1ff430c2f1523b0 (diff)
parent38957783a2bf3da42de6c0be37caf8a7ba763d84 (diff)
downloaddevtools-077eac41e34f47e21d94e6ed330dba578e5fb0f3.tar.xz
Merge tag '20151129'libretools-20160208
tag 20151129
-rw-r--r--Makefile2
-rw-r--r--makepkg-i686.conf11
-rw-r--r--makepkg-x86_64.conf11
-rw-r--r--pacman-gnome-unstable.conf6
4 files changed, 17 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index dcdb522..ce2b042 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-V=20150606
+V=20151129
PREFIX = /usr/local
diff --git a/makepkg-i686.conf b/makepkg-i686.conf
index 64ddd67..ac54d07 100644
--- a/makepkg-i686.conf
+++ b/makepkg-i686.conf
@@ -19,7 +19,7 @@ DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %
# /usr/bin/lftpget -c
# /usr/bin/wget
-#-- The the package required by makepkg to download VCS sources
+#-- The package required by makepkg to download VCS sources
# Format: 'protocol::package'
VCSCLIENTS=('bzr::bzr'
'git::git'
@@ -37,8 +37,8 @@ CHOST="i686-pc-linux-gnu"
# -march (or -mcpu) builds exclusively for an architecture
# -mtune optimizes for an architecture, but builds for whole processor family
CPPFLAGS="-D_FORTIFY_SOURCE=2"
-CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4"
-CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4"
+CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong"
+CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong"
LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
#-- Make Flags: change this for DistCC/SMP systems
#MAKEFLAGS="-j2"
@@ -50,17 +50,16 @@ DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
# BUILD ENVIRONMENT
#########################################################################
#
-# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign)
+# Defaults: BUILDENV=(!distcc color !ccache check !sign)
# A negated environment option will do the opposite of the comments below.
#
-#-- fakeroot: Allow building packages as a non-root user
#-- distcc: Use the Distributed C/C++/ObjC compiler
#-- color: Colorize output messages
#-- ccache: Use ccache to cache compilation
#-- check: Run the check() function if present in the PKGBUILD
#-- sign: Generate PGP signature file
#
-BUILDENV=(fakeroot !distcc color !ccache check !sign)
+BUILDENV=(!distcc color !ccache check !sign)
#
#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
#-- specify a space-delimited list of hosts running in the DistCC cluster.
diff --git a/makepkg-x86_64.conf b/makepkg-x86_64.conf
index cf14784..415231a 100644
--- a/makepkg-x86_64.conf
+++ b/makepkg-x86_64.conf
@@ -19,7 +19,7 @@ DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %
# /usr/bin/lftpget -c
# /usr/bin/wget
-#-- The the package required by makepkg to download VCS sources
+#-- The package required by makepkg to download VCS sources
# Format: 'protocol::package'
VCSCLIENTS=('bzr::bzr'
'git::git'
@@ -37,8 +37,8 @@ CHOST="x86_64-unknown-linux-gnu"
# -march (or -mcpu) builds exclusively for an architecture
# -mtune optimizes for an architecture, but builds for whole processor family
CPPFLAGS="-D_FORTIFY_SOURCE=2"
-CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4"
-CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4"
+CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong"
+CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong"
LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
#-- Make Flags: change this for DistCC/SMP systems
#MAKEFLAGS="-j2"
@@ -50,17 +50,16 @@ DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
# BUILD ENVIRONMENT
#########################################################################
#
-# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign)
+# Defaults: BUILDENV=(!distcc color !ccache check !sign)
# A negated environment option will do the opposite of the comments below.
#
-#-- fakeroot: Allow building packages as a non-root user
#-- distcc: Use the Distributed C/C++/ObjC compiler
#-- color: Colorize output messages
#-- ccache: Use ccache to cache compilation
#-- check: Run the check() function if present in the PKGBUILD
#-- sign: Generate PGP signature file
#
-BUILDENV=(fakeroot !distcc color !ccache check !sign)
+BUILDENV=(!distcc color !ccache check !sign)
#
#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
#-- specify a space-delimited list of hosts running in the DistCC cluster.
diff --git a/pacman-gnome-unstable.conf b/pacman-gnome-unstable.conf
index 911d4db..ff905fe 100644
--- a/pacman-gnome-unstable.conf
+++ b/pacman-gnome-unstable.conf
@@ -72,6 +72,9 @@ LocalFileSigLevel = Optional
[gnome-unstable]
Include = /etc/pacman.d/mirrorlist
+[staging]
+Include = /etc/pacman.d/mirrorlist
+
[testing]
Include = /etc/pacman.d/mirrorlist
@@ -81,6 +84,9 @@ Include = /etc/pacman.d/mirrorlist
[extra]
Include = /etc/pacman.d/mirrorlist
+[community-staging]
+Include = /etc/pacman.d/mirrorlist
+
[community-testing]
Include = /etc/pacman.d/mirrorlist