summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2017-07-05 15:44:42 -0400
committerLuke Shumaker <lukeshu@parabola.nu>2017-07-05 15:44:42 -0400
commit75c741615ecb8e708f9bd8600cf77383be5cecf3 (patch)
treeead4b8474f31c88e83172ba9654ac677ded03359
parent68bfc3b1b33210bef89ec8dc5c636c019db5ed0a (diff)
parentb57ae07ee862fe022a637661cc39f41484abeec4 (diff)
downloaddevtools32-75c741615ecb8e708f9bd8600cf77383be5cecf3.tar.xz
Merge branch 'lukeshu/rebase/master'libretools-20170705
-rw-r--r--archrelease.in3
-rw-r--r--makepkg-i686.conf6
-rw-r--r--makepkg-x86_64.conf6
3 files changed, 9 insertions, 6 deletions
diff --git a/archrelease.in b/archrelease.in
index 6b4f1be..25379a7 100644
--- a/archrelease.in
+++ b/archrelease.in
@@ -58,6 +58,9 @@ done
# gracefully handle files containing an "@" character
known_files=("${known_files[@]/%/@}")
+# update repo directory first to avoid a commit failure
+svn up repos
+
for tag in "$@"; do
stat_busy "Copying %s to %s" "${trunk}" "${tag}"
diff --git a/makepkg-i686.conf b/makepkg-i686.conf
index 4cbc28b..f7ea2c2 100644
--- a/makepkg-i686.conf
+++ b/makepkg-i686.conf
@@ -40,9 +40,9 @@ 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"
-CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong"
-LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
+CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
+CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
#-- Make Flags: change this for DistCC/SMP systems
#MAKEFLAGS="-j2"
#-- Debugging flags
diff --git a/makepkg-x86_64.conf b/makepkg-x86_64.conf
index 79858a7..67cb200 100644
--- a/makepkg-x86_64.conf
+++ b/makepkg-x86_64.conf
@@ -40,9 +40,9 @@ CHOST="x86_64-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=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"
+CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
+CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
#-- Make Flags: change this for DistCC/SMP systems
#MAKEFLAGS="-j2"
#-- Debugging flags